Merge from emacs-24

1 files changed, 6 insertions, 6 deletions

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 085896409dd..cb873f6c4eb 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -98,8 +98,8 @@
         (MAX_INACT_PNUM, TILE_BUF_SIZE): Remove; unused.
         (x_get_resource_string): Args are readonly.
         (XAllocDisplayColor): colorName is readonly.
-        (XMenuCreate): def_env is readonly.  Remove unused locals.  Avoid
-        "else;".
+        (XMenuCreate): def_env is readonly.  Remove unused locals.
+        Avoid "else;".
         * Destroy.c (XMenuDestroy): Return void.
         * Error.c (XMenuError): Remove const pointer.
         * EvHand.c (XMenuEventHandler): Return void.
@@ -354,7 +354,7 @@
 
 1995-02-07  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
 
-        * Makefile.in (maintainer-clean): Renamed from realclean.
+        * Makefile.in (maintainer-clean): Rename from realclean.
 
 1994-10-25  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
@@ -434,8 +434,8 @@
 
 1993-09-27  Brian J. Fox  (bfox@valhalla)
 
-        * Makefile.in (CPP, LN_S, C_SWITCH_X_SITE, CC, CFLAGS): Allow
-        `configure' to supply the values for these variables.
+        * Makefile.in (CPP, LN_S, C_SWITCH_X_SITE, CC, CFLAGS):
+        Allow `configure' to supply the values for these variables.
 
 1993-09-26  Brian J. Fox  (bfox@ai.mit.edu)
 
@@ -640,7 +640,7 @@
 
         * XDelAssoc.c, XLookAssoc.c, XCrAssoc.c, XDestAssoc.c, XMakeAssoc.c:
         Use Xlib.h, not Xlibint.h.
-        * XLookAssoc.c, XMakeAssoc.c, XCrAssoc.c (NULL): Defined.
+        * XLookAssoc.c, XMakeAssoc.c, XCrAssoc.c (NULL): Define.
         * XMakeAssoc.c, XCrAssoc.c: Include errno.h.  Declare errno.
         * XMakeAssoc.c (_XIOErrorFunction): Declared.