mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-15 19:31:29 -07:00
Code Issues Projects Releases Wiki Activity

iswitchb.el (iswitchb-completions): Add bookmark files to the

Browse source 
list of files considered for "virtual buffer" completions.
This commit is contained in:
John Wiegley 2010-02-03 15:47:25 -05:00
parent 8214b6e4e7
commit 82055bb780
2 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2010-02-03 John Wiegley <jwiegley@gmail.com>
* iswitchb.el (iswitchb-completions): Add bookmark files to the
list of files considered for "virtual buffer" completions.
2010-02-03 Michael Albinus <michael.albinus@gmx.de>
* net/ange-ftp.el (ange-ftp-insert-directory): Parse directory

25
lisp/iswitchb.el
View file

@ -1274,7 +1274,7 @@ Modified from `icomplete-completions'."
;; consult the list of past visited files, to see if we can find
;; the file which the user might thought was still open.
(when (and iswitchb-use-virtual-buffers (null comps)
recentf-list)
(or recentf-list bookmark-alist))
(setq iswitchb-virtual-buffers nil)
(let ((head recentf-list) name)
(while head
@ -1289,15 +1289,30 @@ Modified from `icomplete-completions'."
(setq iswitchb-virtual-buffers
(cons (cons name (car head))
iswitchb-virtual-buffers)))
(setq head (cdr head)))
(setq iswitchb-virtual-buffers (nreverse iswitchb-virtual-buffers)
comps (mapcar 'car iswitchb-virtual-buffers))
(setq head (cdr head))))
(let ((head bookmark-alist) name path)
(while head
(if (and (setq path (cdr (assq 'filename (cdar head))))
(setq name (file-name-nondirectory path))
(string-match (if iswitchb-regexp
iswitchb-text
(regexp-quote iswitchb-text)) name)
(null (get-file-buffer path))
(not (assoc name iswitchb-virtual-buffers))
(not (iswitchb-ignore-buffername-p name))
(file-exists-p path))
(setq iswitchb-virtual-buffers
(cons (cons name path)
iswitchb-virtual-buffers)))
(setq head (cdr head))))
(setq iswitchb-virtual-buffers (nreverse iswitchb-virtual-buffers)
comps (mapcar 'car iswitchb-virtual-buffers))
(let ((comp comps))
(while comp
(put-text-property 0 (length (car comp))
'face 'iswitchb-virtual-matches
(car comp))
(setq comp (cdr comp))))))
(setq comp (cdr comp)))))
(cond ((null comps) (format " %sNo match%s"
open-bracket-determined