gnus-msg.el: Fix detection of nnir group.

[gnus] / lisp / gnus-msg.el

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 7503afd..3613555 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -417,6 +417,7 @@ Thank you for your help in stamping out bugs.
 
 (autoload 'nnir-article-number "nnir" nil nil 'macro)
 (autoload 'nnir-article-group "nnir" nil nil 'macro)
+(autoload 'gnus-nnir-group-p "nnir")
 
 
 (defvar gnus-article-reply nil)
@@ -430,17 +431,15 @@ Thank you for your help in stamping out bugs.
     `(let ((,winconf (current-window-configuration))
           (,winconf-name gnus-current-window-configuration)
           (,buffer (buffer-name (current-buffer)))
-          (,article (or  (when (and
-                                (string-match "^nnir:" gnus-newsgroup-name)
-                                gnus-article-reply)
-                           (nnir-article-number gnus-article-reply))
-                          gnus-article-reply))
-          (,yanked gnus-article-yanked-articles)
-          (,group (or (when (and
-                             (string-match "^nnir:" gnus-newsgroup-name)
+          (,article (if (and (gnus-nnir-group-p gnus-newsgroup-name)
                              gnus-article-reply)
-                        (nnir-article-group gnus-article-reply))
-                      gnus-newsgroup-name))
+                        (nnir-article-number gnus-article-reply)
+                      gnus-article-reply))
+          (,yanked gnus-article-yanked-articles)
+          (,group (if (and (gnus-nnir-group-p gnus-newsgroup-name)
+                           gnus-article-reply)
+                      (nnir-article-group gnus-article-reply)
+                    gnus-newsgroup-name))
           (message-header-setup-hook
            (copy-sequence message-header-setup-hook))
           (mbl mml-buffer-list)