nnir.el (nnir-run-gmane): Restore sub-optimal test for gmane server.

 (nnir-request-article): Improve article retrieval.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index af7161d3e933a57f553ae777fec1e461087d6dd7..2d4d79af2cc40a4a83dadaedc8484a128a03dba0 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-07  Andrew Cohen  <cohen@andy.bu.edu>
+
+       * nnir.el (nnir-run-gmane): Restore sub-optimal test for gmane server.
+       (nnir-request-article): Improve article retrieval.
+
 2010-12-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-util.el (mm-extra-numeric-entities): New variable.

diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 750218d4a9a825626ceee125616515109f310bc8..66222fe79372db2c862a8e642f7b614ea0b9b5f9 100644 (file)
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -656,17 +656,14 @@ Add an entry here when adding a new search engine.")
        article)
     (save-excursion
       (let ((artfullgroup (nnir-article-group article))
-           (artno (nnir-article-number article))
-           ;; Bug?
-           ;; Why must we bind nntp-server-buffer here?  It won't
-           ;; work if `buf' is used, say.  (Of course, the set-buffer
-           ;; line below must then be updated, too.)
-           (nntp-server-buffer (or to-buffer nntp-server-buffer)))
-       (set-buffer nntp-server-buffer)
-       (erase-buffer)
+           (artno (nnir-article-number article)))
        (message "Requesting article %d from group %s"
                 artno artfullgroup)
-       (gnus-request-article artno artfullgroup nntp-server-buffer)
+       (if to-buffer
+           (with-current-buffer to-buffer
+             (let ((gnus-article-decode-hook nil))
+               (gnus-request-article-this-buffer artno artfullgroup)))
+         (gnus-request-article artno artfullgroup))
        (cons artfullgroup artno)))))
 
 (deffoo nnir-request-move-article (article group server accept-form
@@ -1378,10 +1375,7 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
 ;; gmane interface
 (defun nnir-run-gmane (query srv &optional groups)
   "Run a search against a gmane back-end server."
-  (if (gnus-string-match-p
-       "gmane.org$"
-       (or (cadr (assoc 'nntp-address  (cddr (gnus-server-to-method srv))))
-          ""))
+  (if (gnus-string-match-p  "gmane" srv)
       (let* ((case-fold-search t)
             (qstring (cdr (assq 'query query)))
             (server (cadr (gnus-server-to-method srv)))