Merge from emacs-24; up to 2012-05-08T14:11:47Z!monnier@iro.umontreal.ca

2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 85a4c829063..396240bb7b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-05  Ikumi Keita  <ikumi@ikumi.que.jp>  (tiny change)
+
+        * minibuf.c (Fcompleting_read): Doc fix.  (Bug#12555)
+
 2012-10-04  Eli Zaretskii  <eliz@gnu.org>
 
         * w32.c (utime): Test for INVALID_HANDLE_VALUE, not for NULL, to
diff --git a/src/minibuf.c b/src/minibuf.c
index 6f9c61dcfb1..dd4ca34c3fb 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1703,7 +1703,7 @@ If INITIAL-INPUT is non-nil, insert it in the minibuffer initially,
   functions, which use one-indexing for POSITION.)  This feature is
   deprecated--it is best to pass nil for INITIAL-INPUT and supply the
   default value DEF instead.  The user can yank the default value into
-  the minibuffer easily using \\[next-history-element].
+  the minibuffer easily using \\<minibuffer-local-map>\\[next-history-element].
 
 HIST, if non-nil, specifies a history list and optionally the initial
   position in the list.  It can be a symbol, which is the history list