nnir.el (nnir-run-gmane): Better check for gmane groups: error out if groupname doesn...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 47350b34bad200c088542e5fcca67dbd295bbc9a..52ef531e3a8adbbe4d94a0706f8ca75cf2575fd6 100644 (file)
--- 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 d3ec3d24b58cb9b6b70394b98e5bc9b0d33caad5..6c97f7279fc651561652c4ede3d32526b639c828 100644 (file)
--- 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: