[Emacs-diffs] /srv/bzr/emacs/trunk r108668: * lisp/ido.el (ido-switch-buffer, ido-find-file): Fix up doc of C-j.

[Stefan Monnier]

------------------------------------------------------------
revno: 108668
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11201
author: David Röthlisberger <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2012-06-20 11:51:34 -0400
message:
  * lisp/ido.el (ido-switch-buffer, ido-find-file): Fix up doc of C-j.
modified:
  lisp/ChangeLog
  lisp/ido.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-20 09:21:06 +0000
+++ b/lisp/ChangeLog    2012-06-20 15:51:34 +0000
@@ -1,17 +1,22 @@
+2012-06-20  David Röthlisberger  <address@hidden>  (tiny change)
+
+       * ido.el (ido-switch-buffer, ido-find-file): Fix up doc of C-j
+       (bug#11201).
+
 2012-06-20  Chong Yidong  <address@hidden>
 
        * 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  <address@hidden>
 
-       * 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  <address@hidden>  (tiny change)

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2012-06-19 18:17:14 +0000
+++ b/lisp/ido.el       2012-06-20 15:51:34 +0000
@@ -4046,8 +4046,7 @@
 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 @@
 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.