[Emacs-diffs] /srv/bzr/emacs/trunk r110160: lisp/ibuf-ext.el (ibuffer-switch-to-saved-filter-groups): Shortcut completing-read if not needed

[Roland Winkler]

------------------------------------------------------------
revno: 110160
committer: Roland Winkler <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-23 06:54:50 -0500
message:
  lisp/ibuf-ext.el (ibuffer-switch-to-saved-filter-groups): Shortcut 
completing-read if not needed
modified:
  lisp/ChangeLog
  lisp/ibuf-ext.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-23 10:21:34 +0000
+++ b/lisp/ChangeLog    2012-09-23 11:54:50 +0000
@@ -1,3 +1,9 @@
+2012-09-23  Roland Winkler  <address@hidden>
+
+       * 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  <address@hidden>
 
        * bindings.el (mode-line-toggle-read-only):

=== modified file 'lisp/ibuf-ext.el'
--- a/lisp/ibuf-ext.el  2012-07-11 23:13:41 +0000
+++ b/lisp/ibuf-ext.el  2012-09-23 11:54:50 +0000
@@ -755,10 +755,16 @@
 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))