Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.

[gnu-emacs] / lisp / ChangeLog.3

diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index b54580ff0bc83e39446ea0c5a6f66ad507a8a7d4..8cafac2c0c4df922703a50f26dd263c25006847b 100644 (file)
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -4906,7 +4906,7 @@
        * two-column.el: Doc fixes.
 
        * loaddefs.el (function-keymap): Definition deleted; this has been
-       superceded by function-key-map.
+       superseded by function-key-map.
 
        * gomoku.el (gomoku-mode-map): Use function key symbols, instead
        of the keypad.el facilities.
@@ -6056,7 +6056,7 @@
        and `fill-column'.  Code now actually sets `left-margin' and
        `fill-column', as advertised.
        * text-mode.el (change-log-mode): Function deleted, since it's
-       been superceded by the one in add-log.el.
+       been superseded by the one in add-log.el.
 
 1992-06-14  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
 
@@ -6070,7 +6070,7 @@
 
 1992-06-12  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
 
-       * isearch-mode.el: New package, which will probably supercede
+       * isearch-mode.el: New package, which will probably supersede
        isearch.el.
        (isearch-mode-map, isearch-mode-meta-map): When initializing
        these, remember that vectors are no longer keymaps.
@@ -10009,7 +10009,7 @@
        display-time-string.
        (rmail-pop-up): Default display-time-hook to automatically retrieve
        new mail if the variable rmail-pop-up is non-nil.
-       (add-clock-handler): Removed; superceded by timer.el.
+       (add-clock-handler): Removed; superseded by timer.el.
 
        * loaddefs.el: Removed add-clock-handler.
 
@@ -10032,7 +10032,7 @@
 
        * loaddefs.el: Autoload for diff.
 
-       * files.el (diff): Superceded by diff.el.
+       * files.el (diff): Superseded by diff.el.
        (diff-switches-function): Still needs to be merged into diff.el.
 
        * diff.el: New file.