Merge from emacs-23

1 files changed, 8 insertions, 8 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 11e603eab0f..4a6942db5b8 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -3973,7 +3973,7 @@
         (xmalloc, fatal, error): New functions.
         (delete_socket, handle_signals): New functions.
         (progname, socket_name): New variables.
-         [HAVE_SOCKETS] (main): Call handle_signals; set the new variables.
+        [HAVE_SOCKETS] (main): Call handle_signals; set the new variables.
 
 1996-09-01  Richard Stallman  <rms@ethanol.gnu.ai.mit.edu>
 
@@ -4746,9 +4746,9 @@
 1995-01-12  Francesco Potortì  (pot@cnuce.cnr.it)
 
         * etags.c (FILEPOS, GET_CHARNO, GET_FILEPOS, max, LINENO): Deleted.
-        (append_to_tagfile, typedefs, typedefs_and_cplusplus,
-         constantypedefs, update, vgrind_style, no_warnings,
-         cxref_style, cplusplus, noindentypedefs): Were int, now logical.
+        (append_to_tagfile, typedefs, typedefs_and_cplusplus)
+        (constantypedefs, update, vgrind_style, no_warnings)
+        (cxref_style, cplusplus, noindentypedefs): Were int, now logical.
         (permit_duplicates): Was a var, now a #define.
         (filename_lb): Was global, now local to main.
         (main): Open the tag file when in cxref mode.
@@ -4767,8 +4767,8 @@
         (TOKEN_SAVED_P, SAVE_TOKEN, RESTORE_TOKEN): Deleted.
         (C_entries): nameb and savenameb deleted.  Use dinamic allocation.
         (pfcnt): Deleted.  Users updated.
-        (getit, Asm_labels, Pascal_functions, L_getit, get_scheme,
-         TEX_getit, prolog_getit): Use dinamic allocation for storing
+        (getit, Asm_labels, Pascal_functions, L_getit, get_scheme)
+        (TEX_getit, prolog_getit): Use dinamic allocation for storing
         the tag instead of a fixed size buffer.
 
 1995-01-10  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
@@ -6693,8 +6693,8 @@
 1990-01-19  David Lawrence  (tale@cocoa-puffs)
 
         * timer.c, getdate.y (new files) and Makefile:
-          Sub-process support for run-at-time in timer.el.
-          Doesn't yet work correctly for USG.
+        Sub-process support for run-at-time in timer.el.
+        Doesn't yet work correctly for USG.
 
 1990-01-10  Jim Kingdon  (kingdon@pogo)