diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-02-10 04:19:32 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-02-10 04:19:32 -0500 |
| commit | e6d23bb58018ffe2cdaf5faa01c245c1a49bd0f8 (patch) | |
| tree | 7b3da19c73d141cbe1e6458ebc44954280dc0795 /lisp | |
| parent | a8e4290b05511059af4e48988e58cbda85f5cd59 (diff) | |
| download | emacs-e6d23bb58018ffe2cdaf5faa01c245c1a49bd0f8.tar.gz | |
* iswitchb.el (iswitchb-completions): Revert last change.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/iswitchb.el | 25 |
2 files changed, 9 insertions, 20 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d1adb4be590..b0d722043de 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-02-10 Chong Yidong <cyd@stupidchicken.com> + + * iswitchb.el (iswitchb-completions): Revert last change. + 2010-02-10 Michael Albinus <michael.albinus@gmx.de> * ls-lisp.el (ls-lisp-insert-directory): Wen WILDCARD-REGEXP and diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index ee06db6f78f..ea4b00dc90d 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el @@ -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) - (or recentf-list bookmark-alist)) + recentf-list) (setq iswitchb-virtual-buffers nil) (let ((head recentf-list) name) (while head @@ -1289,30 +1289,15 @@ Modified from `icomplete-completions'." (setq iswitchb-virtual-buffers (cons (cons name (car head)) 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)) + (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 |