Add requires and fix history for iswitchb

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78f54c5..db75270 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-29  Julien Danjou  <julien@danjou.info>
+
+       * gnus-util.el (gnus-icompleting-read): Require iswitchb. Fix history
+       computing.
+       (gnus-ido-completing-read): Require ido.
+
 2010-09-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-registry.el: Don't prompt on load, which makes it impossible to

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 1c390c7..2f9bdd6 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1597,12 +1597,13 @@ SPEC is a predicate specifier that contains stuff like `or', `and',
 
 (defun gnus-icompleting-read (prompt collection &optional require-match
                                      initial-input history def)
+  (require 'iswitchb)
   (let ((iswitchb-make-buflist-hook
          (lambda ()
            (setq iswitchb-temp-buflist
                  (let ((choices (append (list)
                                         (when initial-input (list initial-input))
-                                        history collection))
+                                        (symbol-value history) collection))
                        filtered-choices)
                    (while choices
                      (when (and (car choices) (not (member (car choices) filtered-choices)))
@@ -1619,6 +1620,7 @@ SPEC is a predicate specifier that contains stuff like `or', `and',
 
 (defun gnus-ido-completing-read (prompt collection &optional require-match
                                         initial-input history def)
+  (require 'ido)
   (ido-completing-read prompt collection nil require-match
                        initial-input history def))