Merge from trunkpending

10 files changed, 15 insertions, 15 deletions

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index fef8a3b6b25..d4683da87f2 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 
 /*
-Copyright (C) 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -78,7 +78,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  *
  *                      3)      The application has enabled asynchronous event
  *                              queuing mode.  In this mode all foreign events
- *                              will be queued up untill XMenuActivate
+ *                              will be queued up until XMenuActivate
  *                              terminates; at which time they will be
  *                              returned to the X event queue.  As long as
  *                              AEQ mode is enabled any asynchronous event
diff --git a/oldXMenu/AddSel.c b/oldXMenu/AddSel.c
index 9bbcf71cd3c..2b1ff3d6c89 100644
--- a/oldXMenu/AddSel.c
+++ b/oldXMenu/AddSel.c
@@ -30,7 +30,7 @@ XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, ch
     register XMSelect *sel;     /* Newly created selection. */
 
 
-    int label_length;           /* Label lenght in characters. */
+    int label_length;           /* Label length in characters. */
     int label_width;            /* Label width in pixels. */
 
     /*
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index b40b5ca7084..1d3091c6bb4 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -167,7 +167,7 @@
 2007-02-25  Glenn Morris  <rgm@gnu.org>
 
         * XCrAssoc.c, XDelAssoc.c, XDestAssoc.c, XLookAssoc.c:
-        * XMakeAssoc.c: Remove license text in favour of including
+        * XMakeAssoc.c: Remove license text in favor of including
         copyright.h, as was done in original X11 source.
 
 2004-12-27  Jan Djärv  <jan.h.d@swipnet.se>
@@ -615,7 +615,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2011  Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2012  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index 25f1f1c3381..1d21e534300 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 
 /*
-Copyright (C) 1993-1994, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1993-1994, 2001-2012  Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/oldXMenu/FindSel.c b/oldXMenu/FindSel.c
index fbf235c463d..3c208cb3da5 100644
--- a/oldXMenu/FindSel.c
+++ b/oldXMenu/FindSel.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 
 /*
-Copyright (C) 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c
index 102de9d7a56..dc8dc0120ef 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 
 /*
-Copyright (C) 1993, 1996, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1993, 1996, 2001-2012  Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -968,7 +968,7 @@ _XMRefreshSelection(register Display *display, register XMenu *menu, register XM
             /*
              * Using BOX mode.
              * Since most drawing routines with arbitrary width lines
-             * are slow compared to raster-ops lets use a raster-op to
+             * are slow compared to raster-ops let's use a raster-op to
              * draw the boxes.
              */
 
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index 51ee4cd207c..94c49fb9966 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -15,7 +15,7 @@
 ## without express or implied warranty.
 
 
-## Copyright (C) 2001-2011  Free Software Foundation, Inc.
+## Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/oldXMenu/X10.h b/oldXMenu/X10.h
index c30632b9d68..5e4ca068ba5 100644
--- a/oldXMenu/X10.h
+++ b/oldXMenu/X10.h
@@ -51,7 +51,7 @@ XDrawFilled so it shouldn't be defined.
  */
 typedef struct _XAssoc {
         struct _XAssoc *next;   /* Next object in this bucket. */
-        struct _XAssoc *prev;   /* Previous obejct in this bucket. */
+        struct _XAssoc *prev;   /* Previous object in this bucket. */
         Display *display;       /* Display which owns the id. */
         XID x_id;               /* X Window System id. */
         void *data;             /* Pointer to untyped memory. */
diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h
index bf1e77b5ff7..8e4292f5088 100644
--- a/oldXMenu/XMenu.h
+++ b/oldXMenu/XMenu.h
@@ -152,8 +152,8 @@ typedef struct _xmselect {
  *
  */
 typedef enum _xmstyle {
-    LEFT,                       /* Left oriented obejct. */
-    RIGHT,                      /* Right oriented obejct. */
+    LEFT,                       /* Left oriented object. */
+    RIGHT,                      /* Right oriented object. */
     CENTER                      /* Center oriented object. */
 } XMStyle;
 
@@ -185,7 +185,7 @@ typedef struct _xmenu {
     Window parent;              /* Menu's parent window. */
     int width;                  /* Overall menu width. */
     int height;                 /* Overall menu height. */
-    int x_pos;                  /* Oveall menu origin. */
+    int x_pos;                  /* Overall menu origin. */
     int y_pos;                  /* Overall menu origin. */
     Cursor mouse_cursor;        /* Mouse cursor raster. */
     XAssocTable *assoc_tab;     /* XMWindow association table. */
diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c
index 90a8eec4e71..0e6904ea9bf 100644
--- a/oldXMenu/insque.c
+++ b/oldXMenu/insque.c
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 1993-1998, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1993-1998, 2001-2012  Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by