gnus-msg.el (gnus-setup-message): Set the posting-style and gcc properly for nnir...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1af3a00c00ee09bb03142bd45b70c3a7b32f038c..cbfb0109aecd0f456f80414cb8d825f3811a4bd4 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,9 @@
 2013-03-27  Andrew Cohen  <cohen@bu.edu>
 
+       * gnus-msg.el (gnus-setup-message): When replying from an nnir summary
+       buffer use the posting-style and gcc of the original article group.
+       (gnus-inews-insert-gcc): Don't set gcc-self for virtual groups.
+
        * nnir.el: Fix byte-compile warning. nnoo-define-skeleton should come
        after other deffoos.
 

diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index f7b2d8b99d9a068fc79886330c5653c2249079d6..067465b0e6f553c78a8ea7a36c092c128137bd3a 100644 (file)
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -426,15 +426,24 @@ 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 gnus-article-reply)
+          (,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 gnus-newsgroup-name)
+          (,group (or (when (and
+                             (string-match "^nnir:" 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)
           (message-mode-hook (copy-sequence message-mode-hook)))
        (setq mml-buffer-list nil)
-       (add-hook 'message-header-setup-hook 'gnus-inews-insert-gcc)
+       (add-hook 'message-header-setup-hook (lambda ()
+                                                     (gnus-inews-insert-gcc ,group)))
        ;; message-newsreader and message-mailer were formerly set in
        ;; gnus-inews-add-send-actions, but this is too late when
        ;; message-generate-headers-first is used. --ansel
@@ -1706,7 +1715,8 @@ this is a reply."
          (group (when group (gnus-group-decoded-name group)))
          (var (or gnus-outgoing-message-group gnus-message-archive-group))
         (gcc-self-val
-         (and group (gnus-group-find-parameter group 'gcc-self)))
+         (and group (gnus-group-find-parameter group 'gcc-self)
+              (not (gnus-virtual-group-p group))))
         result
         (groups
          (cond