aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2013-12-25 18:24:52 +0800
committerChong Yidong2013-12-25 18:24:52 +0800
commitc93525876d67837669c5e8f89b6606b4cfb55ec4 (patch)
tree9518ab8234c570b12cdf9f6964c895e47c9a49e8 /src
parentff1c842a9477dee39fa20f885d64288b4947a040 (diff)
downloademacs-c93525876d67837669c5e8f89b6606b4cfb55ec4.tar.gz
emacs-c93525876d67837669c5e8f89b6606b4cfb55ec4.zip
Doc updates for several Emacs 24.4 changes.
* doc/lispref/commands.texi (Event Input Misc): Document new arg to input-pending-p. * doc/lispref/display.texi (Font Selection): Tweak example. * doc/lispref/keymaps.texi (Active Keymaps): Re-organize the text. (Searching Keymaps): Rewrite the pseudo-code for 24.4 changes. (Controlling Active Maps): Note that set-transient-map uses overriding-terminal-local-map. * doc/lispref/nonascii.texi (Specifying Coding Systems): Don't refer to emacs-mule-dos. (Lisp and Coding Systems): Describe emacs-mule return value in modern terms. * doc/lispref/tips.texi (Coding Conventions): Tweak the coding system tip; Emacs now uses utf-8 by default for Emacs Lisp source files. * doc/emacs/glossary.texi (Glossary): Define MULE in modern terms. * src/keyboard.c (Voverriding_terminal_local_map): (Voverriding_local_map): Doc fix. * src/keymap.c (Vemulation_mode_map_alists): Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/keyboard.c13
-rw-r--r--src/keymap.c2
3 files changed, 15 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1de6122edd0..a883182754d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12013-12-25 Chong Yidong <cyd@gnu.org>
2
3 * keyboard.c (Voverriding_terminal_local_map):
4 (Voverriding_local_map): Doc fix.
5
6 * keymap.c (Vemulation_mode_map_alists): Doc fix.
7
12013-12-24 Eli Zaretskii <eliz@gnu.org> 82013-12-24 Eli Zaretskii <eliz@gnu.org>
2 9
3 * w32fns.c (Fw32_shell_execute): Ensure DOCUMENT is an absolute 10 * w32fns.c (Fw32_shell_execute): Ensure DOCUMENT is an absolute
diff --git a/src/keyboard.c b/src/keyboard.c
index 915ce9dcf23..8ccbf77871c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11415,18 +11415,19 @@ tool-bar separators natively. Otherwise it is unused (e.g. on GTK). */);
11415 DEFVAR_KBOARD ("overriding-terminal-local-map", 11415 DEFVAR_KBOARD ("overriding-terminal-local-map",
11416 Voverriding_terminal_local_map, 11416 Voverriding_terminal_local_map,
11417 doc: /* Per-terminal keymap that takes precedence over all other keymaps. 11417 doc: /* Per-terminal keymap that takes precedence over all other keymaps.
11418
11419This variable is intended to let commands such as `universal-argument' 11418This variable is intended to let commands such as `universal-argument'
11420set up a different keymap for reading the next command. 11419set up a different keymap for reading the next command.
11421 11420
11422`overriding-terminal-local-map' has a separate binding for each 11421`overriding-terminal-local-map' has a separate binding for each
11423terminal device. 11422terminal device. See Info node `(elisp)Multiple Terminals'. */);
11424See Info node `(elisp)Multiple Terminals'. */);
11425 11423
11426 DEFVAR_LISP ("overriding-local-map", Voverriding_local_map, 11424 DEFVAR_LISP ("overriding-local-map", Voverriding_local_map,
11427 doc: /* Keymap that overrides almost all other local keymaps. 11425 doc: /* Keymap that replaces (overrides) local keymaps.
11428If this variable is non-nil, it is used as a keymap--replacing the 11426If this variable is non-nil, Emacs looks up key bindings in this
11429buffer's local map, the minor mode keymaps, and char property keymaps. */); 11427keymap INSTEAD OF the keymap char property, minor mode maps, and the
11428buffer's local map. Hence, the only active keymaps would be
11429`overriding-terminal-local-map', this keymap, and `global-keymap', in
11430order of precedence. */);
11430 Voverriding_local_map = Qnil; 11431 Voverriding_local_map = Qnil;
11431 11432
11432 DEFVAR_LISP ("overriding-local-map-menu-flag", Voverriding_local_map_menu_flag, 11433 DEFVAR_LISP ("overriding-local-map-menu-flag", Voverriding_local_map_menu_flag,
diff --git a/src/keymap.c b/src/keymap.c
index 562787ee8a5..9ef5a0b294f 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3753,7 +3753,7 @@ it is provided for major modes to bind locally. */);
3753 Vminor_mode_overriding_map_alist = Qnil; 3753 Vminor_mode_overriding_map_alist = Qnil;
3754 3754
3755 DEFVAR_LISP ("emulation-mode-map-alists", Vemulation_mode_map_alists, 3755 DEFVAR_LISP ("emulation-mode-map-alists", Vemulation_mode_map_alists,
3756 doc: /* List of keymap alists to use for emulations modes. 3756 doc: /* List of keymap alists to use for emulation modes.
3757It is intended for modes or packages using multiple minor-mode keymaps. 3757It is intended for modes or packages using multiple minor-mode keymaps.
3758Each element is a keymap alist just like `minor-mode-map-alist', or a 3758Each element is a keymap alist just like `minor-mode-map-alist', or a
3759symbol with a variable binding which is a keymap alist, and it is used 3759symbol with a variable binding which is a keymap alist, and it is used