aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLuc Teirlinck2004-08-07 02:32:11 +0000
committerLuc Teirlinck2004-08-07 02:32:11 +0000
commit2515a13130407aaad6ff3c25ab6e013fec042ac8 (patch)
treeae7bb418e9d3f06532205b839e4ca574165c5cb6 /src
parent5504e99ca65abbc04ab68a13612e51b6b5c04e7a (diff)
downloademacs-2515a13130407aaad6ff3c25ab6e013fec042ac8.tar.gz
emacs-2515a13130407aaad6ff3c25ab6e013fec042ac8.zip
(syms_of_keyboard) <overriding-terminal-local-map>: Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/keyboard.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2b0c47862d4..285f9162a75 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12004-08-06 Luc Teirlinck <teirllm@auburn.edu>
2
3 * keyboard.c (syms_of_keyboard) <overriding-terminal-local-map>:
4 Doc fix.
5
12004-08-03 Kenichi Handa <handa@m17n.org> 62004-08-03 Kenichi Handa <handa@m17n.org>
2 7
3 * coding.c (decode_coding_string): Adjust coding->consumed, and 8 * 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. */);
11280 doc: /* Per-terminal keymap that overrides all other local keymaps. 11280 doc: /* Per-terminal keymap that overrides all other local keymaps.
11281If this variable is non-nil, it is used as a keymap instead of the 11281If this variable is non-nil, it is used as a keymap instead of the
11282buffer's local map, and the minor mode keymaps and text property keymaps. 11282buffer's local map, and the minor mode keymaps and text property keymaps.
11283It also overrides `overriding-local-map'.
11283This variable is intended to let commands such as `universal-argument' 11284This variable is intended to let commands such as `universal-argument'
11284set up a different keymap for reading the next command. */); 11285set up a different keymap for reading the next command. */);
11285 11286