diff options
| author | David Röthlisberger | 2012-06-20 11:51:34 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-06-20 11:51:34 -0400 |
| commit | d34c18b1c9854b7dcfd2cf3f7b04197c72719f90 (patch) | |
| tree | 264e2900e5e6d5fb1a873495f0cc58af497a5241 | |
| parent | 6ff7caa835cacb770d9021b73516a51bf0e2b2e9 (diff) | |
| download | emacs-d34c18b1c9854b7dcfd2cf3f7b04197c72719f90.tar.gz emacs-d34c18b1c9854b7dcfd2cf3f7b04197c72719f90.zip | |
* lisp/ido.el (ido-switch-buffer, ido-find-file): Fix up doc of C-j.
Fixes: debbugs:11201
| -rw-r--r-- | lisp/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/ido.el | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cb11ea132db..882754ecf65 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,17 +1,22 @@ | |||
| 1 | 2012-06-20 David Röthlisberger <david@rothlis.net> (tiny change) | ||
| 2 | |||
| 3 | * ido.el (ido-switch-buffer, ido-find-file): Fix up doc of C-j | ||
| 4 | (bug#11201). | ||
| 5 | |||
| 1 | 2012-06-20 Chong Yidong <cyd@gnu.org> | 6 | 2012-06-20 Chong Yidong <cyd@gnu.org> |
| 2 | 7 | ||
| 3 | * term.el (term-window-width): Handle the case of a missing right | 8 | * term.el (term-window-width): Handle the case of a missing right |
| 4 | fringe (Bug#8837). | 9 | fringe (Bug#8837). |
| 5 | (term-check-size): Use window-text-height (Bug#5445). | 10 | (term-check-size): Use window-text-height (Bug#5445). |
| 6 | (term-mode): Use define-derived-mode. Minor cleanups. Set | 11 | (term-mode): Use define-derived-mode. Minor cleanups. |
| 7 | font-lock-defaults (Bug#7692). | 12 | Set font-lock-defaults (Bug#7692). |
| 8 | (term-move-columns, term-insert-char, term-emulate-terminal) | 13 | (term-move-columns, term-insert-char, term-emulate-terminal) |
| 9 | (term-erase-in-line, term-insert-spaces): Use font-lock-face. | 14 | (term-erase-in-line, term-insert-spaces): Use font-lock-face. |
| 10 | 15 | ||
| 11 | 2012-06-20 Michael Albinus <michael.albinus@gmx.de> | 16 | 2012-06-20 Michael Albinus <michael.albinus@gmx.de> |
| 12 | 17 | ||
| 13 | * net/ange-ftp.el (ange-ftp-get-passwd): Bind | 18 | * net/ange-ftp.el (ange-ftp-get-passwd): |
| 14 | `enable-recursive-minibuffers'. | 19 | Bind `enable-recursive-minibuffers'. |
| 15 | (ange-ftp-get-process): Throw if `non-essential' is non-nil. | 20 | (ange-ftp-get-process): Throw if `non-essential' is non-nil. |
| 16 | 21 | ||
| 17 | 2012-06-19 David Röthlisberger <david@rothlis.net> (tiny change) | 22 | 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 | |||
| 4046 | RET Select the buffer at the front of the list of matches. If the | 4046 | RET Select the buffer at the front of the list of matches. If the |
| 4047 | list is empty, possibly prompt to create new buffer. | 4047 | list is empty, possibly prompt to create new buffer. |
| 4048 | 4048 | ||
| 4049 | \\[ido-select-text] Select the current prompt as the buffer. | 4049 | \\[ido-select-text] Use the current input string verbatim. |
| 4050 | If no buffer is found, prompt for a new one. | ||
| 4051 | 4050 | ||
| 4052 | \\[ido-next-match] Put the first element at the end of the list. | 4051 | \\[ido-next-match] Put the first element at the end of the list. |
| 4053 | \\[ido-prev-match] Put the last element at the start of the list. | 4052 | \\[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> | |||
| 4133 | RET Select the file at the front of the list of matches. If the | 4132 | RET Select the file at the front of the list of matches. If the |
| 4134 | list is empty, possibly prompt to create new file. | 4133 | list is empty, possibly prompt to create new file. |
| 4135 | 4134 | ||
| 4136 | \\[ido-select-text] Select the current prompt as the buffer or file. | 4135 | \\[ido-select-text] Use the current input string verbatim. |
| 4137 | If no buffer or file is found, prompt for a new one. | ||
| 4138 | 4136 | ||
| 4139 | \\[ido-next-match] Put the first element at the end of the list. | 4137 | \\[ido-next-match] Put the first element at the end of the list. |
| 4140 | \\[ido-prev-match] Put the last element at the start of the list. | 4138 | \\[ido-prev-match] Put the last element at the start of the list. |