gnus-msg.el (gnus-summary-resend-message-insert-gcc): Assume that gnus-gcc-self-resen...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f1912f..43f1a97 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,9 @@
 2012-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * gnus-msg.el (gnus-summary-resend-message): Don't encode encoded words
-       in header when Gcc'ing resent message.
+       * gnus-msg.el (gnus-summary-resend-message-insert-gcc): Assume that
+       gnus-gcc-self-resent-messages may be a group parameter.
+       (gnus-summary-resend-message): Don't encode encoded words in header
+       when Gcc'ing resent message.
 
 2012-03-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index e09f728..6cf0837 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1313,26 +1313,27 @@ For the \"inline\" alternatives, also see the variable
                                          group)))
              (message-unquote-tokens
               (message-tokenize-header (mail-fetch-field "gcc" nil t)
-                                       " ,")))))
+                                       " ,"))))
+       (self (with-current-buffer gnus-summary-buffer
+               gnus-gcc-self-resent-messages)))
     (message-remove-header "gcc")
     (when gcc
       (goto-char (point-max))
-      (cond ((eq gnus-gcc-self-resent-messages 'none))
-           ((eq gnus-gcc-self-resent-messages t)
+      (cond ((eq self 'none))
+           ((eq self t)
             (insert "Gcc: \"" gnus-newsgroup-name "\"\n"))
-           ((stringp gnus-gcc-self-resent-messages)
+           ((stringp self)
             (insert "Gcc: "
                     (mm-encode-coding-string
-                     (if (string-match " " gnus-gcc-self-resent-messages)
-                         (concat "\"" gnus-gcc-self-resent-messages "\"")
-                       gnus-gcc-self-resent-messages)
-                     (gnus-group-name-charset
-                      (gnus-inews-group-method gnus-gcc-self-resent-messages)
-                      gnus-gcc-self-resent-messages))
+                     (if (string-match " " self)
+                         (concat "\"" self "\"")
+                       self)
+                     (gnus-group-name-charset (gnus-inews-group-method self)
+                                              self))
                     "\n"))
-           ((null gnus-gcc-self-resent-messages)
+           ((null self)
             (insert "Gcc: " (mapconcat 'identity gcc ", ") "\n"))
-           ((eq gnus-gcc-self-resent-messages 'no-gcc-self)
+           ((eq self 'no-gcc-self)
             (when (setq gcc (delete
                              gnus-newsgroup-name
                              (delete (concat "\"" gnus-newsgroup-name "\"")