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

7 files changed, 10 insertions, 10 deletions

diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 869ab5b07d8..6152b4c76af 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -20002,7 +20002,7 @@
 
         * w32reg.c (w32_get_rdb_resource): New function.
         (x_get_string_resource): Use it, so resources passed with -xrm
-        supercede the ones in the registry.
+        supersede the ones in the registry.
 
 2003-03-04  Jan Djärv  <jan.h.d@swipnet.se>
 
@@ -25474,7 +25474,7 @@
         recursive call unless that arg is non-nil.
         (where_is_internal): New argument no_remap.  Callers changed.
         Call recursively to find original key bindings for a remapped
-        comand unless that arg is non-nil.
+        command unless that arg is non-nil.
         (Fwhere_is_internal): New optional argument NO-REMAP.
         Doc updated.  Callers changed.  Pass arg to where_is_internal.
 
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.
diff --git a/src/character.c b/src/character.c
index f12c4f28d31..6f3312fec29 100644
--- a/src/character.c
+++ b/src/character.c
@@ -761,7 +761,7 @@ str_as_unibyte (unsigned char *str, EMACS_INT bytes)
    corresponding byte and store in DST.  CHARS is the number of
    characters in SRC.  The value is the number of bytes stored in DST.
    Usually, the value is the same as CHARS, but is less than it if SRC
-   contains a non-ASCII, non-eight-bit characater.  If ACCEPT_LATIN_1
+   contains a non-ASCII, non-eight-bit character.  If ACCEPT_LATIN_1
    is nonzero, a Latin-1 character is accepted and converted to a byte
    of that character code.
    Note: Currently the arg ACCEPT_LATIN_1 is not used.  */
diff --git a/src/editfns.c b/src/editfns.c
index 5d6189f2a3c..28690e7c76d 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3523,7 +3523,7 @@ usage: (format STRING &rest OBJECTS)  */)
   int maybe_combine_byte;
   char *this_format;
   /* Precision for each spec, or -1, a flag value meaning no precision
-     was given in that spec.  Element 0, corresonding to the format
+     was given in that spec.  Element 0, corresponding to the format
      string itself, will not be used.  Element NARGS, corresponding to
      no argument, *will* be assigned to in the case that a `%' and `.'
      occur after the final format specifier.  */
diff --git a/src/keymap.c b/src/keymap.c
index 0e4715e4b8b..1fbb40f1270 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2756,7 +2756,7 @@ remapped command in the returned list.  */)
       && !NILP (firstonly)
       && !NILP (tem = Fget (definition, QCadvertised_binding)))
     {
-      /* We have a list of advertized bindings.  */
+      /* We have a list of advertised bindings.  */
       while (CONSP (tem))
         if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil, 0), definition))
           return XCAR (tem);
diff --git a/src/w32proc.c b/src/w32proc.c
index 1c009c7f943..bb8b428ffe4 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -831,7 +831,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
 
      Note that using backslash to escape embedded quotes requires
      additional special handling if an embedded quote is already
-     preceeded by backslash, or if an arg requiring quoting ends with
+     preceded by backslash, or if an arg requiring quoting ends with
      backslash.  In such cases, the run of escape characters needs to be
      doubled.  For consistency, we apply this special handling as long
      as the escape character is not quote.
diff --git a/src/w32term.c b/src/w32term.c
index 692130b5140..67e853f21f0 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5941,7 +5941,7 @@ w32_initialize_display_info (Lisp_Object display_name)
 
 }
 
-/* Create an xrdb-style database of resources to supercede registry settings.
+/* Create an xrdb-style database of resources to supersede registry settings.
    The database is just a concatenation of C strings, finished by an additional
    \0.  The strings are submitted to some basic normalization, so