sync with OpenBSD -current

app/fvwm/Makefile.inc

@@ -1,4 +1,4 @@
-# -*- makefile -*- 
+# -*- makefile -*-
 # $OpenBSD: Makefile.inc,v 1.9 2012/09/30 10:12:51 espie Exp $
 
 .ifndef FVWM_MAKEFILE_INC

app/fvwm/libs/ModParse.c

@@ -167,7 +167,7 @@ char *GetNextArgument(char *indata,char **token)
 /****************************************************************************
  *
  * Gets the next "word" of input from char string indata.
- * "word" is a string with no spaces, or a quoted string.
+ * "word" is a string with no spaces, or a qouted string.
  * Return value is ptr to indata,updated to point to text after the word
  * which is extracted.
  * token is the extracted word, which is copied into a malloced
@@ -188,7 +188,7 @@ char *GetNextArgument(char *indata,char **token)
   start = t;
   while(!isspace(*t)&&(*t != 0))
     {
-      /* Check for quoted text */
+      /* Check for qouted text */
       if(*t == '"')
 	{
 	  t++;
@@ -217,7 +217,7 @@ char *GetNextArgument(char *indata,char **token)
 
   while(start < end)
     {
-      /* Check for quoted text */
+      /* Check for qouted text */
       if(*start == '"')
 	{
 	  start++;

app/fvwm/libs/Parse.c

@@ -227,7 +227,7 @@ void NukeToken(char **pstr)
 /****************************************************************************
  *
  * Gets the next "word" of input from string indata.
- * "word" is a string with no spaces, or a quoted string.
+ * "word" is a string with no spaces, or a qouted string.
  * Return value is ptr to indata,updated to point to text after the word
  * which is extracted.
  * token is the extracted word, which is copied into a malloced
@@ -273,7 +273,7 @@ char *DoGetNextToken(char *indata, char **token, char *spaces, char *delims,
 	     (dnum &&
 	      strchr(delims, *t)) ) )
     {
-      /* Check for quoted text */
+      /* Check for qouted text */
       if (IsQuote(*t))
 	{
 	  char c = *t;
@@ -307,7 +307,7 @@ char *DoGetNextToken(char *indata, char **token, char *spaces, char *delims,
   /* copy token */
   while(start < end)
     {
-      /* Check for quoted text */
+      /* Check for qouted text */
       if(IsQuote(*start))
 	{
 	  char c = *start;

app/fvwm/libs/wild.c

@@ -11,7 +11,7 @@
  *	(including the null string) '?' matches any single char. For use
  *	by filenameforall. Note that '*' matches across directory boundaries
  *
- *      This code donated by  Paul Hudson <paulh@harlequin.co.uk>
+ *      This code donated by Paul Hudson <paulh@harlequin.co.uk>
  *      It is public domain, no strings attached. No guarantees either.
  *
  *****************************************************************************/

app/fvwm/modules/FvwmBanner/FvwmBanner.1

@@ -37,5 +37,5 @@ Tells the module to display for \fIsec\fP seconds instead of default of 3.
 
 
 .SH AUTHOR
-Robert Nation 
+Robert Nation
 

app/fvwm/modules/FvwmButtons/FvwmButtons.1

@@ -304,9 +304,9 @@ its syntax is here:
 
 When FvwmButtons finds such an Exec command, the button will remain
 pushed in until a window whose name or class matches the
-quoted portion of the command is encountered. This is intended to
+qouted portion of the command is encountered. This is intended to
 provide visual feedback to the user that the action he has requested
-will be performed. If the quoted portion
+will be performed. If the qouted portion
 contains no characters, then the button will pop out immediately.
 Note that users can continue pressing the button, and re-executing the
 command, even when it looks "pressed in."

app/fvwm/modules/FvwmForm/FvwmForm.1

@@ -3,14 +3,14 @@
 .SH NAME
 FvwmForm - input form module for Fvwm
 .SH SYNOPSIS
-FvwmForm must be spawned by Fvwm.  
+FvwmForm must be spawned by Fvwm.
 It will not work from the command line.
 .SH DESCRIPTION
 FvwmForm provides a mechanism to get user input and act accordingly.
 This is achieved by means of a form that the user can fill out,
 and from which the user can select actions he wants Fvwm to take.
 A form consists of five types of items:
-text labels, 
+text labels,
 single-line text inputs,
 mutually-exclusive selections,
 multiple-choice selections,
@@ -162,7 +162,7 @@ FvwmForm will assure only one is selected.
 .TP 4
 .B *FvwmFormButton \fItype\fP "\fIstring\fP" [\fIkey\fP]
 This option specifies an action button.
-The button has \fIstring\fP as a label, 
+The button has \fIstring\fP as a label,
 and excutes a set of Fvwm \fIcommand\fP when it is activated.
 The commands should be specified using the *FvwmFormCommand option.
 
@@ -180,7 +180,7 @@ continue
 FvwmForm will resume execution after sending the commands.
 .TP 16
 restart
-After sending the commands, 
+After sending the commands,
 FvwmForm will reset all the values to the initial ones,
 and then resume execution.
 .TP 16
@@ -263,7 +263,7 @@ This example simulates the mwm way of confirming logout.
 Style "QuitVerify" NoTitle, NoHandles, BorderWidth 3
 
 .SH EXAMPLE 2 - Remote Login
-This example lets the user type in a hostname, 
+This example lets the user type in a hostname,
 and optionally a user name on the remote machine,
 and opens an xterm window from the remote host.
 

app/fvwm/modules/FvwmIconBox/FvwmIconBox.1

@@ -11,7 +11,7 @@ FvwmIconBox is spawned by fvwm, so no command line invocation will work.
 .SH DESCRIPTION
 The FvwmIconBox module provides an icon manager. The user can do
 operations, like iconify and deiconify, for each icon shown in the
-module via mouse and keyboard. 
+module via mouse and keyboard.
 
 FvwmIconBox reads the same .fvwmrc file as fvwm reads when it starts up,
 and looks for lines similar to "*FvwmIconBoxFore green".

app/fvwm/modules/FvwmIconMan/fvwm.c

@@ -120,7 +120,7 @@ static void set_draw_mode (WinManager *man, int flag)
   else if (man->we_are_drawing && !flag) {
     the_manager = man;
     num = accumulate_walk_hashtab (count_nonsticky_in_hashtab);
-    ConsoleDebug (FVWM, "SetDrawMode on 0x%lx, num = %d\n", 
+    ConsoleDebug (FVWM, "SetDrawMode on 0x%lx, num = %d\n",
 		  (unsigned long)man, num);
 
     if (num == 0)

app/fvwm/modules/FvwmIconMan/readconfig.c

@@ -185,7 +185,7 @@ static void print_binding (Binding *binding)
   while (func) {
     for (i = 0; i < num_builtins; i++) {
       if (func->func == builtin_functions[i].func) {
-	ConsoleDebug (CONFIG, "\tFunction: %s %p ", 
+	ConsoleDebug (CONFIG, "\tFunction: %s %p ",
 		      builtin_functions[i].name, func->func);
 	break;
       }
@@ -272,7 +272,7 @@ static int extract_int (char *p, int *n)
 /****************************************************************************
  *
  * Gets the next "word" of input from char string indata.
- * "word" is a string with no spaces, or a quoted string.
+ * "word" is a string with no spaces, or a qouted string.
  * Return value is ptr to indata,updated to point to text after the word
  * which is extracted.
  * token is the extracted word, which is copied into a malloced
@@ -530,7 +530,7 @@ static Function *parse_function (char **line, char *pstop_char)
 	 * is recorded as the argument type in the argument array
 	 * for a command, it means it is a string; the code for
 	 * 'IntArg' is used instead for numbers. Note also that
-	 * if the C function receives a 'JmpArg' argument it means something
+	 * if the C function recieves a 'JmpArg' argument it means something
 	 * went wrong, since they should all be translated to integer
 	 * jump offsets at compile time.
 	 */
@@ -1048,7 +1048,7 @@ static void handle_button_config (int manager, int context, char *option)
     ConsoleMessage ("This isn't a valid button state: %s\n", p);
     return;
   }
-  ConsoleDebug (CONFIG, "Setting buttonState[%s] to %s\n", 
+  ConsoleDebug (CONFIG, "Setting buttonState[%s] to %s\n",
 		contextDefaults[context].name, p);
   SET_MANAGER (manager, buttonState[context], state);
 

app/fvwm/modules/FvwmWinList/Imakefile

@@ -3,8 +3,8 @@ XCOMM	$OpenBSD: Imakefile,v 1.1.1.1 2006/11/26 10:53:56 matthieu Exp $
 FVWMTOP=../..
 #include "../../Fvwm.tmpl"
 
-SRCS= ButtonArray.c Colors.c FvwmWinList.c List.c Mallocs.c 
-OBJS= ButtonArray.o Colors.o FvwmWinList.o List.o Mallocs.o 
+SRCS= ButtonArray.c Colors.c FvwmWinList.c List.c Mallocs.c
+OBJS= ButtonArray.o Colors.o FvwmWinList.o List.o Mallocs.o
 
 DEPLIBS= $(FVWMLIB) $(DEPXPMLIB) $(DEPXLIB)
 LOCAL_LIBRARIES= $(FVWMLIB) $(XPMLIB) $(XLIB)

app/fvwm/utils/BuildXLockMenu

@@ -18,7 +18,7 @@ print "AddToMenu XLockMenu \"XLock Modes\" Title\n";
 while (<XL>)
 {
   chomp;
-  
+
   /where mode is one of:/ && do
   {
     $start = 1;

app/fvwm/utils/fvwmrc_convert

@@ -1,16 +1,16 @@
-#!/bin/sh 
+#!/bin/sh
 
 # Some time ago, Martin Kraemer <Martin.Kraemer@mch.sni.de> posted an
 # incomplete script to convert fvwm-1 'rc' files to fvwm-2. I've just
 # recently fixed and enhanced that script; it's complete (or nearly
 # so) now. This should help if you choose to convert.
-# 
+#
 # I've also made a couple of other minor changes to make life easier
 # for our users here: I changed the default initialization from "Read
 # .fvwmrc" to "Read .fvwm2rc" (in fvwm/fvwmc), and I installed fvwm 2
 # as "fvwm2". With these changes, users can easily convert at their
 # leisure.
-# 
+#
 # Herewith the script. It's using GNU awk (gawk), but will run with
 # any "new" awk (nawk on Suns (SunOS 4, Solaris), awk on most other
 # systems). If you do not use gawk, it will be case-sensitive (the
@@ -116,7 +116,7 @@ BEGIN   {
 	print $0;
 	next;
 }
-	
+
 ################ Rename common items ##############
 /Restart/ && /fvwm/             {
 	gsub("fvwm", "fvwm2"); gsub("fvwm22","fvwm2"); # try to leave paths alone
@@ -390,7 +390,7 @@ BEGIN   {
 
 # hack: popup declarations cannot have leading whitespace
 /^Popup/                        {
-        if (inpopup) 
+        if (inpopup)
 	   print "ERROR: EndPopup missing\n" NR ": " $0 >"'$TTY'";
         if (infunction)
 	   print "ERROR: EndFunction missing\n" NR ": " $0 >"'$TTY'";
@@ -432,7 +432,7 @@ BEGIN   {
 /^[ \t]*StubbornIcons[ \t]*/	||
 /^[ \t]*StubbornIconPlacement[ \t]*/ ||
 /^[ \t]*StubbornPlacement[ \t]*/     ||
-/^[ \t]*Cursor[ \t]*/		{ 
+/^[ \t]*Cursor[ \t]*/		{
 	print "#! " $0 " [deleted]";
 	if (warned[$1]==FALSE) {
 	   print "Warning: " $1 " not in Fvwm2, command dropped" >"'$TTY'";