[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/08/10 03:42:44

Index: ibuffer.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ibuffer.el,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- ibuffer.el  23 Jul 2008 23:53:34 -0000      1.108
+++ ibuffer.el  10 Aug 2008 03:42:43 -0000      1.109
@@ -1245,8 +1245,7 @@
                                  dired-directory
                                (car dired-directory)))
                         (bound-and-true-p list-buffers-directory))))
-       (and dirname (expand-file-name dirname)))
-      ""))
+       (and dirname (expand-file-name dirname)))))
 
 (define-ibuffer-op ibuffer-do-save ()
   "Save marked buffers as with `save-buffer'."
@@ -1768,7 +1767,7 @@
             (t (format "%d files" total))))))
   (let ((directory-abbrev-alist ibuffer-directory-abbrev-alist))
     (abbreviate-file-name
-     (ibuffer-buffer-file-name))))
+     (or (ibuffer-buffer-file-name) ""))))
 
 (define-ibuffer-column filename-and-process
   (:name "Filename/Process"