lisp/ibuf-ext.el (ibuffer-switch-to-saved-filter-groups): Shortcut completing-read...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 40c9f6c2c51bf9cfabb841d254a21f56a7e62d8f..29affbdcbbfedefcfc72b22f1fc1caf8415cb4e8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-23  Roland Winkler  <winkler@gnu.org>
+
+       * ibuf-ext.el (ibuffer-switch-to-saved-filter-groups): If list
+       ibuffer-saved-filter-groups has one element, shortcut the call of
+       completing-read.  (Bug#12331)
+
 2012-09-23  Chong Yidong  <cyd@gnu.org>
 
        * bindings.el (mode-line-toggle-read-only):

diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 97df90a65af3a525181bc98e15150a3ee850d196..ee5bd0f357a62f3d5c02bbf3ffb5e048d0bf2d07 100644 (file)
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -755,10 +755,16 @@ They are removed from `ibuffer-saved-filter-groups'."
 The value from `ibuffer-saved-filter-groups' is used."
   (interactive
    (list
-    (if (null ibuffer-saved-filter-groups)
-       (error "No saved filters")
-      (completing-read "Switch to saved filter group: "
-                      ibuffer-saved-filter-groups nil t))))
+    (cond ((null ibuffer-saved-filter-groups)
+           (error "No saved filters"))
+          ;; `ibuffer-saved-filter-groups' is a user variable that defaults
+          ;; to nil.  We assume that with one element in this list the user
+          ;; knows what she wants.  See bug#12331.
+          ((null (cdr ibuffer-saved-filter-groups))
+           (caar ibuffer-saved-filter-groups))
+          (t
+           (completing-read "Switch to saved filter group: "
+                            ibuffer-saved-filter-groups nil t)))))
   (setq ibuffer-filter-groups (cdr (assoc name ibuffer-saved-filter-groups))
        ibuffer-hidden-filter-groups nil)
   (ibuffer-update nil t))