nnir.el (nnir-get-active): Improve active list retrieval.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5d6c9a..ee44294 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
        * nnir.el (nnir-request-move-article): Bail out if original group
        doesn't support article moves.
+       (nnir-get-active): Improve active list retrieval.
 
 2010-11-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 

diff --git a/lisp/nnir.el b/lisp/nnir.el
index b49c99e..8f936d5 100644 (file)
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -1508,15 +1508,35 @@ server is of form 'backend:name'."
        (goto-char (point-min))
        (unless (string= nnir-ignored-newsgroups "")
          (delete-matching-lines nnir-ignored-newsgroups))
-       (while (not (eobp))
-         (ignore-errors
-           (push (mm-string-as-unibyte
-                  (let ((p (point)))
-                    (skip-chars-forward "^ \t\\\\")
-                    (setq name (buffer-substring (+ p 1) (- (point) 1)))
-                    (gnus-group-full-name name method)))
-                 groups))
-         (forward-line))))
+       (if (eq (car method) 'nntp)
+           (while (not (eobp))
+             (ignore-errors
+               (push (mm-string-as-unibyte
+                      (gnus-group-full-name
+                       (buffer-substring
+                        (point)
+                        (progn
+                          (skip-chars-forward "^ \t")
+                          (point))) method))
+                     groups))
+             (forward-line))
+         (while (not (eobp))
+           (ignore-errors
+             (push (mm-string-as-unibyte
+                    (if (eq (char-after) ?\")
+                        (gnus-group-full-name (read cur) method)
+                      (let ((p (point)) (name ""))
+                        (skip-chars-forward "^ \t\\\\")
+                        (setq name (buffer-substring p (point)))
+                        (while (eq (char-after) ?\\)
+                          (setq p (1+ (point)))
+                          (forward-char 2)
+                          (skip-chars-forward "^ \t\\\\")
+                          (setq name (concat name (buffer-substring
+                                                   p (point)))))
+                        (gnus-group-full-name name method))))
+                   groups))
+           (forward-line)))))
     groups))
 
 ;; The end.