Mercurial > emacs
changeset 111843:94c9743593b9
nnir.el (nnir-run-gmane): Restore sub-optimal test for gmane server.
(nnir-request-article): Improve article retrieval.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 07 Dec 2010 14:10:11 +0000 |
| parents | 265c545c8f48 |
| children | ea38bb6f82b2 |
| files | lisp/gnus/ChangeLog lisp/gnus/nnir.el |
| diffstat | 2 files changed, 12 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Tue Dec 07 05:06:56 2010 +0000 +++ b/lisp/gnus/ChangeLog Tue Dec 07 14:10:11 2010 +0000 @@ -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.
--- a/lisp/gnus/nnir.el Tue Dec 07 05:06:56 2010 +0000 +++ b/lisp/gnus/nnir.el Tue Dec 07 14:10:11 2010 +0000 @@ -656,17 +656,14 @@ 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 @@ ;; 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)))