diff options
| author | Chong Yidong | 2010-09-16 18:32:54 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-09-16 18:32:54 -0400 |
| commit | dff0fdc364fc834651dff8ca794cd2c982bd8fa5 (patch) | |
| tree | 486899f8574efe4e71125d8497bafa7028250c0f | |
| parent | c6f2191fa7697f36b95c6b440ef9b4a6184d9642 (diff) | |
| download | emacs-dff0fdc364fc834651dff8ca794cd2c982bd8fa5.tar.gz emacs-dff0fdc364fc834651dff8ca794cd2c982bd8fa5.zip | |
* ido.el (ido-make-buffer-list): Fix error in 2010-08-22 merge.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/ido.el | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7147ed85db6..525d7ffc6b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-09-16 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * ido.el (ido-make-buffer-list): Fix error in 2010-08-22 merge. | ||
| 4 | |||
| 1 | 2010-09-16 Michael Albinus <michael.albinus@gmx.de> | 5 | 2010-09-16 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 6 | ||
| 3 | * net/tramp-cmds.el (tramp-cleanup-connection): Set tramp-autoload | 7 | * net/tramp-cmds.el (tramp-cleanup-connection): Set tramp-autoload |
diff --git a/lisp/ido.el b/lisp/ido.el index 858ee3ed5b0..2df9b8666af 100644 --- a/lisp/ido.el +++ b/lisp/ido.el | |||
| @@ -3403,6 +3403,8 @@ for first matching file." | |||
| 3403 | (if default | 3403 | (if default |
| 3404 | (setq ido-temp-list | 3404 | (setq ido-temp-list |
| 3405 | (cons default (delete default ido-temp-list)))) | 3405 | (cons default (delete default ido-temp-list)))) |
| 3406 | (if ido-use-virtual-buffers | ||
| 3407 | (ido-add-virtual-buffers-to-list)) | ||
| 3406 | (run-hooks 'ido-make-buffer-list-hook) | 3408 | (run-hooks 'ido-make-buffer-list-hook) |
| 3407 | ido-temp-list)) | 3409 | ido-temp-list)) |
| 3408 | 3410 | ||