[Emacs-diffs] trunk r115740: Doc updates for several Emacs 24.4 changes.

[Chong Yidong]

------------------------------------------------------------
revno: 115740
revision-id: address@hidden
parent: address@hidden
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-25 18:24:52 +0800
message:
  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.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/glossary.texi        
glossary.texi-20091113204419-o5vbwnq5f7feedwu-6253
  doc/emacs/mule.texi            mule.texi-20091113204419-o5vbwnq5f7feedwu-6270
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/commands.texi      
commands.texi-20091113204419-o5vbwnq5f7feedwu-6165
  doc/lispref/display.texi       
display.texi-20091113204419-o5vbwnq5f7feedwu-6172
  doc/lispref/keymaps.texi       
keymaps.texi-20091113204419-o5vbwnq5f7feedwu-6190
  doc/lispref/nonascii.texi      
nonascii.texi-20091113204419-o5vbwnq5f7feedwu-6202
  doc/lispref/tips.texi          tips.texi-20091113204419-o5vbwnq5f7feedwu-6217
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/keyboard.c                 keyboard.c-20091113204419-o5vbwnq5f7feedwu-449
  src/keymap.c                   keymap.c-20091113204419-o5vbwnq5f7feedwu-219

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2013-12-25 02:18:43 +0000
+++ b/doc/emacs/ChangeLog       2013-12-25 10:24:52 +0000
@@ -1,3 +1,7 @@
+2013-12-25  Chong Yidong  <address@hidden>
+
+       * glossary.texi (Glossary): Define MULE in modern terms.
+
 2013-12-25  Xue Fuqiao  <address@hidden>
 
        * files.texi (Diff Mode): Add an index.

=== modified file 'doc/emacs/glossary.texi'
--- a/doc/emacs/glossary.texi   2013-10-23 17:20:09 +0000
+++ b/doc/emacs/glossary.texi   2013-12-25 10:24:52 +0000
@@ -953,9 +953,15 @@
 yanking (q.v.@:) it.  @xref{Killing}.
 
 @item MULE
-MULE refers to the Emacs features for editing multilingual
address@hidden text using multibyte characters (q.v.).
address@hidden
address@hidden MULE
+Prior to Emacs 23, @acronym{MULE} was the name of a software package
+which provided a @dfn{MULtilingual Enhancement} to Emacs, by adding
+support for multiple character sets (q.v.).  @acronym{MULE} was later
+integrated into Emacs, and much of it was replaced when Emacs gained
+internal Unicode support in version 23.
+
+Some parts of Emacs that deal with character set support still use the
address@hidden name.  @xref{International}.
 
 @item Multibyte Character
 A multibyte character is a character that takes up several bytes in a

=== modified file 'doc/emacs/mule.texi'
--- a/doc/emacs/mule.texi       2013-12-07 16:51:33 +0000
+++ b/doc/emacs/mule.texi       2013-12-25 10:24:52 +0000
@@ -5,7 +5,6 @@
 @chapter International Character Set Support
 @c This node is referenced in the tutorial.  When renaming or deleting
 @c it, the tutorial needs to be adjusted.  (TUTORIAL.de)
address@hidden MULE
 @cindex international scripts
 @cindex multibyte characters
 @cindex encoding of characters

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-12-25 09:12:24 +0000
+++ b/doc/lispref/ChangeLog     2013-12-25 10:24:52 +0000
@@ -1,3 +1,23 @@
+2013-12-25  Chong Yidong  <address@hidden>
+
+       * 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.
+
+       * tips.texi (Coding Conventions): Tweak the coding system tip;
+       Emacs now uses utf-8 by default for Emacs Lisp source files.
+
+       * display.texi (Font Selection): Tweak example.
+
+       * commands.texi (Event Input Misc): Document new arg to
+       input-pending-p.
+
+       * nonascii.texi (Specifying Coding Systems): Don't refer to
+       emacs-mule-dos.
+       (Lisp and Coding Systems): Describe emacs-mule return value in
+       modern terms.
+
 2013-12-25  Tassilo Horn  <address@hidden>
 
        * control.texi (Pattern matching case statement): Rephrase lexical

=== modified file 'doc/lispref/commands.texi'
--- a/doc/lispref/commands.texi 2013-01-09 21:26:08 +0000
+++ b/doc/lispref/commands.texi 2013-12-25 10:24:52 +0000
@@ -2739,12 +2739,16 @@
 individual events, which you can put in @code{unread-command-events}.
 @end defun
 
address@hidden input-pending-p
address@hidden input-pending-p &optional check-timers
 @cindex waiting for command key input
 This function determines whether any command input is currently
 available to be read.  It returns immediately, with value @code{t} if
 there is available input, @code{nil} otherwise.  On rare occasions it
 may return @code{t} when no input is available.
+
+If the optional argument @var{check-timers} is address@hidden, then if
+no input is available, Emacs runs any timers which are ready.
address@hidden
 @end defun
 
 @defvar last-input-event

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2013-12-20 14:28:01 +0000
+++ b/doc/lispref/display.texi  2013-12-25 10:24:52 +0000
@@ -2962,11 +2962,11 @@
 expression in the list.  For example,
 
 @example
-(setq scalable-fonts-allowed '("muleindian-2$"))
+(setq scalable-fonts-allowed '("iso10646-1$"))
 @end example
 
 @noindent
-allows the use of scalable fonts with registry @code{muleindian-2}.
+allows the use of scalable fonts with registry @code{iso10646-1}.
 @end defopt
 
 @defvar face-font-rescale-alist

=== modified file 'doc/lispref/keymaps.texi'
--- a/doc/lispref/keymaps.texi  2013-12-23 03:59:10 +0000
+++ b/doc/lispref/keymaps.texi  2013-12-25 10:24:52 +0000
@@ -622,75 +622,67 @@
 @node Active Keymaps
 @section Active Keymaps
 @cindex active keymap
address@hidden global keymap
+
+  Emacs contains many keymaps, but at any time only a few keymaps are
address@hidden  When Emacs receives user input, it translates the input
+event (@pxref{Translation Keymaps}), and looks for a key binding in
+the active keymaps.
+
+  Usually, the active keymaps are: (i) the keymap specified by the
address@hidden property, (ii) the keymaps of enabled minor modes, (iii)
+the current buffer's local keymap, and (iv) the global keymap, in that
+order.  Emacs searches for each input key sequence in all these
+keymaps.
+
+  Of these ``usual'' keymaps, the highest-precedence one is specified
+by the @code{keymap} text or overlay property at point, if any.  (For
+a mouse input event, Emacs uses the event position instead of point;
address@hidden
+see the next section for details.)
address@hidden iftex
address@hidden
address@hidden Keymaps}.)
address@hidden ifnottex
+
+  Next in precedence are keymaps specified by enabled minor modes.
+These keymaps, if any, are specified by the variables
address@hidden,
address@hidden, and
address@hidden  @xref{Controlling Active Maps}.
+
 @cindex local keymap
-
-  Emacs normally contains many keymaps; at any given time, just a few
-of them are @dfn{active}, meaning that they participate in the
-interpretation of user input.  All the active keymaps are used
-together to determine what command to execute when a key is entered.
-
-  Normally the active keymaps are the @code{keymap} property keymap,
-the keymaps of any enabled minor modes, the current buffer's local
-keymap, and the global keymap, in that order.  Emacs searches for each
-input key sequence in all these keymaps.  @xref{Searching Keymaps},
-for more details of this procedure.
-
-  When the key sequence starts with a mouse event,
-the active keymaps are determined based on the
-position in that event.  If the event happened on a string embedded
-with a @code{display}, @code{before-string}, or @code{after-string}
-property (@pxref{Special Properties}), the address@hidden map
-properties of the string override those of the buffer (if the
-underlying buffer text contains map properties in its text properties
-or overlays, they are ignored).
-
-  The @dfn{global keymap} holds the bindings of keys that are defined
-regardless of the current buffer, such as @kbd{C-f}.  The variable
address@hidden holds this keymap, which is always active.
-
-  Each buffer may have another keymap, its @dfn{local keymap}, which
-may contain new or overriding definitions for keys.  The current
-buffer's local keymap is always active except when
address@hidden overrides it.  The @code{local-map} text
-or overlay property can specify an alternative local keymap for certain
-parts of the buffer; see @ref{Special Properties}.
-
-  Each minor mode can have a keymap; if it does, the keymap is active
-when the minor mode is enabled.  Modes for emulation can specify
-additional active keymaps through the variable
address@hidden
-
-  The highest precedence normal keymap comes from the @code{keymap}
-text or overlay property.  If that is address@hidden, it is the first
-keymap to be processed, in normal circumstances.
-
-  However, there are also special ways for programs to substitute
-other keymaps for some of those.  The variable
address@hidden, if address@hidden, specifies a keymap
-that replaces all the usual active keymaps except the global keymap.
-
-The very highest precedence keymap comes from
address@hidden; it operates on a per-terminal basis and
-is normally used for modal/transient keybindings.
+  Next in precedence is the buffer's @dfn{local keymap}, containing
+key bindings specific to the buffer.  The minibuffer also has a local
+keymap (@pxref{Intro to Minibuffers}).  If there is a @code{local-map}
+text or overlay property at point, that specifies the local keymap to
+use, in place of the buffer's default local keymap.
 
 @cindex major mode keymap
-  Since every buffer that uses the same major mode normally uses the
-same local keymap, you can think of the keymap as local to the mode.  A
-change to the local keymap of a buffer (using @code{local-set-key}, for
-example) is seen also in the other buffers that share that keymap.
-
-  The local keymaps that are used for Lisp mode and some other major
-modes exist even if they have not yet been used.  These local keymaps are
-the values of variables such as @code{lisp-mode-map}.  For most major
-modes, which are less frequently used, the local keymap is constructed
-only when the mode is used for the first time in a session.
-
-  The minibuffer has local keymaps, too; they contain various completion
-and exit commands.  @xref{Intro to Minibuffers}.
-
-  Emacs has other keymaps that are used in a different way---translating
-events within @code{read-key-sequence}.  @xref{Translation Keymaps}.
+  The local keymap is normally set by the buffer's major mode, and
+every buffer with the same major mode shares the same local keymap.
+Hence, if you call @code{local-set-key} (@pxref{Key Binding Commands})
+to change the local keymap in one buffer, that also affects the local
+keymaps in other buffers with the same major mode.
+
address@hidden global keymap
+  Finally, the @dfn{global keymap} contains key bindings that are
+defined regardless of the current buffer, such as @kbd{C-f}.  It is
+always active, and is bound to the variable @code{global-map}.
+
+  Apart from the above ``usual'' keymaps, Emacs provides special ways
+for programs to make other keymaps active.  Firstly, the variable
address@hidden specifies a keymap that replaces the usual
+active keymaps, except for the global keymap.  Secondly, the
+terminal-local variable @code{overriding-terminal-local-map} specifies
+a keymap that takes precedence over @emph{all} other keymaps
+(including @code{overriding-local-map}); this is normally used for
+modal/transient keybindings (the function @code{set-transient-map}
+provides a convenient interface for this).  @xref{Controlling Active
+Maps}, for details.
+
+  Making keymaps active is not the only way to use them.  Keymaps are
+also used in other ways, such as for translating events within
address@hidden  @xref{Translation Keymaps}.
 
   @xref{Standard Keymaps}, for a list of some standard keymaps.
 
@@ -727,7 +719,7 @@
 position or an event position like the value of @code{event-start}.
 Then the maps consulted are determined based on @var{position}.
 
-An error is signaled if @var{key} is not a string or a vector.
+Emacs signals an error if @var{key} is not a string or a vector.
 
 @example
 @group
@@ -741,49 +733,52 @@
 @section Searching the Active Keymaps
 @cindex searching active keymaps for keys
 
-  After translation of event subsequences (@pxref{Translation
-Keymaps}) Emacs looks for them in the active keymaps.  Here is a
-pseudo-Lisp description of the order and conditions for searching
-them:
+Here is a pseudo-Lisp summary of how Emacs searches the active
+keymaps:
 
 @lisp
-(or (@var{find-in} @var{transient-map})
-    (cond
-     (overriding-terminal-local-map
-      (@var{find-in} overriding-terminal-local-map))
-     (overriding-local-map
-      (@var{find-in} overriding-local-map))
-     ((or (@var{find-in} (get-char-property (point) 'keymap))
+(or (if overriding-terminal-local-map
+        (@var{find-in} overriding-terminal-local-map))
+    (if overriding-local-map
+        (@var{find-in} overriding-local-map)
+      (or (@var{find-in} (get-char-property (point) 'keymap))
           (@var{find-in-any} emulation-mode-map-alists)
           (@var{find-in-any} minor-mode-overriding-map-alist)
           (@var{find-in-any} minor-mode-map-alist)
           (if (get-text-property (point) 'local-map)
               (@var{find-in} (get-char-property (point) 'local-map))
-            (@var{find-in} (current-local-map))))))
+            (@var{find-in} (current-local-map)))))
     (@var{find-in} (current-global-map)))
 @end lisp
 
 @noindent
 Here, @var{find-in} and @var{find-in-any} are pseudo functions that
-search in one keymap and in an alist of keymaps, respectively.
-(Searching a single keymap for a binding is called @dfn{key lookup};
-see @ref{Key Lookup}.)  @var{transient-map} is a pseudo variable that
-represents the effect of a @code{set-transient-map} call
-(@pxref{Controlling Active Maps}).
+search in one keymap and in an alist of keymaps, respectively.  Note
+that the @code{set-transient-map} function works by setting
address@hidden (@pxref{Controlling Active
+Maps}).
 
   In the above pseudo-code, if a key sequence starts with a mouse
-event, that event's position is used instead of point and the current
-buffer.  Mouse events on an embedded string use address@hidden text
-properties from that string instead of the buffer.
-
-  When a match is found (@pxref{Key Lookup}), if the binding in the
-keymap is a function, the search is over.  However if the keymap entry
-is a symbol with a value or a string, Emacs replaces the input key
-sequences with the variable's value or the string, and restarts the
-search of the active keymaps.
-
-  The function finally found might also be remapped.  @xref{Remapping
-Commands}.
+event (@pxref{Mouse Events}), that event's position is used instead of
+point, and the event's buffer is used instead of the current buffer.
+In particular, this affects how the @code{keymap} and @code{local-map}
+properties are looked up.  If a mouse event occurs on a string
+embedded with a @code{display}, @code{before-string}, or
address@hidden property (@pxref{Special Properties}), and the
+string has a address@hidden @code{keymap} or @code{local-map}
+property, that overrides the corresponding property in the underlying
+buffer text (i.e., the property specified by the underlying text is
+ignored).
+
+  When a key binding is found in one of the active keymaps, and that
+binding is a command, the search is over---the command is executed.
+However, if the binding is a symbol with a value or a string, Emacs
+replaces the input key sequences with the variable's value or the
+string, and restarts the search of the active keymaps.  @xref{Key
+Lookup}.
+
+  The command which is finally found might also be remapped.
address@hidden Commands}.
 
 @node Controlling Active Maps
 @section Controlling the Active Keymaps
@@ -860,7 +855,6 @@
 commands use this function.
 @end defun
 
address@hidden Emacs 19 feature
 @defvar minor-mode-map-alist
 @anchor{Definition of minor-mode-map-alist}
 This variable is an alist describing keymaps that may or may not be
@@ -945,7 +939,7 @@
 @end defvar
 
 @defvar emulation-mode-map-alists
-This variable holds a list of keymap alists to use for emulations
+This variable holds a list of keymap alists to use for emulation
 modes.  It is intended for modes or packages using multiple minor-mode
 keymaps.  Each element is a keymap alist which has the same format and
 meaning as @code{minor-mode-map-alist}, or a symbol with a variable
@@ -970,11 +964,9 @@
 while @var{keymap} is active; it should return address@hidden if
 @var{keymap} should stay active.
 
-The transient keymap takes precedence over the ``overriding'' maps
-(see above); and unlike them, if no match for a key is found in
address@hidden, the key lookup process continues.  For a pseudo-Lisp
-description of exactly how and when this keymap applies,
address@hidden Keymaps}.
+This function works by adding and removing @code{keymap} from the
+variable @code{overriding-terminal-local-map}, which takes precedence
+over all other active keymaps (@pxref{Searching Keymaps}).
 @end defun
 
 @node Key Lookup

=== modified file 'doc/lispref/nonascii.texi'
--- a/doc/lispref/nonascii.texi 2013-12-22 18:17:20 +0000
+++ b/doc/lispref/nonascii.texi 2013-12-25 10:24:52 +0000
@@ -1289,17 +1289,18 @@
 support too many character sets to list them all yield special values:
 @itemize @bullet
 @item
-If @var{coding-system} supports all the ISO-2022 charsets, the value
-is @code{iso-2022}.
address@hidden
 If @var{coding-system} supports all Emacs characters, the value is
 @code{(emacs)}.
 @item
-If @var{coding-system} supports all emacs-mule characters, the value
-is @code{emacs-mule}.
address@hidden
 If @var{coding-system} supports all Unicode characters, the value is
 @code{(unicode)}.
address@hidden
+If @var{coding-system} supports all ISO-2022 charsets, the value is
address@hidden
address@hidden
+If @var{coding-system} supports all the characters in the internal
+coding system used by Emacs version 21 (prior to the implementation of
+internal Unicode support), the value is @code{emacs-mule}.
 @end itemize
 @end defun
 
@@ -1617,8 +1618,7 @@
 
 @example
 ;; @r{Read the file with no character code conversion.}
-;; @r{Assume @acronym{crlf} represents end-of-line.}
-(let ((coding-system-for-read 'emacs-mule-dos))
+(let ((coding-system-for-read 'no-conversion))
   (insert-file-contents filename))
 @end example
 

=== modified file 'doc/lispref/tips.texi'
--- a/doc/lispref/tips.texi     2013-10-07 03:46:32 +0000
+++ b/doc/lispref/tips.texi     2013-12-25 10:24:52 +0000
@@ -223,18 +223,13 @@
 coherent if all libraries use the same conventions.
 
 @item
-If your program contains non-ASCII characters in string or character
-constants, you should make sure Emacs always decodes these characters
-the same way, regardless of the user's settings.  The easiest way to
-do this is to use the coding system @code{utf-8-emacs} (@pxref{Coding
-System Basics}), and specify that coding in the @samp{-*-} line or the
+The default file coding system for Emacs Lisp source files is UTF-8
+(@pxref{Text Representations}).  In the rare event that your program
+contains characters which are @emph{not} in UTF-8, you should specify
+an appropriate coding system in the source file's @samp{-*-} line or
 local variables list.  @xref{File Variables, , Local Variables in
 Files, emacs, The GNU Emacs Manual}.
 
address@hidden
-;; XXX.el  -*- coding: utf-8-emacs; -*-
address@hidden example
-
 @item
 Indent the file using the default indentation parameters.
 

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-12-25 03:05:11 +0000
+++ b/etc/NEWS  2013-12-25 10:24:52 +0000
@@ -545,7 +545,7 @@
 *** New option `imenu-generic-skip-comments-and-strings'.
 
 ** Info
-
+---
 *** New face `info-index-match' is used to highlight matches in index
 entries displayed by `Info-index-next', `Info-virtual-index' and
 `info-apropos'.
@@ -849,19 +849,23 @@
 
 * Incompatible Lisp Changes in Emacs 24.4
 
+---
 ** `kill-region' lost its `yank-handler' optional argument.
 
++++
 ** `(input-pending-p)' no longer runs other timers which are ready to
 run.  The new optional CHECK-TIMERS param allows for the prior behavior.
 
 ** `defvar' and `defcustom' in a let-binding affect the "external" default.
 
+---
 ** The syntax of ?» and ?« is now punctuation instead of matched parens.
 Some languages match those as »...« and others as «...» so better stay neutral.
 
 ---
 ** In compiled Lisp files, the header no longer includes a timestamp.
 
++++
 ** The default file coding for Emacs Lisp files is now utf-8.
 (See `file-coding-system-alist'.)  In most cases, this change is
 transparent, but files that contain unusual characters without
@@ -869,6 +873,7 @@
 errors.  You should either convert them to utf-8 or add an explicit
 `coding:' cookie.
 
++++
 ** `overriding-terminal-local-map' no longer replaces the local keymaps.
 It used to disable the minor mode, major mode, and text-property keymaps,
 whereas now it simply has higher precedence.
@@ -881,9 +886,11 @@
 keyboard-coding-system is not performed in read-event any more.  But contrary
 to that past, it is still done before input-decode-map/function-key-map/...
 
-** Removed inhibit-local-menu-bar-menus.
+---
+** Removed `inhibit-local-menu-bar-menus'.
 
-** frame-local variables that affect redisplay do not work any more.
+---
+** Frame-local variables that affect redisplay do not work any more.
 More specifically, the redisplay does not bother to check for a frame-local
 value when looking up variables.
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-24 17:21:06 +0000
+++ b/src/ChangeLog     2013-12-25 10:24:52 +0000
@@ -1,3 +1,10 @@
+2013-12-25  Chong Yidong  <address@hidden>
+
+       * keyboard.c (Voverriding_terminal_local_map):
+       (Voverriding_local_map): Doc fix.
+
+       * keymap.c (Vemulation_mode_map_alists): Doc fix.
+
 2013-12-24  Eli Zaretskii  <address@hidden>
 
        * w32fns.c (Fw32_shell_execute): Ensure DOCUMENT is an absolute

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2013-12-12 04:04:35 +0000
+++ b/src/keyboard.c    2013-12-25 10:24:52 +0000
@@ -11415,18 +11415,19 @@
   DEFVAR_KBOARD ("overriding-terminal-local-map",
                 Voverriding_terminal_local_map,
                 doc: /* Per-terminal keymap that takes precedence over all 
other keymaps.
-
 This variable is intended to let commands such as `universal-argument'
 set up a different keymap for reading the next command.
 
 `overriding-terminal-local-map' has a separate binding for each
-terminal device.
-See Info node `(elisp)Multiple Terminals'.  */);
+terminal device.  See Info node `(elisp)Multiple Terminals'.  */);
 
   DEFVAR_LISP ("overriding-local-map", Voverriding_local_map,
-              doc: /* Keymap that overrides almost all other local keymaps.
-If this variable is non-nil, it is used as a keymap--replacing the
-buffer's local map, the minor mode keymaps, and char property keymaps.  */);
+              doc: /* Keymap that replaces (overrides) local keymaps.
+If this variable is non-nil, Emacs looks up key bindings in this
+keymap INSTEAD OF the keymap char property, minor mode maps, and the
+buffer's local map.  Hence, the only active keymaps would be
+`overriding-terminal-local-map', this keymap, and `global-keymap', in
+order of precedence.  */);
   Voverriding_local_map = Qnil;
 
   DEFVAR_LISP ("overriding-local-map-menu-flag", 
Voverriding_local_map_menu_flag,

=== modified file 'src/keymap.c'
--- a/src/keymap.c      2013-11-16 09:27:19 +0000
+++ b/src/keymap.c      2013-12-25 10:24:52 +0000
@@ -3753,7 +3753,7 @@
   Vminor_mode_overriding_map_alist = Qnil;
 
   DEFVAR_LISP ("emulation-mode-map-alists", Vemulation_mode_map_alists,
-              doc: /* List of keymap alists to use for emulations modes.
+              doc: /* List of keymap alists to use for emulation modes.
 It is intended for modes or packages using multiple minor-mode keymaps.
 Each element is a keymap alist just like `minor-mode-map-alist', or a
 symbol with a variable binding which is a keymap alist, and it is used