From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Thu, 15 Jul 2021 05:17:53 +0000 (+0200)
Subject: Clarify overriding-local-map doc string
X-Git-Tag: emacs-28.0.90~1865
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4217b38d72be5b4b025260ff9839b51808f9f40;p=emacs.git

Clarify overriding-local-map doc string

* src/keyboard.c (syms_of_keyboard): Clarify
`overriding-local-map' vs. text properties/overlays (bug#16312).
---

diff --git a/src/keyboard.c b/src/keyboard.c
index 051f2f8b38a..6174a4aad92 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -12141,10 +12141,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,