From: Glenn Morris <rgm@gnu.org>
Date: Fri, 8 Feb 2013 17:23:24 +0000 (-0800)
Subject: Merge from emacs-24; up to 2012-12-14T21:27:39Z!rgm@gnu.org
X-Git-Tag: emacs-24.3.90~173^2~7^2~124
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=078891963d172f00c9866427683e486984d2d0e1;p=emacs.git

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

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