[Emacs-diffs] /srv/bzr/emacs/trunk r101868: nnir.el (nnir-read-parm): Fix call to gnus-completing-read.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101868
author: Julien Danjou <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-09 09:14:46 +0000
message:
  nnir.el (nnir-read-parm): Fix call to gnus-completing-read.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnir.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-09 08:44:12 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-09 09:14:46 +0000
@@ -1,5 +1,7 @@
 2010-10-09  Julien Danjou  <address@hidden>
 
+       * nnir.el (nnir-read-parm): Fix call to gnus-completing-read.
+
        * gnus-gravatar.el (gnus-gravatar-transform-address): Error errors when
        retrieving gravatars.
 

=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el 2010-10-06 12:38:45 +0000
+++ b/lisp/gnus/nnir.el 2010-10-09 09:14:46 +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)))