diff options
| author | Chong Yidong | 2012-04-23 11:11:28 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-04-23 11:11:28 +0800 |
| commit | 9ec7751f83254ee3bc13030b7933d1b454c33cd5 (patch) | |
| tree | 59c317ef2fadc671bf2c9aa87232f148a46f7f5c /src/keymap.c | |
| parent | d55486c7f89d12ab799c7bf631b86fb0ccf52e52 (diff) | |
| download | emacs-9ec7751f83254ee3bc13030b7933d1b454c33cd5.tar.gz emacs-9ec7751f83254ee3bc13030b7933d1b454c33cd5.zip | |
Doc fixes for where-is-internal.
* doc/lispref/keymaps.texi (Scanning Keymaps): Fix description of
NO-REMAP arg to where-is-internal.
* src/keymap.c (where_is_internal): Doc fix (Bug#10872).
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/keymap.c b/src/keymap.c index ecaeb32896e..3528a61d6ea 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -2553,7 +2553,8 @@ where_is_internal (Lisp_Object definition, Lisp_Object keymaps, | |||
| 2553 | DEFUN ("where-is-internal", Fwhere_is_internal, Swhere_is_internal, 1, 5, 0, | 2553 | DEFUN ("where-is-internal", Fwhere_is_internal, Swhere_is_internal, 1, 5, 0, |
| 2554 | doc: /* Return list of keys that invoke DEFINITION. | 2554 | doc: /* Return list of keys that invoke DEFINITION. |
| 2555 | If KEYMAP is a keymap, search only KEYMAP and the global keymap. | 2555 | If KEYMAP is a keymap, search only KEYMAP and the global keymap. |
| 2556 | If KEYMAP is nil, search all the currently active keymaps. | 2556 | If KEYMAP is nil, search all the currently active keymaps, except |
| 2557 | for `overriding-local-map' (which is ignored). | ||
| 2557 | If KEYMAP is a list of keymaps, search only those keymaps. | 2558 | If KEYMAP is a list of keymaps, search only those keymaps. |
| 2558 | 2559 | ||
| 2559 | If optional 3rd arg FIRSTONLY is non-nil, return the first key sequence found, | 2560 | If optional 3rd arg FIRSTONLY is non-nil, return the first key sequence found, |
| @@ -2568,9 +2569,16 @@ If optional 4th arg NOINDIRECT is non-nil, don't follow indirections | |||
| 2568 | to other keymaps or slots. This makes it possible to search for an | 2569 | to other keymaps or slots. This makes it possible to search for an |
| 2569 | indirect definition itself. | 2570 | indirect definition itself. |
| 2570 | 2571 | ||
| 2571 | If optional 5th arg NO-REMAP is non-nil, don't search for key sequences | 2572 | If another command OTHER-COMMAND is remapped to DEFINITION, search for |
| 2572 | that invoke a command which is remapped to DEFINITION, but include the | 2573 | the bindings of OTHER-COMMAND and include them in the returned list. |
| 2573 | remapped command in the returned list. */) | 2574 | But if optional 5th arg NO-REMAP is non-nil, just include the vector |
| 2575 | [remap OTHER-COMMAND] in the returned list, without searching for | ||
| 2576 | those other bindings. | ||
| 2577 | |||
| 2578 | If DEFINITION is remapped to another command, this function still | ||
| 2579 | returns its bindings, even though those key sequences actually invoke | ||
| 2580 | the other command. Use `command-remapping' to find the remapping | ||
| 2581 | status of DEFINITION. */) | ||
| 2574 | (Lisp_Object definition, Lisp_Object keymap, Lisp_Object firstonly, Lisp_Object noindirect, Lisp_Object no_remap) | 2582 | (Lisp_Object definition, Lisp_Object keymap, Lisp_Object firstonly, Lisp_Object noindirect, Lisp_Object no_remap) |
| 2575 | { | 2583 | { |
| 2576 | /* The keymaps in which to search. */ | 2584 | /* The keymaps in which to search. */ |