diff lisp/gnus/nnir.el @ 111669:ed117caa918e

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.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 21 Nov 2010 22:46:16 +0000
parents 4273d2312244
children f97704487fb3
line wrap: on
line diff
--- a/lisp/gnus/nnir.el	Sun Nov 21 20:46:48 2010 +0100
+++ b/lisp/gnus/nnir.el	Sun Nov 21 22:46:16 2010 +0000
@@ -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 @@
       (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 @@
 		      (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 @@
 	     (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