diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ido.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/ido.el b/lisp/ido.el index 1415b27a3a7..e2a916534eb 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -3491,14 +3491,12 @@ 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 ((bookmarks (and (boundp 'bookmark-alist) - bookmark-alist)) - name) + (let (name) (dolist (head (append recentf-list - (delq nil (mapcar (lambda (bookmark) - (cdr (assoc 'filename bookmark))) - bookmarks)))) + (and (fboundp 'bookmark-get-filename) + (delq nil (mapcar #'bookmark-get-filename + (bound-and-true-p bookmark-alist)))))) (setq name (file-name-nondirectory head)) ;; In case HEAD is a directory with trailing /. See bug#14552. (when (equal name "") |