[Emacs-diffs] /srv/bzr/emacs/trunk r99477: * iswitchb.el (iswitchb-completions): Revert last change.

[Chong Yidong]

------------------------------------------------------------
revno: 99477
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2010-02-10 04:19:32 -0500
message:
  * iswitchb.el (iswitchb-completions): Revert last change.
modified:
  lisp/ChangeLog
  lisp/iswitchb.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-10 08:46:54 +0000
+++ b/lisp/ChangeLog    2010-02-10 09:19:32 +0000
@@ -1,3 +1,7 @@
+2010-02-10  Chong Yidong  <address@hidden>
+
+       * iswitchb.el (iswitchb-completions): Revert last change.
+
 2010-02-10  Michael Albinus  <address@hidden>
 
        * ls-lisp.el (ls-lisp-insert-directory): Wen WILDCARD-REGEXP and

=== modified file 'lisp/iswitchb.el'
--- a/lisp/iswitchb.el  2010-02-03 20:47:25 +0000
+++ b/lisp/iswitchb.el  2010-02-10 09:19:32 +0000
@@ -1274,7 +1274,7 @@
     ;; 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 @@
              (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