From: keiichi <keiichi>
Date: Sun, 5 Mar 2000 08:03:09 +0000 (+0000)
Subject: (message-send): Encode header fields, when did not send message.
X-Git-Tag: nana-gnus-7_1_0_16~23
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9d007e334498ad2d732ba28c759c294dd555f556;p=elisp%2Fgnus.git-

(message-send): Encode header fields, when did not send message.
---

diff --git a/lisp/message.el b/lisp/message.el
index 4802ce0..400b10f 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2206,29 +2206,39 @@ It should typically alter the sending method in some way or other."
 	      (message-mime-mode mime-edit-mode-flag)
 	      (alist message-send-method-alist)
 	      (success t)
-	      elem sent)
-	  (unwind-protect
-	      (if (save-excursion
-		    (set-buffer message-encoding-buffer)
-		    (erase-buffer)
-		    (insert-buffer message-edit-buffer)
-		    (funcall message-encode-function)
-		    (message-fix-before-sending)
-		    (while (and success
-				(setq elem (pop alist)))
-		      (and (funcall (cadr elem))
-			   (and (or (not (memq (car elem)
-					       message-sent-message-via))
-				    (y-or-n-p
-				     (format
-				      "Already sent message via %s; resend? "
-				      (car elem))))
-				(setq success (funcall (caddr elem) arg)))
-			   (setq sent t)))
-		    (not (and success sent)))
-		  (throw 'message-sending-cancel t)
+	      elem sent header-encoded)
+	  (save-excursion
+	    (set-buffer message-encoding-buffer)
+	    (erase-buffer)
+	    (insert-buffer message-edit-buffer)
+	    (funcall message-encode-function)
+	    (message-fix-before-sending)
+	    (while (and success
+			(setq elem (pop alist)))
+	      (when (or (not (funcall (cadr elem)))
+			(and (or (not (memq (car elem)
+					    message-sent-message-via))
+				 (y-or-n-p
+				  (format
+				   "Already sent message via %s; resend? "
+				   (car elem))))
+			     (setq success (funcall (caddr elem) arg))
+			     (setq header-encoded t)))
+		(setq sent t))))
+	  (unless (or sent (not success))
+	    (error "No methods specified to send by"))
+	  (unless header-encoded
+	    (save-excursion
+	      (set-buffer message-encoding-buffer)
+	      (run-hooks 'message-header-hook)
+	      (when (functionp message-header-encode-function)
+		(funcall message-header-encode-function))
+	      (run-hooks 'message-header-encoded-hook)))
+	  (prog1
+	      (when (and success sent)
 		(message-do-fcc)
-		(run-hooks 'message-sent-hook)
+		(save-excursion
+		  (run-hooks 'message-sent-hook))
 		(message "Sending...done")
 		;; Mark the buffer as unmodified and delete auto-save.
 		(set-buffer-modified-p nil)
@@ -2237,6 +2247,7 @@ It should typically alter the sending method in some way or other."
 		;; Delete other mail buffers and stuff.
 		(message-do-send-housekeeping)
 		(message-do-actions message-send-actions)
+		;; Return success.
 		nil)
 	    (kill-buffer message-encoding-buffer))))
       (progn