From: yamaoka <yamaoka>
Date: Tue, 8 Jan 2002 22:33:14 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_5-01-quimby~12
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=3b35597ddc1296905b3294e39acce03a280e59e9;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 748d443..be21fde 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
+2002-01-08  Simon Josefsson  <jas@extundo.com>
+
+	* mml.el (mml-generate-mime-1): Set recipient correctly.
+
 2002-01-08  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+	* message.el (message-read-from-minibuffer): Add argument
+	initial-contents.
+	* gnus-msg.el (gnus-summary-resend-message): Use it.
+	
 	* gnus-group.el (gnus-group-read-ephemeral-group): Restore the old
 	behavior of quit-config.
 	
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index f8f3ef1..3efcd58 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1199,7 +1199,14 @@ forward those articles instead."
 (defun gnus-summary-resend-message (address n)
   "Resend the current article to ADDRESS."
   (interactive
-   (list (message-read-from-minibuffer "Resend message(s) to: ")
+   (list (message-read-from-minibuffer 
+	  "Resend message(s) to: "
+	  (when (gnus-buffer-live-p gnus-original-article-buffer)
+	    ;; If some other article is currently selected, the
+	    ;; initial-contents is wrong. Whatever, it is just the
+	    ;; initial-contents.
+	    (with-current-buffer gnus-original-article-buffer
+	      (nnmail-fetch-field "to"))))
 	 current-prefix-arg))
   (let ((articles (gnus-summary-work-articles n))
 	article)
diff --git a/lisp/message.el b/lisp/message.el
index 7540ff4..3012501 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6226,16 +6226,16 @@ regexp varstr."
 	  (forward-line 1)
 	  (insert "Content-Type: text/plain; charset=us-ascii\n"))))))
 
-(defun message-read-from-minibuffer (prompt)
+(defun message-read-from-minibuffer (prompt &optional initial-contents)
   "Read from the minibuffer while providing abbrev expansion."
   (if (fboundp 'mail-abbrevs-setup)
       (let ((mail-abbrev-mode-regexp "")
 	    (minibuffer-setup-hook 'mail-abbrevs-setup)
 	    (minibuffer-local-map message-minibuffer-local-map))
-	(read-from-minibuffer prompt))
+	(read-from-minibuffer prompt initial-contents))
     (let ((minibuffer-setup-hook 'mail-abbrev-minibuffer-setup-hook)
 	  (minibuffer-local-map message-minibuffer-local-map))
-      (read-string prompt))))
+      (read-string prompt initial-contents))))
 
 (defun message-use-alternative-email-as-from ()
   (require 'mail-utils)
diff --git a/lisp/mml.el b/lisp/mml.el
index 0d40ae9..2cd66ba 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -472,7 +472,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 	  (if (setq sender (cdr (assq 'sender cont)))
 	      (message-options-set 'message-sender sender))
 	  (if (setq recipients (cdr (assq 'recipients cont)))
-	      (message-options-set 'message-sender recipients))
+	      (message-options-set 'message-recipients recipients))
 	  (funcall (nth 1 item) cont)))
       (let ((item (assoc (cdr (assq 'encrypt cont)) mml-encrypt-alist))
 	    sender recipients)
@@ -480,7 +480,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 	  (if (setq sender (cdr (assq 'sender cont)))
 	      (message-options-set 'message-sender sender))
 	  (if (setq recipients (cdr (assq 'recipients cont)))
-	      (message-options-set 'message-sender recipients))
+	      (message-options-set 'message-recipients recipients))
 	  (funcall (nth 1 item) cont))))))
 
 (defun mml-compute-boundary (cont)