(ibuffer-yank-filter-group): Move check for empty

filter group kill-ring out of `interactive' declaration.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76befbb59044e2824ce60c5e82d742b0b1395313..5e0e9ee96d29629cab252b6da7060c73b6723a10 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-28  John Paul Wallington  <jpw@gnu.org>
+
+       * ibuf-ext.el (ibuffer-yank-filter-group): Move check for empty
+       `ibuffer-filter-group-kill-ring' out of `interactive' declaration.
+
 2003-01-28  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
        * progmodes/cc-vars.el, progmodes/cc-mode.el

diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index b1f312d376c2ac2a1c6216f90c4f050661d6358c..4aa1ec0874ffd475859e414a4edac87d36085e20 100644 (file)
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -688,11 +688,10 @@ See also `ibuffer-kill-filter-group'."
 ;;;###autoload
 (defun ibuffer-yank-filter-group (name)
   "Yank the last killed filter group before group named NAME."
-  (interactive (list (progn
-                      (unless ibuffer-filter-group-kill-ring
-                        (error "ibuffer-filter-group-kill-ring is empty"))
-                      (ibuffer-read-filter-group-name
-                       "Yank filter group before group: "))))
+  (interactive (list (ibuffer-read-filter-group-name
+                       "Yank filter group before group: ")))
+  (unless ibuffer-filter-group-kill-ring
+    (error "The Ibuffer filter group kill-ring is empty"))
   (save-excursion
     (ibuffer-forward-line 0)
     (ibuffer-insert-filter-group-before (pop ibuffer-filter-group-kill-ring)