Synch to No Gnus 200402270913.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75a49b9..bad3364 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2004-02-27  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * gnus-msg.el (gnus-setup-message): Ignore an article copy while
+       parsing gnus-posting-styles when the message is not for replying.
+
        * dgnushack.el: Autoload sgml-mode for XEmacs.
 
        * nnrss.el (nnrss-opml-export): Use

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index df10587..e6918bb 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -434,8 +434,13 @@ Thank you for your help in stamping out bugs.
        ;; added an optional argument to `gnus-configure-posting-styles' to
        ;; make sure that the correct value for the group name is used. -- drv
        (add-hook 'message-mode-hook
-                (lambda ()
-                  (gnus-configure-posting-styles ,group)))
+                (if (memq ,config '(reply-yank reply))
+                    (lambda ()
+                      (gnus-configure-posting-styles ,group))
+                  (lambda ()
+                    ;; There may be an old " *gnus article copy*" buffer.
+                    (let (gnus-article-copy)
+                      (gnus-configure-posting-styles ,group)))))
        (gnus-pull ',(intern gnus-draft-meta-information-header)
                  message-required-headers)
        (when (and ,group