[Emacs-diffs] /srv/bzr/emacs/trunk r112162: gnus-msg.el (gnus-setup-message): Set the posting-style and gcc properly for nnir summary buffers

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 112162
author: Andrew Cohen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2013-03-27 22:12:36 +0000
message:
  gnus-msg.el (gnus-setup-message): Set the posting-style and gcc properly for 
nnir summary buffers
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-msg.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-03-27 01:17:08 +0000
+++ b/lisp/gnus/ChangeLog       2013-03-27 22:12:36 +0000
@@ -1,5 +1,9 @@
 2013-03-27  Andrew Cohen  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el     2013-01-02 16:13:04 +0000
+++ b/lisp/gnus/gnus-msg.el     2013-03-27 22:12:36 +0000
@@ -426,15 +426,24 @@
     `(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 @@
          (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