From: Rasmus Pank Roulund <emacs@pank.eu>
Date: Thu, 12 Mar 2015 19:02:55 +0000 (-0400)
Subject: Fixes: debbugs:19335
X-Git-Tag: emacs-25.0.90~2564^2~171
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ac4cce624c4f51cbc57a210ade0ca74a1893d636;p=emacs.git

Fixes: debbugs:19335

* lisp/ido.el (ido-add-virtual-buffers-to-list): Include bookmark-alist files
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 534ba9d5f23..97253c8824e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-12  Rasmus Pank Roulund  <emacs@pank.eu>
+
+	* ido.el (ido-add-virtual-buffers-to-list): Include bookmark-alist
+	files (bug#19335).
+
 2015-03-12  Eli Zaretskii  <eliz@gnu.org>
 
 	* international/fontset.el (script-representative-chars): Add a
diff --git a/lisp/ido.el b/lisp/ido.el
index 1f4e3facd36..563f406aeb6 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 "")