diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-04 15:02:03 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-04 15:02:03 -0700 |
| commit | ae0a1a890ec7b885e85cd945a21ca42fed80df3d (patch) | |
| tree | 495f1d851cb3a43a0e677bff9c09d4211a35fbde /lisp/subr.el | |
| parent | 66b5222c3cd72839bf72e0b2a03912719c930451 (diff) | |
| parent | acae275b2752357497a2411876b83240ce7c8aec (diff) | |
| download | emacs-ae0a1a890ec7b885e85cd945a21ca42fed80df3d.tar.gz | |
Merge from origin/emacs-25
acae275 ; Spelling fixes
d8fac73 Update README for precompiled windows Emacs.
23570fd Clarify documentation of 'vc-responsible-backend' wrt symlinks
f708cb2 Clarify doc string of 'transpose-sexps'
cd05b1d Fix docstring of 'browse-url-firefox-new-window-is-tab'
bdc89eb Improve documentation of 'font-lock-remove-keywords'
4a0c590 Fix documentation of the command summary key
0221b7a Mark relocation workarounds with REL_ALLOC
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index fd46a818df9..ebcb1fd4b82 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -910,7 +910,7 @@ KEY is a string or vector representing a sequence of keystrokes." (defun substitute-key-definition (olddef newdef keymap &optional oldmap prefix) "Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF. -In other words, OLDDEF is replaced with NEWDEF where ever it appears. +In other words, OLDDEF is replaced with NEWDEF wherever it appears. Alternatively, if optional fourth argument OLDMAP is specified, we redefine in KEYMAP as NEWDEF those keys which are defined as OLDDEF in OLDMAP. |