diff options
author | Andrew Cohen <cohen@andy.bu.edu> | 2010-12-13 23:31:59 +0000 |
---|---|---|
committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-12-13 23:31:59 +0000 |
commit | 99e58ed58114363b4bc2100c8d912b4ed9c1e569 (patch) | |
tree | b816822a9678d2af20e49d4f1b7fe23542d96c20 | |
parent | 7410c2700a7c3256a117ce9d1d3dbcd934a57589 (diff) |
nnir.el (nnir-run-gmane): Better check for gmane groups: error out if groupname doesn't contain "gmane".
-rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/gnus/nnir.el | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 47350b34ba..52ef531e3a 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2010-12-13 Andrew Cohen <cohen@andy.bu.edu> + + * nnir.el (nnir-run-gmane): Better check for gmane groups: error out if + groupname doesn't contain "gmane". + 2010-12-13 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus-start.el (gnus-matches-options-n): Fix typo in last change. diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index d3ec3d24b5..6c97f7279f 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -1397,14 +1397,15 @@ 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" srv) (let* ((case-fold-search t) (qstring (cdr (assq 'query query))) (server (cadr (gnus-server-to-method srv))) (groupspec (mapconcat (lambda (x) - (format "group:%s" (gnus-group-short-name x))) - groups " ")) + (if (gnus-string-match-p "gmane" x) + (format "group:%s" (gnus-group-short-name x)) + (error "Can't search non-gmane groups: %s" x))) + groups " ")) (authorspec (if (assq 'author query) (format "author:%s" (cdr (assq 'author query))) "")) @@ -1439,9 +1440,7 @@ Tested with Namazu 2.0.6 on a GNU/Linux system." (string-to-number (match-string 2 xref)) xscore) artlist))))) (forward-line 1))) - (apply 'vector (nreverse (mm-delete-duplicates artlist)))) - (message "Can't search non-gmane nntp groups") - nil)) + (apply 'vector (nreverse (mm-delete-duplicates artlist))))) ;;; Util Code: |