# HG changeset patch # User Chong Yidong # Date 1284676374 14400 # Node ID f25651f73f70dfddfffe8e7b100c9f9d87c95371 # Parent ba4844f77a6410276344af48d61d805715490d85 * ido.el (ido-make-buffer-list): Fix error in 2010-08-22 merge. diff -r ba4844f77a64 -r f25651f73f70 lisp/ChangeLog --- a/lisp/ChangeLog Thu Sep 16 22:43:12 2010 +0200 +++ b/lisp/ChangeLog Thu Sep 16 18:32:54 2010 -0400 @@ -1,3 +1,7 @@ +2010-09-16 Chong Yidong + + * ido.el (ido-make-buffer-list): Fix error in 2010-08-22 merge. + 2010-09-16 Michael Albinus * net/tramp-cmds.el (tramp-cleanup-connection): Set tramp-autoload diff -r ba4844f77a64 -r f25651f73f70 lisp/ido.el --- a/lisp/ido.el Thu Sep 16 22:43:12 2010 +0200 +++ b/lisp/ido.el Thu Sep 16 18:32:54 2010 -0400 @@ -3403,6 +3403,8 @@ (if default (setq ido-temp-list (cons default (delete default ido-temp-list)))) + (if ido-use-virtual-buffers + (ido-add-virtual-buffers-to-list)) (run-hooks 'ido-make-buffer-list-hook) ido-temp-list))