diff options
| author | Glenn Morris | 2012-11-30 20:27:56 -0500 |
|---|---|---|
| committer | Glenn Morris | 2012-11-30 20:27:56 -0500 |
| commit | a940045887decb3ace683daaf6f190d8e49f37d6 (patch) | |
| tree | 602510f721dc3c28fc2a31db3901e36147be1f41 | |
| parent | 00054d2199d929eb224ae62dec2e55608ff1c07f (diff) | |
| download | emacs-a940045887decb3ace683daaf6f190d8e49f37d6.tar.gz emacs-a940045887decb3ace683daaf6f190d8e49f37d6.zip | |
ido.el fix for bug#13036
* lisp/ido.el (ido-file-internal): Handle other-window, other-frame for dired.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/ido.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 69492f03682..1bcb633b06f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-12-01 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * ido.el (ido-file-internal): | ||
| 4 | Handle other-window, other-frame for dired. (Bug#13036) | ||
| 5 | |||
| 1 | 2012-11-30 Glenn Morris <rgm@gnu.org> | 6 | 2012-11-30 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * icomplete.el (icomplete-separator): Fix :version. | 8 | * icomplete.el (icomplete-separator): Fix :version. |
diff --git a/lisp/ido.el b/lisp/ido.el index f4f9c27c847..7044fa496db 100644 --- a/lisp/ido.el +++ b/lisp/ido.el | |||
| @@ -2389,7 +2389,10 @@ If cursor is not at the end of the user input, move to end of input." | |||
| 2389 | (ido-buffer-internal 'insert 'insert-buffer "Insert buffer: " nil ido-text 'ido-enter-insert-file)) | 2389 | (ido-buffer-internal 'insert 'insert-buffer "Insert buffer: " nil ido-text 'ido-enter-insert-file)) |
| 2390 | 2390 | ||
| 2391 | ((eq ido-exit 'dired) | 2391 | ((eq ido-exit 'dired) |
| 2392 | (dired (concat ido-current-directory (or ido-text "")))) | 2392 | (funcall (cond ((eq method 'other-window) 'dired-other-window) |
| 2393 | ((eq method 'other-frame) 'dired-other-frame) | ||
| 2394 | (t 'dired)) | ||
| 2395 | (concat ido-current-directory (or ido-text "")))) | ||
| 2393 | 2396 | ||
| 2394 | ((eq ido-exit 'ffap) | 2397 | ((eq ido-exit 'ffap) |
| 2395 | (find-file-at-point)) | 2398 | (find-file-at-point)) |