nnir.el (nnir-retrieve-headers): Use rassq when comparing article ids.

 (nnir-run-gmane): Simplify groupspec formatting.

2 files changed, 11 insertions, 6 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2a1bdad398b..25dd77cdf77 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-08  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnir.el (nnir-retrieve-headers): Use rassq when comparing article
+        ids.
+        (nnir-run-gmane): Simplify groupspec formatting.
+
 2010-12-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * nnimap.el (nnimap-parse-flags): Tweak VANISHED regexp to avoid regexp
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 66222fe7937..0a67f88f238 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -635,7 +635,7 @@ Add an entry here when adding a new search engine.")
           (while (not (eobp))
             (let* ((novitem (funcall parsefunc))
                    (artno (mail-header-number novitem))
-                   (art (car (rassoc artno articleids))))
+                   (art (car (rassq artno articleids))))
               (when art
                 (mail-header-set-number novitem art)
                 (push novitem headers))
@@ -1379,11 +1379,10 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
       (let* ((case-fold-search t)
              (qstring (cdr (assq 'query query)))
              (server (cadr (gnus-server-to-method srv)))
-             (groupspec (if groups
-                            (mapconcat
-                             (lambda (x)
-                               (format "group:%s" (gnus-group-short-name x)))
-                             groups " ") ""))
+             (groupspec (mapconcat
+                         (lambda (x)
+                           (format "group:%s" (gnus-group-short-name x)))
+                         groups " "))
              (authorspec
               (if (assq 'author query)
                   (format "author:%s" (cdr (assq 'author query))) ""))