# HG changeset patch
# User Colin Walters <walters@gnu.org>
# Date 1021001735 0
# Node ID f7c52a0eaf2360985e99b1859d3b75700f2610a7
# Parent  a7b0e54f67d2d7fae7c7395900466f36bbc4741f
Refine previous change.

diff -r a7b0e54f67d2 -r f7c52a0eaf23 lisp/ibuffer.el
--- a/lisp/ibuffer.el	Fri May 10 01:02:32 2002 +0000
+++ b/lisp/ibuffer.el	Fri May 10 03:35:35 2002 +0000
@@ -536,18 +536,20 @@
 		  :enable (and (featurep 'ibuf-ext) ibuffer-filtering-qualifiers)))
     (define-key-after map [menu-bar view filter or-filter]
       '(menu-item "OR top two filters" ibuffer-or-filter
-		  :enable (and (featurep 'ibuf-ext) ibuffer-filtering-qualifiers)
+		  :enable (and (featurep 'ibuf-ext) ibuffer-filtering-qualifiers
+			       (cdr ibuffer-filtering-qualifiers))
 		  :help "Create a new filter which is the logical OR of the top two filters"))
     (define-key-after map [menu-bar view filter negate-filter]
       '(menu-item "Negate top filter" ibuffer-negate-filter
 		  :enable (and (featurep 'ibuf-ext) ibuffer-filtering-qualifiers)))
     (define-key-after map [menu-bar view filter decompose-filter]
       '(menu-item "Decompose top filter" ibuffer-decompose-filter
-		  :enable (and (featurep 'ibuf-ext) ibuffer-filtering-qualifiers)		  
+		  :enable (and (featurep 'ibuf-ext) (memq (car ibuffer-filtering-qualifiers) '(or saved not)))
 		  :help "Break down a complex filter like OR or NOT"))
     (define-key-after map [menu-bar view filter exchange-filters]
       '(menu-item "Swap top two filters" ibuffer-exchange-filters
-		  :enable (and (featurep 'ibuf-ext) ibuffer-filtering-qualifiers)))
+		  :enable (and (featurep 'ibuf-ext) ibuffer-filtering-qualifiers
+			       (cdr ibuffer-filtering-qualifiers))))
     (define-key-after map [menu-bar view filter save-filters]
       '(menu-item "Save current filters permanently..." ibuffer-save-filters
 		  :enable (and (featurep 'ibuf-ext) ibuffer-filtering-qualifiers)