(ibuffer-header-line-format): New var.

(ibuffer-mode): Set it instead of header-line-format.
(ibuffer-update): Use it to set header-line-format.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e52057bb9b830de1d4ef5194be65f1c0b0a13ea9..7bacad73ca77d1fcdac6e0c8fc47f13ac27cab62 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2008-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * ibuffer.el (ibuffer-header-line-format): New var.
+       (ibuffer-mode): Set it instead of header-line-format.
+       (ibuffer-update): Use it to set header-line-format.
+
        * international/mule-cmds.el (ucs-insert): Inherit surrounding
        properties like self-insert-command.
 

diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 7c6da00cf0f2779aa383f51dcd8d5b46af0bfb40..59f8c96af2e334eed120ae9b7d00d4a7cdcdc33c 100644 (file)
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -49,6 +49,7 @@
 (defvar ibuffer-filter-group-kill-ring)
 (defvar ibuffer-filter-groups)
 (defvar ibuffer-filtering-qualifiers)
+(defvar ibuffer-header-line-format)
 (defvar ibuffer-hidden-filter-groups)
 (defvar ibuffer-inline-columns)
 (defvar ibuffer-show-empty-filter-groups)
@@ -2164,7 +2165,14 @@ If optional arg SILENT is non-nil, do not display progress messages."
       (ibuffer-shrink-to-fit t)
     (when ibuffer-shrink-to-minimum-size
       (ibuffer-shrink-to-fit)))
-  (ibuffer-forward-line 0))
+  (ibuffer-forward-line 0)
+  ;; I tried to update this automatically from the mode-line-process format,
+  ;; but changing nil-ness of header-line-format while computing
+  ;; mode-line-format is asking a bit too much it seems.  --Stef
+  (setq header-line-format
+        (and ibuffer-use-header-line
+             ibuffer-filtering-qualifiers
+             ibuffer-header-line-format)))
 
 (defun ibuffer-sort-bufferlist (bmarklist)
   (let* ((sortdat (assq ibuffer-sorting-mode
@@ -2537,14 +2545,14 @@ will be inserted before the group at point."
            (:eval (if (functionp 'ibuffer-format-qualifier)
                       (mapconcat 'ibuffer-format-qualifier
                                  ibuffer-filtering-qualifiers ""))))))
-  (setq header-line-format
-        (if ibuffer-use-header-line
-            ;; Display the part that won't be in the mode-line.
-            (list* "" mode-name
-                   (mapcar (lambda (elem)
-                             (if (eq (car-safe elem) 'header-line-format)
-                                 (nth 2 elem) elem))
-                           mode-line-process))))
+  ;; `ibuffer-update' puts this on header-line-format when needed.
+  (setq ibuffer-header-line-format
+        ;; Display the part that won't be in the mode-line.
+        (list* "" mode-name
+               (mapcar (lambda (elem)
+                         (if (eq (car-safe elem) 'header-line-format)
+                             (nth 2 elem) elem))
+                       mode-line-process)))
 
   (setq buffer-read-only t)
   (buffer-disable-undo)