aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2011-02-22 21:10:10 -0800
committerGlenn Morris2011-02-22 21:10:10 -0800
commit0105dc3e031edfe100df0abac10d34671b60dbf8 (patch)
tree6dddacbc11cb4f5fb0a6045db6450d463d53abc1 /src
parente8b5c6a20c8191da7587ffd21fcac7ae566acff4 (diff)
downloademacs-0105dc3e031edfe100df0abac10d34671b60dbf8.tar.gz
emacs-0105dc3e031edfe100df0abac10d34671b60dbf8.zip
Fix spelling of "supersede".
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.102
-rw-r--r--src/ChangeLog.36
-rw-r--r--src/w32term.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 39eaa61f5cd..4038f03d079 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -20006,7 +20006,7 @@
20006 20006
20007 * w32reg.c (w32_get_rdb_resource): New function. 20007 * w32reg.c (w32_get_rdb_resource): New function.
20008 (x_get_string_resource): Use it, so resources passed with -xrm 20008 (x_get_string_resource): Use it, so resources passed with -xrm
20009 supercede the ones in the registry. 20009 supersede the ones in the registry.
20010 20010
200112003-03-04 Jan Djärv <jan.h.d@swipnet.se> 200112003-03-04 Jan Djärv <jan.h.d@swipnet.se>
20012 20012
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 36239b1e85e..0d0d107101d 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -7023,7 +7023,7 @@
7023 * fileio.c: There are two versions of Fexpand_file_name defined 7023 * fileio.c: There are two versions of Fexpand_file_name defined
7024 here; the latter is inside a `#if 0' clause. Change its DEFUN to 7024 here; the latter is inside a `#if 0' clause. Change its DEFUN to
7025 a DEAFUN, so that its docstring doesn't make it into the DOC file 7025 a DEAFUN, so that its docstring doesn't make it into the DOC file
7026 and supercede the real docstring. 7026 and supersede the real docstring.
7027 7027
7028 * callint.c (Fcall_interactively): For the 'K' interactive spec, 7028 * callint.c (Fcall_interactively): For the 'K' interactive spec,
7029 set varies[i] to -1, indicating that the mouse click should be 7029 set varies[i] to -1, indicating that the mouse click should be
@@ -11142,7 +11142,7 @@
11142 wait_reading_process_input, instead of just the first two. 11142 wait_reading_process_input, instead of just the first two.
11143 11143
11144 * process.c (wait_reading_process_input): Remove support for 11144 * process.c (wait_reading_process_input): Remove support for
11145 only waiting for mouse input, since that has been superceded. 11145 only waiting for mouse input, since that has been superseded.
11146 This removes X dependencies from process.c, and eliminates some 11146 This removes X dependencies from process.c, and eliminates some
11147 references to code that should only exist when using X10. 11147 references to code that should only exist when using X10.
11148 11148
@@ -11450,7 +11450,7 @@
11450 11450
11451 * minibuf.c (temp_echo_area_glyphs): Clear echo_area_glyphs and 11451 * minibuf.c (temp_echo_area_glyphs): Clear echo_area_glyphs and
11452 previous_echo_glyphs, so the message we're displaying will 11452 previous_echo_glyphs, so the message we're displaying will
11453 supercede any existing message. 11453 supersede any existing message.
11454 11454
11455 * keyboard.c: Removed external declaration of echo_area_glyphs, 11455 * keyboard.c: Removed external declaration of echo_area_glyphs,
11456 since it's declared in window.h. 11456 since it's declared in window.h.
diff --git a/src/w32term.c b/src/w32term.c
index b889c96128d..387f2b5c59f 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6024,7 +6024,7 @@ w32_initialize_display_info (display_name)
6024 6024
6025} 6025}
6026 6026
6027/* Create an xrdb-style database of resources to supercede registry settings. 6027/* Create an xrdb-style database of resources to supersede registry settings.
6028 The database is just a concatenation of C strings, finished by an additional 6028 The database is just a concatenation of C strings, finished by an additional
6029 \0. The strings are submitted to some basic normalization, so 6029 \0. The strings are submitted to some basic normalization, so
6030 6030