diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 1c6f3f7c5f5..4a99ee1bc19 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -11269,14 +11269,15 @@ The elements of the list are event types that may have menu bar bindings. */); | |||
| 11269 | doc: /* Per-terminal keymap that overrides all other local keymaps. | 11269 | doc: /* Per-terminal keymap that overrides all other local keymaps. |
| 11270 | If this variable is non-nil, it is used as a keymap instead of the | 11270 | If this variable is non-nil, it is used as a keymap instead of the |
| 11271 | buffer's local map, and the minor mode keymaps and text property keymaps. | 11271 | buffer's local map, and the minor mode keymaps and text property keymaps. |
| 11272 | It also overrides `overriding-local-map'. | 11272 | It also replaces `overriding-local-map'. |
| 11273 | |||
| 11273 | This variable is intended to let commands such as `universal-argument' | 11274 | This variable is intended to let commands such as `universal-argument' |
| 11274 | set up a different keymap for reading the next command. */); | 11275 | set up a different keymap for reading the next command. */); |
| 11275 | 11276 | ||
| 11276 | DEFVAR_LISP ("overriding-local-map", &Voverriding_local_map, | 11277 | DEFVAR_LISP ("overriding-local-map", &Voverriding_local_map, |
| 11277 | doc: /* Keymap that overrides all other local keymaps. | 11278 | doc: /* Keymap that overrides all other local keymaps. |
| 11278 | If this variable is non-nil, it is used as a keymap instead of the | 11279 | If this variable is non-nil, it is used as a keymap--replacing the |
| 11279 | buffer's local map, and the minor mode keymaps and text property keymaps. */); | 11280 | buffer's local map, the minor mode keymaps, and char property keymaps. */); |
| 11280 | Voverriding_local_map = Qnil; | 11281 | Voverriding_local_map = Qnil; |
| 11281 | 11282 | ||
| 11282 | DEFVAR_LISP ("overriding-local-map-menu-flag", &Voverriding_local_map_menu_flag, | 11283 | DEFVAR_LISP ("overriding-local-map-menu-flag", &Voverriding_local_map_menu_flag, |