XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks

diff --git a/xmodmap.c b/xmodmap.c
index f86886b..6cdb7f1 100644 (file)
--- a/xmodmap.c
+++ b/xmodmap.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xmodmap/xmodmap.c,v 1.7 2001/12/14 20:02:13 dawes Exp $ */
+/* $XFree86: xc/programs/xmodmap/xmodmap.c,v 1.9 2003/05/27 22:27:08 tsi Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
@@ -236,7 +236,7 @@ main(int argc, char *argv[])
              case '3':
              case '4':
              case '5': {
-                 char *cmd = "clear modX";
+                 char cmd[11] = "clear modX";
                  cmd[9] = arg[1];
                  process_line (cmd);
                  continue;
@@ -340,5 +340,8 @@ main(int argc, char *argv[])
     }
 
     Exit (status < 0 ? 1 : 0);
+
+    /* Muffle gcc */
+    return 0;
 }
 

diff --git a/xmodmap.man b/xmodmap.man
index 9e5753e..2597184 100644 (file)
--- a/xmodmap.man
+++ b/xmodmap.man
@@ -24,7 +24,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\" 
-.\" $XFree86: xc/programs/xmodmap/xmodmap.man,v 1.11 2002/10/12 16:06:48 herrb Exp $
+.\" $XFree86: xc/programs/xmodmap/xmodmap.man,v 1.13 2003/06/26 10:19:49 eich Exp $
 .\" 
 .de EX         \"Begin example
 .ne 5
@@ -124,11 +124,11 @@ The list of keysyms is assigned to the indicated keycode
 (which may be specified in decimal, hex or octal and can be determined by 
 running the
 .I xev
-program.  Up to eight keysyms may be attached to a key, however the last four
+program).  Up to eight keysyms may be attached to a key, however the last four
 are not used in any major X server implementation.  The first keysym is used
 when no modifier key is pressed in conjunction with this key, the second with
-Shift, the third when the Mode_Switch key is used with this key and the fourth
-when both the Mode_Switch and Shift keys are used.
+Shift, the third when the Mode_switch key is used with this key and the fourth
+when both the Mode_switch and Shift keys are used.
 .TP 8
 .B keycode any = \fIKEYSYMNAME ...\fP
 If no existing key has the specified list of keysyms assigned to it,
@@ -178,7 +178,7 @@ This sets the pointer map back to its default settings (button 1 generates a
 code of 1, button 2 generates a 2, etc.).
 .TP 8
 .B pointer = \fINUMBER ...\fP
-This sets to pointer map to contain the indicated button codes.  The list
+This sets the pointer map to contain the indicated button codes.  The list
 always starts with the first physical button.
 .PP
 Lines that begin with an exclamation point (!) are taken as comments.