aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.c
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/keymap.c
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/keymap.c')
-rw-r--r--src/keymap.c2
1 files changed, 1 insertions, 1 deletions
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