From: Luc Teirlinck <teirllm@auburn.edu>
Date: Sat, 7 Aug 2004 02:32:11 +0000 (+0000)
Subject: (syms_of_keyboard) <overriding-terminal-local-map>: Doc fix.
X-Git-Tag: ttn-vms-21-2-B4~5335
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2515a13130407aaad6ff3c25ab6e013fec042ac8;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 2b0c47862d4..285f9162a75 100644
--- 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 07b91d16040..55802e7d30a 100644
--- 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.  */);