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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index a361142faae..beb7a0a2ae1 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -7023,7 +7023,7 @@
         * fileio.c: There are two versions of Fexpand_file_name defined
         here; the latter is inside a `#if 0' clause.  Change its DEFUN to
         a DEAFUN, so that its docstring doesn't make it into the DOC file
-        and supercede the real docstring.
+        and supersede the real docstring.
 
         * callint.c (Fcall_interactively): For the 'K' interactive spec,
         set varies[i] to -1, indicating that the mouse click should be
@@ -11142,7 +11142,7 @@
         wait_reading_process_input, instead of just the first two.
 
         * process.c (wait_reading_process_input): Remove support for
-        only waiting for mouse input, since that has been superceded.
+        only waiting for mouse input, since that has been superseded.
         This removes X dependencies from process.c, and eliminates some
         references to code that should only exist when using X10.
 
@@ -11450,7 +11450,7 @@
 
         * minibuf.c (temp_echo_area_glyphs): Clear echo_area_glyphs and
         previous_echo_glyphs, so the message we're displaying will
-        supercede any existing message.
+        supersede any existing message.
 
         * keyboard.c: Removed external declaration of echo_area_glyphs,
         since it's declared in window.h.