diff options
-rw-r--r-- | lisp/ChangeLog | 10 | ||||
-rw-r--r-- | lisp/ibuf-ext.el | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 12c1da63322..d27b098c0ed 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2005-05-14 John Paul Wallington <jpw@pobox.com> + + * ibuf-ext.el (define-ibuffer-filter filename): + If `dired-directory' is a list, use its car. + +2005-05-14 Daniel Brockman <daniel@brockman.se> (tiny change) + + * ibuffer.el (define-ibuffer-column filename): + If `dired-directory' is a list, use its car. + 2005-05-14 Richard M. Stallman <rms@gnu.org> * emacs-lisp/bytecomp.el (byte-compile-nogroup-warn): New function. diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el index e2e5d251371..87d9eb707eb 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el @@ -1024,7 +1024,9 @@ currently used by buffers." (ibuffer-awhen (with-current-buffer buf (or buffer-file-name (and (boundp 'dired-directory) - dired-directory + (if (stringp dired-directory) + dired-directory + (car dired-directory)) (expand-file-name dired-directory)))) (string-match qualifier it))) |