diff options
| author | Glenn Morris | 2011-02-22 21:10:10 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-02-22 21:10:10 -0800 |
| commit | 0105dc3e031edfe100df0abac10d34671b60dbf8 (patch) | |
| tree | 6dddacbc11cb4f5fb0a6045db6450d463d53abc1 | |
| parent | e8b5c6a20c8191da7587ffd21fcac7ae566acff4 (diff) | |
| download | emacs-0105dc3e031edfe100df0abac10d34671b60dbf8.tar.gz emacs-0105dc3e031edfe100df0abac10d34671b60dbf8.zip | |
Fix spelling of "supersede".
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | doc/misc/semantic.texi | 2 | ||||
| -rw-r--r-- | etc/NEWS | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog.12 | 6 | ||||
| -rw-r--r-- | lisp/ChangeLog.3 | 10 | ||||
| -rw-r--r-- | lisp/erc/ChangeLog.01 | 6 | ||||
| -rw-r--r-- | src/ChangeLog.10 | 2 | ||||
| -rw-r--r-- | src/ChangeLog.3 | 6 | ||||
| -rw-r--r-- | src/w32term.c | 2 |
9 files changed, 19 insertions, 19 deletions
| @@ -7612,7 +7612,7 @@ | |||
| 7612 | there, and then copy it in, to make sure we get a real file. | 7612 | there, and then copy it in, to make sure we get a real file. |
| 7613 | 7613 | ||
| 7614 | * make-dist: Don't try to distribute *.defns files any more. The | 7614 | * make-dist: Don't try to distribute *.defns files any more. The |
| 7615 | only such file was for simula.el, which has been superceded by a | 7615 | only such file was for simula.el, which has been superseded by a |
| 7616 | version which doesn't have a separate .defns file. | 7616 | version which doesn't have a separate .defns file. |
| 7617 | 7617 | ||
| 7618 | 1992-05-28 Ken Raeburn (Raeburn@Cygnus.COM) | 7618 | 1992-05-28 Ken Raeburn (Raeburn@Cygnus.COM) |
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index eb84a096f28..97f9bc21e80 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi | |||
| @@ -65,7 +65,7 @@ developing GNU and promoting software freedom.'' | |||
| 65 | @macro obsolete{old,new} | 65 | @macro obsolete{old,new} |
| 66 | @sp 1 | 66 | @sp 1 |
| 67 | @strong{Compatibility}: | 67 | @strong{Compatibility}: |
| 68 | @code{\new\} introduced in @semantic{} version 2.0 supercedes | 68 | @code{\new\} introduced in @semantic{} version 2.0 supersedes |
| 69 | @code{\old\} which is now obsolete. | 69 | @code{\old\} which is now obsolete. |
| 70 | @end macro | 70 | @end macro |
| 71 | 71 | ||
| @@ -1746,7 +1746,7 @@ directories in which `ffap-rfc' will first search for RFCs. | |||
| 1746 | *** hide-ifdef-mode allows shadowing ifdef-blocks instead of hiding them. | 1746 | *** hide-ifdef-mode allows shadowing ifdef-blocks instead of hiding them. |
| 1747 | See option `hide-ifdef-shadow' and function `hide-ifdef-toggle-shadowing'. | 1747 | See option `hide-ifdef-shadow' and function `hide-ifdef-toggle-shadowing'. |
| 1748 | 1748 | ||
| 1749 | *** `icomplete-prospects-height' now supercedes `icomplete-prospects-length'. | 1749 | *** `icomplete-prospects-height' now supersedes `icomplete-prospects-length'. |
| 1750 | 1750 | ||
| 1751 | *** Info displays breadcrumbs in the header of the page. | 1751 | *** Info displays breadcrumbs in the header of the page. |
| 1752 | See Info-breadcrumbs-depth to control it. | 1752 | See Info-breadcrumbs-depth to control it. |
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 189e42241fb..ea50cbf5d4f 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 | |||
| @@ -11678,7 +11678,7 @@ | |||
| 11678 | make underlining work for wide characters. | 11678 | make underlining work for wide characters. |
| 11679 | (org-goto-map, org-agenda-mode-map, org-mode-map): Explicitly bind | 11679 | (org-goto-map, org-agenda-mode-map, org-mode-map): Explicitly bind |
| 11680 | TAB to `org-cycle', to make sure that no binding in | 11680 | TAB to `org-cycle', to make sure that no binding in |
| 11681 | `outline-mode-map' can supercede it. | 11681 | `outline-mode-map' can supersede it. |
| 11682 | 11682 | ||
| 11683 | 2006-03-14 Ken Manheimer <ken.manheimer@gmail.com> | 11683 | 2006-03-14 Ken Manheimer <ken.manheimer@gmail.com> |
| 11684 | 11684 | ||
| @@ -19139,7 +19139,7 @@ | |||
| 19139 | * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to | 19139 | * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to |
| 19140 | pgg-decrypt-region. | 19140 | pgg-decrypt-region. |
| 19141 | (pgg-pending-timers): A new hash for tracking the passphrase cache | 19141 | (pgg-pending-timers): A new hash for tracking the passphrase cache |
| 19142 | timers, so that new ones supercede old ones. | 19142 | timers, so that new ones supersede old ones. |
| 19143 | (pgg-add-passphrase-to-cache): Rename from | 19143 | (pgg-add-passphrase-to-cache): Rename from |
| 19144 | `pgg-add-passphrase-cache' to reduce confusion (all callers | 19144 | `pgg-add-passphrase-cache' to reduce confusion (all callers |
| 19145 | changed). Modified to cancel old timers when new ones are added. | 19145 | changed). Modified to cancel old timers when new ones are added. |
| @@ -19225,7 +19225,7 @@ | |||
| 19225 | * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to | 19225 | * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to |
| 19226 | pgg-decrypt-region. | 19226 | pgg-decrypt-region. |
| 19227 | (pgg-pending-timers): A new hash for tracking the passphrase cache | 19227 | (pgg-pending-timers): A new hash for tracking the passphrase cache |
| 19228 | timers, so that new ones supercede old ones. | 19228 | timers, so that new ones supersede old ones. |
| 19229 | (pgg-add-passphrase-to-cache): Rename from | 19229 | (pgg-add-passphrase-to-cache): Rename from |
| 19230 | `pgg-add-passphrase-cache' to reduce confusion (all callers | 19230 | `pgg-add-passphrase-cache' to reduce confusion (all callers |
| 19231 | changed). Modified to cancel old timers when new ones are added. | 19231 | changed). Modified to cancel old timers when new ones are added. |
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index 85e41bba720..b26a048ac56 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 | |||
| @@ -4906,7 +4906,7 @@ | |||
| 4906 | * two-column.el: Doc fixes. | 4906 | * two-column.el: Doc fixes. |
| 4907 | 4907 | ||
| 4908 | * loaddefs.el (function-keymap): Definition deleted; this has been | 4908 | * loaddefs.el (function-keymap): Definition deleted; this has been |
| 4909 | superceded by function-key-map. | 4909 | superseded by function-key-map. |
| 4910 | 4910 | ||
| 4911 | * gomoku.el (gomoku-mode-map): Use function key symbols, instead | 4911 | * gomoku.el (gomoku-mode-map): Use function key symbols, instead |
| 4912 | of the keypad.el facilities. | 4912 | of the keypad.el facilities. |
| @@ -6056,7 +6056,7 @@ | |||
| 6056 | and `fill-column'. Code now actually sets `left-margin' and | 6056 | and `fill-column'. Code now actually sets `left-margin' and |
| 6057 | `fill-column', as advertised. | 6057 | `fill-column', as advertised. |
| 6058 | * text-mode.el (change-log-mode): Function deleted, since it's | 6058 | * text-mode.el (change-log-mode): Function deleted, since it's |
| 6059 | been superceded by the one in add-log.el. | 6059 | been superseded by the one in add-log.el. |
| 6060 | 6060 | ||
| 6061 | 1992-06-14 Richard Stallman (rms@mole.gnu.ai.mit.edu) | 6061 | 1992-06-14 Richard Stallman (rms@mole.gnu.ai.mit.edu) |
| 6062 | 6062 | ||
| @@ -6070,7 +6070,7 @@ | |||
| 6070 | 6070 | ||
| 6071 | 1992-06-12 Jim Blandy (jimb@pogo.cs.oberlin.edu) | 6071 | 1992-06-12 Jim Blandy (jimb@pogo.cs.oberlin.edu) |
| 6072 | 6072 | ||
| 6073 | * isearch-mode.el: New package, which will probably supercede | 6073 | * isearch-mode.el: New package, which will probably supersede |
| 6074 | isearch.el. | 6074 | isearch.el. |
| 6075 | (isearch-mode-map, isearch-mode-meta-map): When initializing | 6075 | (isearch-mode-map, isearch-mode-meta-map): When initializing |
| 6076 | these, remember that vectors are no longer keymaps. | 6076 | these, remember that vectors are no longer keymaps. |
| @@ -10009,7 +10009,7 @@ | |||
| 10009 | display-time-string. | 10009 | display-time-string. |
| 10010 | (rmail-pop-up): Default display-time-hook to automatically retrieve | 10010 | (rmail-pop-up): Default display-time-hook to automatically retrieve |
| 10011 | new mail if the variable rmail-pop-up is non-nil. | 10011 | new mail if the variable rmail-pop-up is non-nil. |
| 10012 | (add-clock-handler): Removed; superceded by timer.el. | 10012 | (add-clock-handler): Removed; superseded by timer.el. |
| 10013 | 10013 | ||
| 10014 | * loaddefs.el: Removed add-clock-handler. | 10014 | * loaddefs.el: Removed add-clock-handler. |
| 10015 | 10015 | ||
| @@ -10032,7 +10032,7 @@ | |||
| 10032 | 10032 | ||
| 10033 | * loaddefs.el: Autoload for diff. | 10033 | * loaddefs.el: Autoload for diff. |
| 10034 | 10034 | ||
| 10035 | * files.el (diff): Superceded by diff.el. | 10035 | * files.el (diff): Superseded by diff.el. |
| 10036 | (diff-switches-function): Still needs to be merged into diff.el. | 10036 | (diff-switches-function): Still needs to be merged into diff.el. |
| 10037 | 10037 | ||
| 10038 | * diff.el: New file. | 10038 | * diff.el: New file. |
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01 index db2cb574b20..88610b96b66 100644 --- a/lisp/erc/ChangeLog.01 +++ b/lisp/erc/ChangeLog.01 | |||
| @@ -584,9 +584,9 @@ | |||
| 584 | 584 | ||
| 585 | * debian/maint/conffiles.in: new file | 585 | * debian/maint/conffiles.in: new file |
| 586 | 586 | ||
| 587 | * debian/maint/conffiles: superceded by conffiles.in | 587 | * debian/maint/conffiles: superseded by conffiles.in |
| 588 | 588 | ||
| 589 | * debian/scripts/startup: superceded by startup.erc | 589 | * debian/scripts/startup: superseded by startup.erc |
| 590 | 590 | ||
| 591 | 2001-10-25 Mario Lang <mlang@delysid.org> | 591 | 2001-10-25 Mario Lang <mlang@delysid.org> |
| 592 | 592 | ||
| @@ -609,7 +609,7 @@ | |||
| 609 | 609 | ||
| 610 | * debian/maint/postinst, debian/maint/prerm, debian/scripts/install, | 610 | * debian/maint/postinst, debian/maint/prerm, debian/scripts/install, |
| 611 | debian/scripts/remove: | 611 | debian/scripts/remove: |
| 612 | removed, superceded by it's .in counterpart | 612 | removed, superseded by its .in counterpart |
| 613 | 613 | ||
| 614 | 2001-10-25 Mario Lang <mlang@delysid.org> | 614 | 2001-10-25 Mario Lang <mlang@delysid.org> |
| 615 | 615 | ||
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 | ||
| 20011 | 2003-03-04 Jan Djärv <jan.h.d@swipnet.se> | 20011 | 2003-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 | ||