aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2001-03-12 14:48:45 +0000
committerEli Zaretskii2001-03-12 14:48:45 +0000
commit5141f9d0fb812fa1be0d161d92d194304ddd2e65 (patch)
treec6ae744b07cb799ed11b5ec506f593167196c1dd /src
parentb6a15240fff6403fea9bb4aef3d951c2c73c1008 (diff)
downloademacs-5141f9d0fb812fa1be0d161d92d194304ddd2e65.tar.gz
emacs-5141f9d0fb812fa1be0d161d92d194304ddd2e65.zip
(syms_of_keyboard) <overriding-local-map>: Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/keyboard.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 864a123c94c..d03b76d6083 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12001-03-12 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * keyboard.c (syms_of_keyboard) <overriding-terminal-local-map>:
4 Doc fix.
5
12001-03-12 Gerd Moellmann <gerd@gnu.org> 62001-03-12 Gerd Moellmann <gerd@gnu.org>
2 7
3 * xrdb.c (x_load_resources) [USE_MOTIF]: Remove extraneous arg 8 * xrdb.c (x_load_resources) [USE_MOTIF]: Remove extraneous arg
diff --git a/src/keyboard.c b/src/keyboard.c
index 3c01af43475..d3b6cd23a42 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10620,7 +10620,7 @@ The elements of the list are event types that may have menu bar bindings.");
10620 "Per-terminal keymap that overrides all other local keymaps.\n\ 10620 "Per-terminal keymap that overrides all other local keymaps.\n\
10621If this variable is non-nil, it is used as a keymap instead of the\n\ 10621If this variable is non-nil, it is used as a keymap instead of the\n\
10622buffer's local map, and the minor mode keymaps and text property keymaps.\n\ 10622buffer's local map, and the minor mode keymaps and text property keymaps.\n\
10623This variable is intended to let commands such as `universal-argumemnt'\n\ 10623This variable is intended to let commands such as `universal-argument'\n\
10624set up a different keymap for reading the next command."); 10624set up a different keymap for reading the next command.");
10625 10625
10626 DEFVAR_LISP ("overriding-local-map", &Voverriding_local_map, 10626 DEFVAR_LISP ("overriding-local-map", &Voverriding_local_map,