upstream i think

[gnu-emacs] / lisp / ChangeLog.4

diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4
index 683ca0ed857fbff86803226eec3099cc78433cc6..51e2661d89e89cb4d5ad68c42cf5b5636ca67782 100644 (file)
--- a/lisp/ChangeLog.4
+++ b/lisp/ChangeLog.4
@@ -914,7 +914,7 @@
        (desktop-locals-to-save): Add line-number-mode to be saved when
        local.
        (desktop-remove): In case the desktop file cannot be deleted
-       make sure that the desktop system is still inactivated.
+       make sure that the desktop system is still inactive.
        (desktop-kill): In case an error occurs when saving the desktop,
        offer to quit regardless.
        (desktop-save-buffer-p): Disregard case when testing file and
@@ -2462,7 +2462,7 @@
 1994-03-03  Simon Marshall  (Simon.Marshall@mail.esrin.esa.it)
 
        * cmuscheme.el (inferior-scheme-mode): Removed unnecessary
-       initialisation of comint-input-sentinel.
+       initialization of comint-input-sentinel.
 
        * shell.el (shell-dynamic-complete-functions): New variable.
        (shell-mode): Use it to set comint-dynamic-complete-functions.
@@ -4958,7 +4958,7 @@
 1993-11-08  Simon Marshall  (Simon.Marshall@mail.esrin.esa.it)
 
        * comint.el (comint-preinput-scroll-to-bottom): Added
-       comint-magic-space to list of commands recognised as inserting.
+       comint-magic-space to list of commands recognized as inserting.
 
        * comint.el (comint-output-filter): Corrected check for killed
        buffer.
@@ -5202,7 +5202,7 @@
 
        * comint.el (comint-last-output-start): New variable to record
        where most recent process output started from.
-       (comint-mode): Initialise it.
+       (comint-mode): Initialize it.
        (comint-output-filter): Set it.
 
        * comint.el (comint-previous-matching-input-string): Moved to
@@ -5220,7 +5220,7 @@
        they move within the buffer rather than do input.
 
        * comint.el (comint-send-input, comint-after-pmark-p)
-       (comint-kill-input, comint-proc-query): Removed serialisation of
+       (comint-kill-input, comint-proc-query): Removed serialization of
        obtaining the process mark's marker-position.
 
        * comint.el, shell.el: Commented out comint/shell-load-hooks.
@@ -8936,8 +8936,7 @@ See ChangeLog.3 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-      2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+    Copyright (C) 1993-1994, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -8953,5 +8952,3 @@ See ChangeLog.3 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/>.
-
-;;; arch-tag: 91035822-35c7-44a9-8417-2454b88c3db2