diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-02-27 17:07:29 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-02-27 17:07:29 -0800 |
| commit | 2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb (patch) | |
| tree | b924eb1c22ab3bce643676162ef039f250782661 /lisp/ChangeLog.12 | |
| parent | df7f0d0b10ce31a6f1a8b7e979e120c695699d5a (diff) | |
| parent | d1f61aaf6f0b6a2cf2bbb7eaf5631f8b580568d4 (diff) | |
| download | emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.tar.gz | |
Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.
Diffstat (limited to 'lisp/ChangeLog.12')
| -rw-r--r-- | lisp/ChangeLog.12 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index d2f7cab27f0..70c2a45acc9 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 <ken.manheimer@gmail.com> @@ -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. |