diff options
author | Karoly Lorentey <[email protected]> | 2004-08-09 11:05:10 +0000 |
---|---|---|
committer | Karoly Lorentey <[email protected]> | 2004-08-09 11:05:10 +0000 |
commit | cd83ec7be76b05014a49f8bb155a84ddd7c323ee (patch) | |
tree | d8847695cedbde0c1bad8737131e219bfac6ce8a /src/keymap.c | |
parent | 18ad87544445be2584163436bd3c5d6366afa122 (diff) | |
parent | 30e75a873acbcc4f4d59d0341fb49211d8c6d010 (diff) |
Merged in changes from CVS trunk.
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-482
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-483
Build-in-place tweak
* [email protected]/emacs--cvs-trunk--0--patch-484
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-228
Diffstat (limited to 'src/keymap.c')
-rw-r--r-- | src/keymap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keymap.c b/src/keymap.c index ee4f41de6b..e93a3f89fe 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1603,7 +1603,7 @@ is non-nil, `key-binding' returns the unmapped command. */) DEFUN ("local-key-binding", Flocal_key_binding, Slocal_key_binding, 1, 2, 0, doc: /* Return the binding for command KEYS in current local keymap only. -KEYS is a string, a sequence of keystrokes. +KEYS is a string or vector, a sequence of keystrokes. The binding is probably a symbol with a function definition. If optional argument ACCEPT-DEFAULT is non-nil, recognize default @@ -1622,7 +1622,7 @@ bindings; see the description of `lookup-key' for more details about this. */) DEFUN ("global-key-binding", Fglobal_key_binding, Sglobal_key_binding, 1, 2, 0, doc: /* Return the binding for command KEYS in current global keymap only. -KEYS is a string, a sequence of keystrokes. +KEYS is a string or vector, a sequence of keystrokes. The binding is probably a symbol with a function definition. This function's return values are the same as those of `lookup-key' \(which see). @@ -3752,7 +3752,7 @@ key, typing `ESC O P x' would return [f1 x]. */); DEFVAR_LISP ("key-translation-map", &Vkey_translation_map, doc: /* Keymap of key translations that can override keymaps. This keymap works like `function-key-map', but comes after that, -and applies even for keys that have ordinary bindings. */); +and its non-prefix bindings override ordinary bindings. */); Vkey_translation_map = Qnil; staticpro (&Vmouse_events); |