diff options
| author | Stefan Kangas | 2021-02-01 06:12:15 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2021-02-01 12:29:10 +0100 |
| commit | d987ca6f2267f5107a3e543fca4e8eaca983afa6 (patch) | |
| tree | fafff15c5dbf63f53ab9b036baee1041ad43c809 | |
| parent | 9785c6d0a5f3fa2042f2fc8f08d3c33289c68688 (diff) | |
| download | emacs-d987ca6f2267f5107a3e543fca4e8eaca983afa6.tar.gz emacs-d987ca6f2267f5107a3e543fca4e8eaca983afa6.zip | |
Remove another variable obsolete since Emacs 23.2
* src/keymap.c (syms_of_keymap, Fdefine_key):
* lisp/subr.el (define-key-rebound-commands): Remove variable obsolete
since Emacs 23.2.
| -rw-r--r-- | etc/NEWS | 5 | ||||
| -rw-r--r-- | lisp/subr.el | 1 | ||||
| -rw-r--r-- | src/keymap.c | 9 |
3 files changed, 3 insertions, 12 deletions
| @@ -2108,8 +2108,9 @@ ledit.el, lmenu.el, lucid.el and old-whitespace.el. | |||
| 2108 | 'completion-base-size', 'completion-common-substring', | 2108 | 'completion-base-size', 'completion-common-substring', |
| 2109 | 'crm-minibuffer-complete', 'crm-minibuffer-complete-and-exit', | 2109 | 'crm-minibuffer-complete', 'crm-minibuffer-complete-and-exit', |
| 2110 | 'crm-minibuffer-completion-help', 'custom-mode', 'custom-mode-hook', | 2110 | 'crm-minibuffer-completion-help', 'custom-mode', 'custom-mode-hook', |
| 2111 | 'define-mode-overload-implementation', 'detect-coding-with-priority', | 2111 | 'define-key-rebound-commands', 'define-mode-overload-implementation', |
| 2112 | 'dirtrack-debug', 'dirtrack-debug-toggle', 'dynamic-completion-table', | 2112 | 'detect-coding-with-priority', 'dirtrack-debug', |
| 2113 | 'dirtrack-debug-toggle', 'dynamic-completion-table', | ||
| 2113 | 'easy-menu-precalculate-equivalent-keybindings', | 2114 | 'easy-menu-precalculate-equivalent-keybindings', |
| 2114 | 'epa-display-verify-result', 'epg-passphrase-callback-function', | 2115 | 'epa-display-verify-result', 'epg-passphrase-callback-function', |
| 2115 | 'eshell-report-bug', 'eval-next-after-load', 'exchange-dot-and-mark', | 2116 | 'eshell-report-bug', 'eval-next-after-load', 'exchange-dot-and-mark', |
diff --git a/lisp/subr.el b/lisp/subr.el index a85f41d7d77..6e52bd20df2 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -1694,7 +1694,6 @@ be a list of the form returned by `event-start' and `event-end'." | |||
| 1694 | 1694 | ||
| 1695 | ;;;; Obsolescence declarations for variables, and aliases. | 1695 | ;;;; Obsolescence declarations for variables, and aliases. |
| 1696 | 1696 | ||
| 1697 | (make-obsolete-variable 'define-key-rebound-commands nil "23.2") | ||
| 1698 | (make-obsolete-variable 'redisplay-end-trigger-functions 'jit-lock-register "23.1") | 1697 | (make-obsolete-variable 'redisplay-end-trigger-functions 'jit-lock-register "23.1") |
| 1699 | (make-obsolete-variable 'deferred-action-list 'post-command-hook "24.1") | 1698 | (make-obsolete-variable 'deferred-action-list 'post-command-hook "24.1") |
| 1700 | (make-obsolete-variable 'deferred-action-function 'post-command-hook "24.1") | 1699 | (make-obsolete-variable 'deferred-action-function 'post-command-hook "24.1") |
diff --git a/src/keymap.c b/src/keymap.c index de9b2b58c5e..782931fadff 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -1065,9 +1065,6 @@ binding KEY to DEF is added at the front of KEYMAP. */) | |||
| 1065 | if (length == 0) | 1065 | if (length == 0) |
| 1066 | return Qnil; | 1066 | return Qnil; |
| 1067 | 1067 | ||
| 1068 | if (SYMBOLP (def) && !EQ (Vdefine_key_rebound_commands, Qt)) | ||
| 1069 | Vdefine_key_rebound_commands = Fcons (def, Vdefine_key_rebound_commands); | ||
| 1070 | |||
| 1071 | int meta_bit = (VECTORP (key) || (STRINGP (key) && STRING_MULTIBYTE (key)) | 1068 | int meta_bit = (VECTORP (key) || (STRINGP (key) && STRING_MULTIBYTE (key)) |
| 1072 | ? meta_modifier : 0x80); | 1069 | ? meta_modifier : 0x80); |
| 1073 | 1070 | ||
| @@ -3132,12 +3129,6 @@ syms_of_keymap (void) | |||
| 3132 | pure_cons (build_pure_c_string ("SPC"), build_pure_c_string (" "))); | 3129 | pure_cons (build_pure_c_string ("SPC"), build_pure_c_string (" "))); |
| 3133 | staticpro (&exclude_keys); | 3130 | staticpro (&exclude_keys); |
| 3134 | 3131 | ||
| 3135 | DEFVAR_LISP ("define-key-rebound-commands", Vdefine_key_rebound_commands, | ||
| 3136 | doc: /* List of commands given new key bindings recently. | ||
| 3137 | This is used for internal purposes during Emacs startup; | ||
| 3138 | don't alter it yourself. */); | ||
| 3139 | Vdefine_key_rebound_commands = Qt; | ||
| 3140 | |||
| 3141 | DEFVAR_LISP ("minibuffer-local-map", Vminibuffer_local_map, | 3132 | DEFVAR_LISP ("minibuffer-local-map", Vminibuffer_local_map, |
| 3142 | doc: /* Default keymap to use when reading from the minibuffer. */); | 3133 | doc: /* Default keymap to use when reading from the minibuffer. */); |
| 3143 | Vminibuffer_local_map = Fmake_sparse_keymap (Qnil); | 3134 | Vminibuffer_local_map = Fmake_sparse_keymap (Qnil); |