Importing gnus-5.6.38

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

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 236a6a7..ef0ded7 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -188,7 +188,7 @@ Thank you for your help in stamping out bugs.
            (copy-sequence message-header-setup-hook)))
        (add-hook 'message-header-setup-hook 'gnus-inews-insert-gcc)
        (add-hook 'message-header-setup-hook 'gnus-inews-insert-archive-gcc)
-       (add-hook 'message-setup-hook 'gnus-configure-posting-styles)
+       (add-hook 'message-mode-hook 'gnus-configure-posting-styles)
        (unwind-protect
           (progn
             ,@forms)
@@ -511,7 +511,8 @@ If SILENT, don't prompt the user."
           (not (eq (car group-method) 'nndraft))
           (not arg))
       group-method) 
-     (gnus-post-method
+     ((and gnus-post-method
+          (not (eq gnus-post-method 'current)))
       gnus-post-method)
      ;; Use the normal select method.
      (t gnus-select-method))))
@@ -1111,17 +1112,23 @@ this is a reply."
                ;; This is an ordinary variable.
                (set (make-local-variable variable) value-value)
               ;; This is either a body or a header to be inserted in the
-              ;; message
-              (when value-value
-                (let ((attr (car attribute)))
+              ;; message.
+             (when value-value
+               (let ((attr (car attribute)))
+                 (make-local-variable 'message-setup-hook)
                   (if (eq 'body attr)
-                      (save-excursion
-                        (goto-char (point-max))
-                        (insert value-value))
-                    (save-excursion
-                     (message-goto-eoh)
-                      (insert (if (stringp attr) attr (symbol-name attr))
-                              ": " value-value "\n"))))))))))))
+                     (add-hook 'message-setup-hook
+                               `(lambda ()
+                                  (save-excursion
+                                    (message-goto-body)
+                                    (insert ,value-value))))
+                   (add-hook
+                    'message-setup-hook
+                    `(lambda ()
+                       (save-excursion
+                         (message-goto-eoh)
+                         (insert ,(if (stringp attr) attr (symbol-name attr))
+                                 ": " ,value-value "\n"))))))))))))))
 
 ;;; Allow redefinition of functions.