diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-07-18 18:44:54 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-07-18 18:44:54 +0900 |
| commit | b242394f24b154f8e20f5abf4b2f826629e99ea6 (patch) | |
| tree | 9d20e7baa90bd4039ff08c098a09a8c729ce2f12 /src/keyboard.c | |
| parent | 492a0ae5927eda83b65dd08d3e1655a62fc2c43d (diff) | |
| parent | 6b802a08cabfb23bdf1f65faa2ee163d3efa820d (diff) | |
| download | emacs-b242394f24b154f8e20f5abf4b2f826629e99ea6.tar.gz emacs-b242394f24b154f8e20f5abf4b2f826629e99ea6.tar.bz2 emacs-b242394f24b154f8e20f5abf4b2f826629e99ea6.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 87a9512a45b..7d045648881 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -12149,10 +12149,11 @@ terminal device. See Info node `(elisp)Multiple Terminals'. */); DEFVAR_LISP ("overriding-local-map", Voverriding_local_map, doc: /* Keymap that replaces (overrides) local keymaps. If this variable is non-nil, Emacs looks up key bindings in this -keymap INSTEAD OF the keymap char property, minor mode maps, and the -buffer's local map. Hence, the only active keymaps would be -`overriding-terminal-local-map', this keymap, and `global-keymap', in -order of precedence. */); +keymap INSTEAD OF `keymap' text properties, `local-map' and `keymap' +overlay properties, minor mode maps, and the buffer's local map. + +Hence, the only active keymaps would be `overriding-terminal-local-map', +this keymap, and `global-keymap', in order of precedence. */); Voverriding_local_map = Qnil; DEFVAR_LISP ("overriding-local-map-menu-flag", Voverriding_local_map_menu_flag, |