(syms_of_keyboard) <overriding-terminal-local-map>: Doc fix.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2b0c47862d465093d9db85b5cb1244a4d46a844f..285f9162a75cff318727aea450e014116d4d0e35 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-06  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * keyboard.c (syms_of_keyboard) <overriding-terminal-local-map>:
+       Doc fix.
+
 2004-08-03  Kenichi Handa  <handa@m17n.org>
 
        * coding.c (decode_coding_string): Adjust coding->consumed, and

diff --git a/src/keyboard.c b/src/keyboard.c
index 07b91d160403fea47085c4dd50cf7ba57bb77232..55802e7d30aa077937dfc82a65a8070f6de61493 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11280,6 +11280,7 @@ The elements of the list are event types that may have menu bar bindings.  */);
                 doc: /* Per-terminal keymap that overrides all other local keymaps.
 If this variable is non-nil, it is used as a keymap instead of the
 buffer's local map, and the minor mode keymaps and text property keymaps.
+It also overrides `overriding-local-map'.
 This variable is intended to let commands such as `universal-argument'
 set up a different keymap for reading the next command.  */);