2004-05-06 Romain Francoise <romain@orebokech.com> (tiny change)

	* ibuffer.el (ibuffer-redisplay-engine): Do not remove folded
	filter groups from the buffer when rebuilding the Ibuffer buffer
	and `ibuffer-show-empty-filter-groups' is nil.

2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 235204831e3..6b8d1101087 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-06  Romain Francoise  <romain@orebokech.com>  (tiny change)
+
+        * ibuffer.el (ibuffer-redisplay-engine): Do not remove folded
+        filter groups from the buffer when rebuilding the Ibuffer buffer
+        and `ibuffer-show-empty-filter-groups' is nil.
+
 2004-05-06  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
         * ps-print.el (ps-print-quote): Call ps-value-string.
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index a1fd3195d46..ab8290cfae8 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -1,6 +1,6 @@
 ;;; ibuffer.el --- operate on buffers like dired
 
-;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
 ;; Maintainer: John Paul Wallington <jpw@gnu.org>
@@ -2166,6 +2166,7 @@ If optional arg SILENT is non-nil, do not display progress messages."
                                   (member name ibuffer-hidden-filter-groups)))
                    (bmarklist (cdr group)))
               (unless (and (null bmarklist)
+                           (not disabled)
                            ext-loaded
                            (null ibuffer-show-empty-filter-groups))
                 (ibuffer-insert-filter-group