(define-ibuffer-filter filename): If `dired-directory' is a list then

really use its car.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f99e31d670ff6c975b334625b53acf2b4983b9f..14a1eac631abee1c404a82d36ea979c2c31fa424 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-08  John Paul Wallington  <jpw@pobox.com>
+
+       * ibuf-ext.el (define-ibuffer-filter filename):
+       If `dired-directory' is a list then really use its car.
+
 2005-12-08  Kim F. Storm  <storm@cua.dk>
 
        * emulation/cua-rect.el (cua--rectangle-aux-replace): Fix

diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 4e8f8f61221c27220acfc0eeb25e65bd972243e1..2de72547887ce889af4d4a7cd2b055291d4f4e2d 100644 (file)
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -1021,10 +1021,12 @@ currently used by buffers."
   (ibuffer-awhen (with-current-buffer buf
                   (or buffer-file-name
                       (and (boundp 'dired-directory)
-                           (if (stringp dired-directory)
-                               dired-directory
-                             (car dired-directory))
-                           (expand-file-name dired-directory))))
+                           (let ((dired-dir
+                                  (if (stringp dired-directory)
+                                      dired-directory
+                                    (car dired-directory))))
+                             (and dired-dir
+                                  (expand-file-name dired-dir))))))
     (string-match qualifier it)))
 
 ;;;###autoload (autoload 'ibuffer-filter-by-size-gt  "ibuf-ext")