# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1292283119 0
# Node ID 9d703d5d5634e0ffc45e559c709fda719da6e5eb
# Parent  db63bc492d85d7a95b87ced48a8974c97878c7cb
nnir.el (nnir-run-gmane): Better check for gmane groups: error out if groupname doesn't contain "gmane".

diff -r db63bc492d85 -r 9d703d5d5634 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Mon Dec 13 22:29:12 2010 +0000
+++ b/lisp/gnus/ChangeLog	Mon Dec 13 23:31:59 2010 +0000
@@ -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 -r db63bc492d85 -r 9d703d5d5634 lisp/gnus/nnir.el
--- a/lisp/gnus/nnir.el	Mon Dec 13 22:29:12 2010 +0000
+++ b/lisp/gnus/nnir.el	Mon Dec 13 23:31:59 2010 +0000
@@ -1397,14 +1397,15 @@
 ;; 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 @@
 		      (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: