Merge from trunkpending

1 files changed, 13 insertions, 14 deletions

diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index ca7feaee9f5..1a9728f6896 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -1152,7 +1152,7 @@
 
 1987-07-29  Richard Mlynarik  (mly@prep)
 
-        * lread.c (init_read): Initialise load_in_progress.
+        * lread.c (init_read): Initialize load_in_progress.
 
 1987-07-28  Richard M. Stallman  (rms@prep)
 
@@ -1222,7 +1222,7 @@
 1987-07-10  Chris Hanson  (cph@prep)
 
         * xterm.h: Define macros to abstract control of input signals.
-        Alternate set of macros for hp-ux does no signalling.
+        Alternate set of macros for hp-ux does no signaling.
 
         * xterm.c:
         * xfns.c:
@@ -1811,7 +1811,7 @@
 1987-03-13  Richard M. Stallman  (rms@prep)
 
         * sysdep.c: Don't redefine TCSETAW if already defined.
-        (Cancelled by change on March 17).
+        (Canceled by change on March 17).
 
         * sunfns.c: New file containing interface to Sun windows.
         This is enabled by the switch HAVE_SUN_WINDOWS.
@@ -2251,10 +2251,10 @@
 1987-01-16  Richard Mlynarik  (mly@prep)
 
         * xfns.c (Fx_set_{background,cursor,mouse}_color):
-        Initialise save_color.
+        Initialize save_color.
 
         * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c:
-        Delete/replace unused/conditionalised variables
+        Delete/replace unused/conditionalized variables
 
 1987-01-15  Richard M. Stallman  (rms@prep)
 
@@ -2632,7 +2632,7 @@
         * fns.c: Fding requires an arg; pass Qnil.
 
         * m-alliant.h: define TEXT_START as 0x1000.
-        Don't define LIBS_STANDARD; the default (sharable) library
+        Don't define LIBS_STANDARD; the default (shareable) library
         is said to work now.
 
         * alloc.c (mark_object): Now pass address of slot being marked.
@@ -3002,7 +3002,7 @@
 1986-11-18  Richard Mlynarik  (mly@prep)
 
         * emacs.c (main):
-        Giving `inhibit_x_windows' an initialisation loses;
+        Giving `inhibit_x_windows' an initialization loses;
         do it explicitly.
 
         * xfns.c (Fx_rubber_band):
@@ -3291,7 +3291,7 @@
 1986-11-03  Richard Mlynarik  (mly@prep)
 
         * xterm.c (stufflines):
-        Initialise signal mask.
+        Initialize signal mask.
 
         * xterm.h:
         Add definition of sigmask
@@ -3346,7 +3346,7 @@
         New function.
 
         * window.c (Fset_window_hscroll):
-        Don't inhibit redisplay optimisations if hscroll is same.
+        Don't inhibit redisplay optimizations if hscroll is same.
 
         * ymakefile:
         rm ../etc/DOC to avoid make-docfile overwriting any files which
@@ -3358,7 +3358,7 @@
         VMS changes from Sasaki
 
         * termcap.c (tgetent):
-        Make sure `indirect' initialised.
+        Make sure `indirect' initialized.
 
         * xfns.c (grey_p and callers):
         New function to compensate for ugly chauvinistic American
@@ -3496,7 +3496,7 @@
         core-dump)
 
         Dike out global-minor-modes.  This wasn't actually being used by
-        anything (due to a bug) and wasn't even being initialised!
+        anything (due to a bug) and wasn't even being initialized!
         minor-mode-alist does what this thought it was doing.
 
 1986-10-11  Richard Mlynarik  (mly@prep)
@@ -4220,7 +4220,7 @@
         Increase PURESIZE again (sigh)
 
         * unexec.c (write_segment):
-        Kludgey coercions ("(int)") to get this line to compile:
+        Kludgy coercions ("(int)") to get this line to compile:
          nwrite = (((int) ptr + 128) & ~127) - (int) ptr;
         Also changed incorrect ~128 to ~127.
 
@@ -4771,7 +4771,7 @@
 
 See ChangeLog.1 for earlier changes.
 
-    Copyright (C) 1986-1988, 2001-2011  Free Software Foundation, Inc.
+    Copyright (C) 1986-1988, 2001-2012  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -4787,4 +4787,3 @@ See ChangeLog.1 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-