From 0105dc3e031edfe100df0abac10d34671b60dbf8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 22 Feb 2011 21:10:10 -0800 Subject: [PATCH] Fix spelling of "supersede". --- ChangeLog | 2 +- doc/misc/semantic.texi | 2 +- etc/NEWS | 2 +- lisp/ChangeLog.12 | 6 +++--- lisp/ChangeLog.3 | 10 +++++----- lisp/erc/ChangeLog.01 | 6 +++--- src/ChangeLog.10 | 2 +- src/ChangeLog.3 | 6 +++--- src/w32term.c | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a57a51782..7694e4bc3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7612,7 +7612,7 @@ there, and then copy it in, to make sure we get a real file. * make-dist: Don't try to distribute *.defns files any more. The - only such file was for simula.el, which has been superceded by a + only such file was for simula.el, which has been superseded by a version which doesn't have a separate .defns file. 1992-05-28 Ken Raeburn (Raeburn@Cygnus.COM) diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index eb84a096f2..97f9bc21e8 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -65,7 +65,7 @@ developing GNU and promoting software freedom.'' @macro obsolete{old,new} @sp 1 @strong{Compatibility}: -@code{\new\} introduced in @semantic{} version 2.0 supercedes +@code{\new\} introduced in @semantic{} version 2.0 supersedes @code{\old\} which is now obsolete. @end macro diff --git a/etc/NEWS b/etc/NEWS index a001084a75..7c5c4beae4 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1746,7 +1746,7 @@ directories in which `ffap-rfc' will first search for RFCs. *** hide-ifdef-mode allows shadowing ifdef-blocks instead of hiding them. See option `hide-ifdef-shadow' and function `hide-ifdef-toggle-shadowing'. -*** `icomplete-prospects-height' now supercedes `icomplete-prospects-length'. +*** `icomplete-prospects-height' now supersedes `icomplete-prospects-length'. *** Info displays breadcrumbs in the header of the page. See Info-breadcrumbs-depth to control it. diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 189e42241f..ea50cbf5d4 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -11678,7 +11678,7 @@ make underlining work for wide characters. (org-goto-map, org-agenda-mode-map, org-mode-map): Explicitly bind TAB to `org-cycle', to make sure that no binding in - `outline-mode-map' can supercede it. + `outline-mode-map' can supersede it. 2006-03-14 Ken Manheimer @@ -19139,7 +19139,7 @@ * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to pgg-decrypt-region. (pgg-pending-timers): A new hash for tracking the passphrase cache - timers, so that new ones supercede old ones. + timers, so that new ones supersede old ones. (pgg-add-passphrase-to-cache): Rename from `pgg-add-passphrase-cache' to reduce confusion (all callers changed). Modified to cancel old timers when new ones are added. @@ -19225,7 +19225,7 @@ * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to pgg-decrypt-region. (pgg-pending-timers): A new hash for tracking the passphrase cache - timers, so that new ones supercede old ones. + timers, so that new ones supersede old ones. (pgg-add-passphrase-to-cache): Rename from `pgg-add-passphrase-cache' to reduce confusion (all callers changed). Modified to cancel old timers when new ones are added. diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index 85e41bba72..b26a048ac5 100644 --- 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. diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01 index db2cb574b2..88610b96b6 100644 --- a/lisp/erc/ChangeLog.01 +++ b/lisp/erc/ChangeLog.01 @@ -584,9 +584,9 @@ * debian/maint/conffiles.in: new file - * debian/maint/conffiles: superceded by conffiles.in + * debian/maint/conffiles: superseded by conffiles.in - * debian/scripts/startup: superceded by startup.erc + * debian/scripts/startup: superseded by startup.erc 2001-10-25 Mario Lang @@ -609,7 +609,7 @@ * debian/maint/postinst, debian/maint/prerm, debian/scripts/install, debian/scripts/remove: - removed, superceded by it's .in counterpart + removed, superseded by its .in counterpart 2001-10-25 Mario Lang diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index 39eaa61f5c..4038f03d07 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -20006,7 +20006,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 diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 36239b1e85..0d0d107101 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/w32term.c b/src/w32term.c index b889c96128..387f2b5c59 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -6024,7 +6024,7 @@ w32_initialize_display_info (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 -- 2.20.1