(mail-setup): Use fill-region-as-paragraph

for To field; handle the CC just like the To.

1 files changed, 10 insertions, 10 deletions

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index d97eaa0946d..f0de0525ce5 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -120,19 +120,19 @@ so you can edit or delete these lines.")
   (insert "To: ")
   (save-excursion
     (if to
-	(progn
+	;; Here removed code to extract names from within <...>
+	;; on the assumption that mail-strip-quoted-names
+	;; has been called and has done so.
+	(let ((fill-prefix "\t")
+	      (address-start (point)))
 	  (insert to "\n")
-	  ;;; Here removed code to extract names from within <...>
-	  ;;; on the assumption that mail-strip-quoted-names
-	  ;;; has been called and has done so.
-	  (let ((fill-prefix "\t"))
-	    (fill-region (point-min) (point-max))))
+	  (fill-region-as-paragraph address-start (point-max)))
       (newline))
     (if cc
-	(let ((opos (point))
-	      (fill-prefix "\t"))
-	  (insert "CC: " cc "\n")
-	  (fill-region-as-paragraph opos (point-max))))
+	(let ((fill-prefix "\t")
+	      (address-start (progn (insert "CC: ") (point))))
+	  (insert cc "\n")
+	  (fill-region-as-paragraph address-start (point-max))))
     (if in-reply-to
 	(insert "In-reply-to: " in-reply-to "\n"))
     (insert "Subject: " (or subject "") "\n")