diff options
| author | Gnus developers <ding@gnus.org> | 2010-11-21 22:46:16 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-11-21 22:46:16 +0000 |
| commit | 59e75882626e69dfe0db3578558a012a4e8227a2 (patch) | |
| tree | fe3ee7f7d875fefafe996baff6ac3f249543002f /lisp/gnus/nnir.el | |
| parent | d74cba8fb800c343abae3fa57364a14c8d84f3d8 (diff) | |
Merge changes made in Gnus trunk.
nnir.el: Fix typo in comments.
(nnir-run-imap): Simplify code. No need to reverse artlist.
(nnir-run-gmane): Use nnir-tmp-buffer for web results.
gnus-srvr.el (gnus-server-show-server): New command and keystroke.
nnimap.el (nnimap-get-capabilities): Refactor out.
(nnimap-open-connection): Re-request capabilities after STARTTLS.
gnus.texi (Server Commands): Document gnus-server-show-server.
Diffstat (limited to 'lisp/gnus/nnir.el')
| -rw-r--r-- | lisp/gnus/nnir.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 1983a0a5cb..e5ba3c6062 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -41,7 +41,7 @@ ;; Retrieval Status Value (score). ;; When looking at the retrieval result (in the Summary buffer) you -;; can type `A W' (aka M-x gnus-warp-article RET) on an article. You +;; can type `A W' (aka M-x gnus-warp-to-article RET) on an article. You ;; will be warped into the group this article came from. Typing `A W' ;; (aka M-x gnus-summary-refer-thread RET) will warp to the group and ;; also show the thread this article is part of. @@ -682,9 +682,8 @@ details on the language and supported extensions" (apply 'vconcat (mapcar - (lambda (x) - (let ((group x) - artlist) + (lambda (group) + (let (artlist) (condition-case () (when (nnimap-possibly-change-group (gnus-group-short-name group) server) @@ -706,7 +705,7 @@ details on the language and supported extensions" (message "Searching %s... %d matches" group arts))) (message "Searching %s...done" group)) (quit nil)) - (reverse artlist))) + artlist)) groups))))) (defun nnir-imap-make-query (criteria qstring) @@ -1316,7 +1315,7 @@ Tested with Namazu 2.0.6 on a GNU/Linux system." (gnus-inhibit-demon t) artlist) (require 'mm-url) - (with-current-buffer nntp-server-buffer + (with-current-buffer (get-buffer-create nnir-tmp-buffer) (erase-buffer) (mm-url-insert (concat |