diff options
| author | Stefan Kangas | 2021-01-13 18:54:09 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2021-01-13 18:54:09 +0100 |
| commit | a9658cd5b07e88a5d413cbb4dfd8f9d9d0c8bbf5 (patch) | |
| tree | 6c4703b44fd8f46052abce1dddb3ab26741dc5e3 /src/keymap.c | |
| parent | be9b7e83bc4191aff01c692be0f7a156ec4056da (diff) | |
| download | emacs-a9658cd5b07e88a5d413cbb4dfd8f9d9d0c8bbf5.tar.gz emacs-a9658cd5b07e88a5d413cbb4dfd8f9d9d0c8bbf5.zip | |
Lift {global,local}-key-binding to Lisp
* lisp/subr.el (local-key-binding, global-key-binding): New defuns.
* src/keymap.c (Flocal_key_binding, Fglobal_key_binding): Remove DEFUNs.
(syms_of_keymap): Remove defsubrs for above DEFUNs.
* test/lisp/subr-tests.el (subr-test-local-key-binding)
(subr-test-global-key-binding): New tests.
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/keymap.c b/src/keymap.c index 1197f6fd4a5..de9b2b58c5e 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -1646,39 +1646,6 @@ specified buffer position instead of point are used. | |||
| 1646 | 1646 | ||
| 1647 | /* GC is possible in this function if it autoloads a keymap. */ | 1647 | /* GC is possible in this function if it autoloads a keymap. */ |
| 1648 | 1648 | ||
| 1649 | DEFUN ("local-key-binding", Flocal_key_binding, Slocal_key_binding, 1, 2, 0, | ||
| 1650 | doc: /* Return the binding for command KEYS in current local keymap only. | ||
| 1651 | KEYS is a string or vector, a sequence of keystrokes. | ||
| 1652 | The binding is probably a symbol with a function definition. | ||
| 1653 | |||
| 1654 | If optional argument ACCEPT-DEFAULT is non-nil, recognize default | ||
| 1655 | bindings; see the description of `lookup-key' for more details about this. */) | ||
| 1656 | (Lisp_Object keys, Lisp_Object accept_default) | ||
| 1657 | { | ||
| 1658 | register Lisp_Object map = BVAR (current_buffer, keymap); | ||
| 1659 | if (NILP (map)) | ||
| 1660 | return Qnil; | ||
| 1661 | return Flookup_key (map, keys, accept_default); | ||
| 1662 | } | ||
| 1663 | |||
| 1664 | /* GC is possible in this function if it autoloads a keymap. */ | ||
| 1665 | |||
| 1666 | DEFUN ("global-key-binding", Fglobal_key_binding, Sglobal_key_binding, 1, 2, 0, | ||
| 1667 | doc: /* Return the binding for command KEYS in current global keymap only. | ||
| 1668 | KEYS is a string or vector, a sequence of keystrokes. | ||
| 1669 | The binding is probably a symbol with a function definition. | ||
| 1670 | This function's return values are the same as those of `lookup-key' | ||
| 1671 | \(which see). | ||
| 1672 | |||
| 1673 | If optional argument ACCEPT-DEFAULT is non-nil, recognize default | ||
| 1674 | bindings; see the description of `lookup-key' for more details about this. */) | ||
| 1675 | (Lisp_Object keys, Lisp_Object accept_default) | ||
| 1676 | { | ||
| 1677 | return Flookup_key (current_global_map, keys, accept_default); | ||
| 1678 | } | ||
| 1679 | |||
| 1680 | /* GC is possible in this function if it autoloads a keymap. */ | ||
| 1681 | |||
| 1682 | DEFUN ("minor-mode-key-binding", Fminor_mode_key_binding, Sminor_mode_key_binding, 1, 2, 0, | 1649 | DEFUN ("minor-mode-key-binding", Fminor_mode_key_binding, Sminor_mode_key_binding, 1, 2, 0, |
| 1683 | doc: /* Find the visible minor mode bindings of KEY. | 1650 | doc: /* Find the visible minor mode bindings of KEY. |
| 1684 | Return an alist of pairs (MODENAME . BINDING), where MODENAME is | 1651 | Return an alist of pairs (MODENAME . BINDING), where MODENAME is |
| @@ -3253,8 +3220,6 @@ be preferred. */); | |||
| 3253 | defsubr (&Scopy_keymap); | 3220 | defsubr (&Scopy_keymap); |
| 3254 | defsubr (&Scommand_remapping); | 3221 | defsubr (&Scommand_remapping); |
| 3255 | defsubr (&Skey_binding); | 3222 | defsubr (&Skey_binding); |
| 3256 | defsubr (&Slocal_key_binding); | ||
| 3257 | defsubr (&Sglobal_key_binding); | ||
| 3258 | defsubr (&Sminor_mode_key_binding); | 3223 | defsubr (&Sminor_mode_key_binding); |
| 3259 | defsubr (&Sdefine_key); | 3224 | defsubr (&Sdefine_key); |
| 3260 | defsubr (&Slookup_key); | 3225 | defsubr (&Slookup_key); |