* lisp/ido.el (ido-switch-buffer, ido-find-file): Fix up doc of C-j.

Fixes: debbugs:11201

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb11ea132db8923a37ae0b52750841ca21095420..882754ecf65b275acd4195c246242e552ed3233a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,17 +1,22 @@
+2012-06-20  David Röthlisberger  <david@rothlis.net>  (tiny change)
+
+       * ido.el (ido-switch-buffer, ido-find-file): Fix up doc of C-j
+       (bug#11201).
+
 2012-06-20  Chong Yidong  <cyd@gnu.org>
 
        * term.el (term-window-width): Handle the case of a missing right
        fringe (Bug#8837).
        (term-check-size): Use window-text-height (Bug#5445).
-       (term-mode): Use define-derived-mode.  Minor cleanups.  Set
-       font-lock-defaults (Bug#7692).
+       (term-mode): Use define-derived-mode.  Minor cleanups.
+       Set font-lock-defaults (Bug#7692).
        (term-move-columns, term-insert-char, term-emulate-terminal)
        (term-erase-in-line, term-insert-spaces): Use font-lock-face.
 
 2012-06-20  Michael Albinus  <michael.albinus@gmx.de>
 
-       * net/ange-ftp.el (ange-ftp-get-passwd): Bind
-       `enable-recursive-minibuffers'.
+       * net/ange-ftp.el (ange-ftp-get-passwd):
+       Bind `enable-recursive-minibuffers'.
        (ange-ftp-get-process): Throw if `non-essential' is non-nil.
 
 2012-06-19  David Röthlisberger  <david@rothlis.net>  (tiny change)

diff --git a/lisp/ido.el b/lisp/ido.el
index e7b6e56b7b5e1ce81d539081999f0767fecdfbe3..da30b132d2a6dd527e667fdcfc1c70cc2146009e 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -4046,8 +4046,7 @@ their normal keybindings, except for the following: \\<ido-buffer-completion-map
 RET Select the buffer at the front of the list of matches.  If the
 list is empty, possibly prompt to create new buffer.
 
-\\[ido-select-text] Select the current prompt as the buffer.
-If no buffer is found, prompt for a new one.
+\\[ido-select-text] Use the current input string verbatim.
 
 \\[ido-next-match] Put the first element at the end of the list.
 \\[ido-prev-match] Put the last element at the start of the list.
@@ -4133,8 +4132,7 @@ except for the following: \\<ido-file-completion-map>
 RET Select the file at the front of the list of matches.  If the
 list is empty, possibly prompt to create new file.
 
-\\[ido-select-text] Select the current prompt as the buffer or file.
-If no buffer or file is found, prompt for a new one.
+\\[ido-select-text] Use the current input string verbatim.
 
 \\[ido-next-match] Put the first element at the end of the list.
 \\[ido-prev-match] Put the last element at the start of the list.