Merge from trunk.

4 files changed, 4 insertions, 4 deletions

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..5d04eea75d4 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>
diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c
index 102de9d7a56..a779cda82f5 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -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/XMenu.h b/oldXMenu/XMenu.h
index bf1e77b5ff7..aa27211c05c 100644
--- a/oldXMenu/XMenu.h
+++ b/oldXMenu/XMenu.h
@@ -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. */