[Emacs-diffs] feature/gnus-select2 465b580 29/32: * lisp/gnus/nnir.el (nnir-make-specs): Use the current buffer.

[Andrew G Cohen]

branch: feature/gnus-select2
commit 465b5807309d048511c75422926b64bc08e38375
Author: Andrew G Cohen <address@hidden>
Commit: Andrew G Cohen <address@hidden>

    * lisp/gnus/nnir.el (nnir-make-specs): Use the current buffer.
---
 lisp/gnus/nnir.el | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index f27a1da..03d909c 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -1331,30 +1331,29 @@ environment unless `not-global' is non-nil."
 (defvar gnus-topic-alist)
 
 (defun nnir-make-specs (nnir-extra-parms &optional specs)
-  (with-current-buffer gnus-group-buffer
-    (let* ((group-spec
-           (or (cdr (assq 'nnir-group-spec specs))
-               (if (gnus-server-server-name)
-                   (list (list (gnus-server-server-name)))
-                 (nnselect-categorize
-                  (or gnus-group-marked
-                      (if (gnus-group-group-name)
-                          (list (gnus-group-group-name))
-                        (cdr (assoc (gnus-group-topic-name) 
gnus-topic-alist))))
-                  'nnselect-group-server))))
-          (query-spec
-           (or (cdr (assq 'nnir-query-spec specs))
-               (apply
-                'append
-                (list (cons 'query
-                            (read-string "Query: " nil 'nnir-search-history)))
-                (when nnir-extra-parms
-                  (mapcar
-                   (lambda (x)
-                     (nnir-read-parms (nnir-server-to-search-engine (car x))))
-                   group-spec))))))
-      (list (cons 'nnir-query-spec query-spec)
-           (cons 'nnir-group-spec group-spec)))))
+  (let* ((group-spec
+         (or (cdr (assq 'nnir-group-spec specs))
+             (if (gnus-server-server-name)
+                 (list (list (gnus-server-server-name)))
+               (nnselect-categorize
+                (or gnus-group-marked
+                    (if (gnus-group-group-name)
+                        (list (gnus-group-group-name))
+                      (cdr (assoc (gnus-group-topic-name) gnus-topic-alist))))
+                'nnselect-group-server))))
+        (query-spec
+         (or (cdr (assq 'nnir-query-spec specs))
+             (apply
+              'append
+              (list (cons 'query
+                          (read-string "Query: " nil 'nnir-search-history)))
+              (when nnir-extra-parms
+                (mapcar
+                 (lambda (x)
+                   (nnir-read-parms (nnir-server-to-search-engine (car x))))
+                 group-spec))))))
+    (list (cons 'nnir-query-spec query-spec)
+         (cons 'nnir-group-spec group-spec))))
 
 ;; The end.
 (provide 'nnir)