Mercurial > hg > xemacs-beta
changeset 3096:5694c986bd92
[xemacs-hg @ 2005-11-26 13:20:21 by stephent]
Improve where-is internal docstring. <87y83b35z7.fsf@tleepslib.sk.tsukuba.ac.jp>
| author | stephent |
|---|---|
| date | Sat, 26 Nov 2005 13:20:23 +0000 |
| parents | 6693845ec32a |
| children | 859a2346db99 |
| files | src/ChangeLog src/keymap.c |
| diffstat | 2 files changed, 13 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Nov 26 12:09:39 2005 +0000 +++ b/src/ChangeLog Sat Nov 26 13:20:23 2005 +0000 @@ -1,3 +1,7 @@ +2004-12-19 Stephen J. Turnbull <stephen@xemacs.org> + + * keymap.c (Fwhere_is_internal): Rewrite docstring. + 2005-11-26 Stephen J. Turnbull <stephen@xemacs.org> Merge Xft. @@ -470,10 +474,6 @@ * redisplay-x.c: Don't abort() when ichar_to_unicode returns error. - 2004-12-19 Stephen J. Turnbull <stephen@xemacs.org> - - * keymap.c (Fwhere_is_internal): Rewrite docstring. - 2004-12-17 Stephen J. Turnbull <stephen@xemacs.org> * regex.c (re_match_2_internal): DEBUG_PRINT "can match null".
--- a/src/keymap.c Sat Nov 26 12:09:39 2005 +0000 +++ b/src/keymap.c Sat Nov 26 13:20:23 2005 +0000 @@ -3474,17 +3474,20 @@ Return list of keys that invoke DEFINITION in KEYMAPS. KEYMAPS can be either a keymap (meaning search in that keymap and the current global keymap) or a list of keymaps (meaning search in exactly -those keymaps and no others). If KEYMAPS is nil, search in the currently -applicable maps for EVENT-OR-KEYS (this is equivalent to specifying -`(current-keymaps EVENT-OR-KEYS)' as the argument to KEYMAPS). +those keymaps and no others). If optional 3rd arg FIRSTONLY is non-nil, return a vector representing the first key sequence found, rather than a list of all possible key sequences. -If optional 4th arg NOINDIRECT is non-nil, don't follow indirections - to other keymaps or slots. This makes it possible to search for an - indirect definition itself. +Optional 4th argument NOINDIRECT is ignored. (GNU Emacs uses it to allow +searching for an indirect keymap by inhibiting following of indirections to +keymaps or slots, but XEmacs doesn't need it because keymaps are a type.) + +If optional 5th argument EVENT-OR-KEYS is non-nil and KEYMAPS is nil, +search in the currently applicable maps for EVENT-OR-KEYS (this is +equivalent to specifying `(current-keymaps EVENT-OR-KEYS)' as the +argument to KEYMAPS). */ (definition, keymaps, firstonly, UNUSED (noindirect), event_or_keys)) {