# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1286615686 0
# Node ID 7996424ed273e78abcb8fbd76b83d786ea2447a6
# Parent  d98a67277730868e291e9a0a276595ce57f96717
nnir.el (nnir-read-parm): Fix call to gnus-completing-read.

diff -r d98a67277730 -r 7996424ed273 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sat Oct 09 08:44:12 2010 +0000
+++ b/lisp/gnus/ChangeLog	Sat Oct 09 09:14:46 2010 +0000
@@ -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 -r d98a67277730 -r 7996424ed273 lisp/gnus/nnir.el
--- a/lisp/gnus/nnir.el	Sat Oct 09 08:44:12 2010 +0000
+++ b/lisp/gnus/nnir.el	Sat Oct 09 09:14:46 2010 +0000
@@ -376,7 +376,7 @@
     (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 @@
   (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)))