(define-ibuffer-filter filename): Use `ibuffer-buffer-file-name'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c5297e2eaf1ee079821df7876b5345d58588eb37..47852c456e0953d145a630c34c5784d5b73734c4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-13  John Paul Wallington  <jpw@pobox.com>
+
+       * ibuffer.el (ibuffer-buffer-file-name): New function.
+       (define-ibuffer-column filename): Use it.
+
+       * ibuf-ext.el (define-ibuffer-filter filename): Use it.
+
 2008-05-13  Chong Yidong  <cyd@stupidchicken.com>
 
        * talk.el (talk): Simplify.  Pass display arg to talk-add-display

diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 6bdaed0a334f6e887ca568f6627e6603bbd86ce0..74850a6dca12a64b735eaf46e07a1ab9aec6daaa 100644 (file)
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -1030,16 +1030,7 @@ currently used by buffers."
   (:description "filename"
    :reader (read-from-minibuffer "Filter by filename (regexp): "))
   (ibuffer-awhen (with-current-buffer buf
-                  (or buffer-file-name
-                      (and (boundp 'dired-directory)
-                           (let ((dired-dir
-                                  (if (stringp dired-directory)
-                                      dired-directory
-                                    (car dired-directory))))
-                             (and dired-dir
-                                  (expand-file-name dired-dir))))
-                      (and (eq major-mode 'vc-dir-mode)
-                           (bound-and-true-p default-directory))))
+                  (ibuffer-buffer-file-name))
                 (string-match qualifier it)))
 
 ;;;###autoload (autoload 'ibuffer-filter-by-size-gt  "ibuf-ext")