From: John Paul Wallington <jpw@pobox.com>
Date: Thu, 8 Dec 2005 23:50:32 +0000 (+0000)
Subject: (define-ibuffer-filter filename): If `dired-directory' is a list then
X-Git-Tag: emacs-pretest-22.0.90~5424
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1c258d8cf50e1c4ae9455d664c69958b35529cf9;p=emacs.git

(define-ibuffer-filter filename): If `dired-directory' is a list then
really use its car.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f99e31d670..14a1eac631a 100644
--- 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 4e8f8f61221..2de72547887 100644
--- 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")