summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ibuf-ext.el10
2 files changed, 11 insertions, 4 deletions
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")