From: David Röthlisberger <david@rothlis.net>
Date: Wed, 20 Jun 2012 15:51:34 +0000 (-0400)
Subject: * lisp/ido.el (ido-switch-buffer, ido-find-file): Fix up doc of C-j.
X-Git-Tag: emacs-24.2.90~1199^2~419
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d34c18b1c9854b7dcfd2cf3f7b04197c72719f90;p=emacs.git

* 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 cb11ea132db..882754ecf65 100644
--- 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 e7b6e56b7b5..da30b132d2a 100644
--- 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.