[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100448: * lisp/ibuf-ext.el (ibuffer-filter-disable): Make it work. (Bug#7969)

[Glenn Morris]

------------------------------------------------------------
revno: 100448
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Wed 2011-02-02 23:02:52 -0800
message:
  * lisp/ibuf-ext.el (ibuffer-filter-disable): Make it work.  (Bug#7969)
  
  Details:
  
  An error in a filter would cause an infinite loop.
  ibuffer-update calls ibuffer-redisplay-engine which calls
  ibuffer-update which calls ibuffer-redisplay-engine, etc.
  
  ibuffer-generate-filter-groups calls ibuffer-included-in-filters-p.
  If ibuffer-included-in-filter-p-1 meets an unknown element in the
  filter, it calls ibuffer-filter-disable, which calls ibuffer-update.
  If the filters have not been properly disabled, we go round and round.
modified:
  lisp/ChangeLog
  lisp/ibuf-ext.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-03 06:55:48 +0000
+++ b/lisp/ChangeLog    2011-02-03 07:02:52 +0000
@@ -1,5 +1,7 @@
 2011-02-03  Glenn Morris  <address@hidden>
 
+       * ibuf-ext.el (ibuffer-filter-disable): Make it work.  (Bug#7969)
+
        * faces.el (set-face-attribute): Doc fix.  (Bug#2659)
 
 2011-02-02  Stefan Monnier  <address@hidden>

=== modified file 'lisp/ibuf-ext.el'
--- a/lisp/ibuf-ext.el  2011-01-02 23:50:46 +0000
+++ b/lisp/ibuf-ext.el  2011-02-03 07:02:52 +0000
@@ -780,7 +780,8 @@
 (defun ibuffer-filter-disable ()
   "Disable all filters currently in effect in this buffer."
   (interactive)
-  (setq ibuffer-filtering-qualifiers nil)
+  (setq ibuffer-filtering-qualifiers nil
+       ibuffer-filter-groups nil)
   (let ((buf (ibuffer-current-buffer)))
     (ibuffer-update nil t)
     (when buf