[Emacs-diffs] /srv/bzr/emacs/trunk r106565: Gnus: Share the value of the buffer-local `message-options' variable between a draft buffer and temprary working buffers.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106565
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2011-12-01 04:55:39 +0000
message:
  Gnus: Share the value of the buffer-local `message-options' variable between 
a draft buffer and temprary working buffers.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-msg.el
  lisp/gnus/message.el
  lisp/gnus/mml.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-11-30 14:52:08 +0000
+++ b/lisp/gnus/ChangeLog       2011-12-01 04:55:39 +0000
@@ -1,3 +1,11 @@
+2011-12-01  Katsumi Yamaoka  <address@hidden>
+
+       * gnus-msg.el (gnus-inews-do-gcc):
+       * message.el (message-send-mail):
+       * mml.el (mml-generate-mime): Share the value of the buffer-local
+       `message-options' variable between a draft buffer and temprary working
+       buffers.
+
 2011-11-30  Stefan Monnier  <address@hidden>
 
        * message.el (message-pop-to-buffer): Revert 2011-09-11 change.

=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el     2011-09-11 22:50:22 +0000
+++ b/lisp/gnus/gnus-msg.el     2011-12-01 04:55:39 +0000
@@ -1549,7 +1549,7 @@
       (message-narrow-to-headers)
       (let ((gcc (or gcc (mail-fetch-field "gcc" nil t)))
            (cur (current-buffer))
-           groups group method group-art
+           groups group method group-art options
            mml-externalize-attachments)
        (when gcc
          (message-remove-header "gcc")
@@ -1573,6 +1573,7 @@
                    gnus-gcc-externalize-attachments))
            (save-excursion
              (nnheader-set-temp-buffer " *acc*")
+             (setq message-options (with-current-buffer cur message-options))
              (insert-buffer-substring cur)
              (message-encode-message-body)
              (save-restriction
@@ -1629,6 +1630,8 @@
                              (boundp 'gnus-inews-mark-gcc-as-read)
                              (symbol-value 'gnus-inews-mark-gcc-as-read))))
                (gnus-group-mark-article-read group (cdr group-art)))
+             (setq options message-options)
+             (with-current-buffer cur (setq message-options options))
              (kill-buffer (current-buffer)))))))))
 
 (defun gnus-inews-insert-gcc (&optional group)

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-11-30 14:52:08 +0000
+++ b/lisp/gnus/message.el      2011-12-01 04:55:39 +0000
@@ -4507,7 +4507,8 @@
                   (boundp 'gnus-group-posting-charset-alist))
              (gnus-setup-posting-charset nil)
            message-posting-charset))
-        (headers message-required-mail-headers))
+        (headers message-required-mail-headers)
+        options)
     (when (and message-generate-hashcash
               (not (eq message-generate-hashcash 'opportunistic)))
       (message "Generating hashcash...")
@@ -4546,9 +4547,11 @@
              (error "Failed to send the message")))))
       ;; Let the user do all of the above.
       (run-hooks 'message-header-hook))
+    (setq options message-options)
     (unwind-protect
        (with-current-buffer tembuf
          (erase-buffer)
+         (setq message-options options)
          ;; Avoid copying text props (except hard newlines).
          (insert (with-current-buffer mailbuf
                    (mml-buffer-substring-no-properties-except-hard-newlines
@@ -4630,9 +4633,11 @@
                (message "Sending via mail...")
                (funcall (or message-send-mail-real-function
                             message-send-mail-function)))
-           (message-send-mail-partially)))
+           (message-send-mail-partially))
+         (setq options message-options))
       (kill-buffer tembuf))
     (set-buffer mailbuf)
+    (setq message-options options)
     (push 'mail message-sent-message-via)))
 
 (defvar sendmail-program)

=== modified file 'lisp/gnus/mml.el'
--- a/lisp/gnus/mml.el  2011-11-27 04:43:11 +0000
+++ b/lisp/gnus/mml.el  2011-12-01 04:55:39 +0000
@@ -466,16 +466,21 @@
 (defun mml-generate-mime ()
   "Generate a MIME message based on the current MML document."
   (let ((cont (mml-parse))
-       (mml-multipart-number mml-multipart-number))
+       (mml-multipart-number mml-multipart-number)
+       (options message-options))
     (if (not cont)
        nil
-      (mm-with-multibyte-buffer
-       (if (and (consp (car cont))
-                (= (length cont) 1))
-           (mml-generate-mime-1 (car cont))
-         (mml-generate-mime-1 (nconc (list 'multipart '(type . "mixed"))
-                                     cont)))
-       (buffer-string)))))
+      (prog1
+         (mm-with-multibyte-buffer
+           (setq message-options options)
+           (if (and (consp (car cont))
+                    (= (length cont) 1))
+               (mml-generate-mime-1 (car cont))
+             (mml-generate-mime-1 (nconc (list 'multipart '(type . "mixed"))
+                                         cont)))
+           (setq options message-options)
+           (buffer-string))
+       (setq message-options options)))))
 
 (defun mml-generate-mime-1 (cont)
   (let ((mm-use-ultra-safe-encoding