[Emacs-diffs] Changes to emacs/lisp/ibuffer.el,v

[John Paul Wallington]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     John Paul Wallington <jpw>      08/05/13 21:07:22

Index: ibuffer.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ibuffer.el,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- ibuffer.el  6 May 2008 07:57:38 -0000       1.104
+++ ibuffer.el  13 May 2008 21:07:21 -0000      1.105
@@ -1233,6 +1233,17 @@
 (defsubst ibuffer-map-deletion-lines (func)
   (ibuffer-map-on-mark ibuffer-deletion-char func))
 
+(defun ibuffer-buffer-file-name ()
+  (or buffer-file-name
+      (let ((dirname (or (and (boundp 'dired-directory)
+                             (if (stringp dired-directory)
+                                 dired-directory
+                               (car dired-directory)))
+                        (and (memq major-mode '(cvs-mode vc-dir-mode))
+                             (bound-and-true-p default-directory)))))
+       (and dirname (expand-file-name dirname)))
+      ""))
+
 (define-ibuffer-op ibuffer-do-save ()
   "Save marked buffers as with `save-buffer'."
   (:complex t
@@ -1753,14 +1764,7 @@
             (t (format "%d files" total))))))
   (let ((directory-abbrev-alist ibuffer-directory-abbrev-alist))
     (abbreviate-file-name
-     (or buffer-file-name
-        (and (boundp 'dired-directory)
-             (if (stringp dired-directory)
-                 dired-directory
-               (car dired-directory)))
-        (and (eq major-mode 'vc-dir-mode)
-             (bound-and-true-p default-directory))
-        ""))))
+     (ibuffer-buffer-file-name))))
 
 (define-ibuffer-column filename-and-process
   (:name "Filename/Process"