Merge from emacs-24; up to 2012-12-14T21:27:39Z!rgm@gnu.org

diff --cc doc/lispref/ChangeLog
index 111a159,0fff7ef..7c444a0
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,4 -1,9 +1,9 @@@
 -2013-01-16  Glenn Morris  <rgm@gnu.org>
+ 2013-02-08  Glenn Morris  <rgm@gnu.org>
+ 
+       * keymaps.texi (Active Keymaps, Searching Keymaps):
+       Remove confusing mention of "symbolic prefix".  (Bug#13643)
+ 
 +2013-01-19  Glenn Morris  <rgm@gnu.org>
  
        * macros.texi (Indenting Macros): Fix order of an indent
        symbol's arguments.  (Bug#13450)

diff --cc doc/misc/ChangeLog
Simple merge

diff --cc doc/misc/eshell.texi
Simple merge

diff --cc etc/TODO
Simple merge

diff --cc src/xdisp.c
Simple merge