nnir: fix call to gnus-completing-read

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce88808..1605235 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-09  Julien Danjou  <julien@danjou.info>
 
+       * nnir.el (nnir-read-parm): Fix call to gnus-completing-read.
+
        * gnus-gravatar.el (gnus-gravatar-transform-address): Error errors when
        retrieving gravatars.
 

diff --git a/lisp/nnir.el b/lisp/nnir.el
index 3739cb8..6d64935 100644 (file)
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -376,7 +376,7 @@ result, `gnus-retrieve-headers' will be called instead.")
     (imap    nnir-run-imap
              ((criteria
               "Search in: "                      ; Prompt
-              ,nnir-imap-search-arguments        ; alist for completing
+              ,(mapcar 'car nnir-imap-search-arguments) ; alist for completing
               nil                                ; no filtering
               nil                                ; allow any user input
               nil                                ; initial value
@@ -1579,7 +1579,7 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
   (let ((sym (car parmspec))
         (prompt (cdr parmspec)))
     (if (listp prompt)
-       (let* ((result (gnus-completing-read prompt nil))
+       (let* ((result (apply 'gnus-completing-read prompt))
               (mapping (or (assoc result nnir-imap-search-arguments)
                            (assoc nil nnir-imap-search-arguments))))
          (cons sym (format (cdr mapping) result)))