From: Julien Danjou Date: Sat, 9 Oct 2010 09:14:46 +0000 (+0000) Subject: nnir.el (nnir-read-parm): Fix call to gnus-completing-read. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~46^2~107 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1736ad36f82bb498307b6a853a96254253c3e9c0;p=emacs.git nnir.el (nnir-read-parm): Fix call to gnus-completing-read. --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 8184183c451..7947aff31bc 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,7 @@ 2010-10-09 Julien Danjou + * 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/gnus/nnir.el b/lisp/gnus/nnir.el index 3739cb8614f..6d64935550f 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/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)))