[Emacs-diffs] master ac4cce6: Fixes: debbugs:19335

[Stefan Monnier]

branch: master
commit ac4cce624c4f51cbc57a210ade0ca74a1893d636
Author: Rasmus Pank Roulund <address@hidden>
Commit: Stefan Monnier <address@hidden>

    Fixes: debbugs:19335
    
    * lisp/ido.el (ido-add-virtual-buffers-to-list): Include bookmark-alist 
files
---
 lisp/ChangeLog |    5 +++++
 lisp/ido.el    |   10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 534ba9d..97253c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-12  Rasmus Pank Roulund  <address@hidden>
+
+       * ido.el (ido-add-virtual-buffers-to-list): Include bookmark-alist
+       files (bug#19335).
+
 2015-03-12  Eli Zaretskii  <address@hidden>
 
        * international/fontset.el (script-representative-chars): Add a
diff --git a/lisp/ido.el b/lisp/ido.el
index 1f4e3fa..563f406 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3480,8 +3480,14 @@ This is to make them appear as if they were \"virtual 
buffers\"."
   ;; the file which the user might thought was still open.
   (unless recentf-mode (recentf-mode 1))
   (setq ido-virtual-buffers nil)
-  (let (name)
-    (dolist (head recentf-list)
+  (let ((bookmarks (and (boundp 'bookmark-alist)
+                        bookmark-alist))
+        name)
+    (dolist (head (append
+                   recentf-list
+                   (delq nil (mapcar (lambda (bookmark)
+                                       (cdr (assoc 'filename bookmark)))
+                                     bookmarks))))
       (setq name (file-name-nondirectory head))
       ;; In case HEAD is a directory with trailing /.  See bug#14552.
       (when (equal name "")