Sync up with Pteroductyl Gnus 0.62

[elisp/gnus.git-] / lisp / gnus-msg.el

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 84de9cb..6ee0f57 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -360,7 +360,8 @@ post using the current select method."
 This is done simply by taking the old article and adding a Supersedes
 header line with the old Message-ID."
   (interactive)
-  (let ((article (gnus-summary-article-number)))
+  (let ((article (gnus-summary-article-number))
+       (gnus-message-setup-hook '(gnus-maybe-setup-default-charset)))
     (gnus-setup-message 'reply-yank
       (gnus-summary-select-article t)
       (set-buffer gnus-original-article-buffer)
@@ -1122,6 +1123,15 @@ this is a reply."
          (gnus-newsgroup-name (or gnus-newsgroup-name ""))
          style match variable attribute value value-value)
       (make-local-variable 'gnus-message-style-insertions)
+      ;; If the group has a posting-style parameter, add it at the end with a
+      ;; regexp matching everything, to be sure it takes precedence over all
+      ;; the others.
+      (unless (eq 0 (length gnus-newsgroup-name))
+       (let ((tmp-style (gnus-group-find-parameter gnus-newsgroup-name 
+                                                   'posting-style t)))
+         (and tmp-style
+              (setq styles (append styles (list (cons ".*" tmp-style)))))
+         ))
       ;; Go through all styles and look for matches.
       (while styles
        (setq style (pop styles)