* message.el (message-get-reply-headers): Fix to-address.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0b6529..13e4b61 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-23 01:14:28  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-get-reply-headers): Fix to-address.
+
 2000-04-22 22:51:46  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * webmail.el: Hotmail fix. Add a debug function.

diff --git a/lisp/message.el b/lisp/message.el
index ec13bb8..8bdfab1 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3516,38 +3516,46 @@ OTHER-HEADERS is an alist of header/value pairs."
                 (equal (downcase mct) "poster"))
             (setq mct (or reply-to from)))))
 
-    (message-set-work-buffer)
-    (unless never-mct
-      (insert (or reply-to from "")))
-    (insert (if to (concat (if (bolp) "" ", ") to "") ""))
-    (insert (if mct (concat (if (bolp) "" ", ") mct) ""))
-    (insert (if cc (concat (if (bolp) "" ", ") cc) ""))
-    (goto-char (point-min))
-    (while (re-search-forward "[ \t]+" nil t)
-      (replace-match " " t t))
-    ;; Remove addresses that match `rmail-dont-reply-to-names'.
-    (let ((rmail-dont-reply-to-names message-dont-reply-to-names))
-      (insert (prog1 (rmail-dont-reply-to (buffer-string))
-               (erase-buffer))))
-    (goto-char (point-min))
-    ;; Perhaps "Mail-Copies-To: never" removed the only address?
-    (when (eobp)
-      (insert (or reply-to from "")))
-    (setq ccalist
-         (mapcar
-          (lambda (addr)
-            (cons (mail-strip-quoted-names addr) addr))
-          (message-tokenize-header (buffer-string))))
-    (let ((s ccalist))
-      (while s
-       (setq ccalist (delq (assoc (car (pop s)) s) ccalist))))
-    (setq follow-to (list (cons 'To (cdr (pop ccalist)))))
-    (when ccalist
-      (let ((ccs (cons 'Cc (mapconcat
-                           (lambda (addr) (cdr addr)) ccalist ", "))))
-       (when (string-match "^ +" (cdr ccs))
-         (setcdr ccs (substring (cdr ccs) (match-end 0))))
-       (push ccs follow-to)))
+    (if (or (not wide)
+           to-address)
+       (progn
+         (setq follow-to (list (cons 'To (or to-address reply-to from))))
+         (when (and wide mct)
+           (push (cons 'Cc mct) follow-to)))
+      (let (ccalist)
+       (save-excursion
+         (message-set-work-buffer)
+         (unless never-mct
+           (insert (or reply-to from "")))
+         (insert (if to (concat (if (bolp) "" ", ") to "") ""))
+         (insert (if mct (concat (if (bolp) "" ", ") mct) ""))
+         (insert (if cc (concat (if (bolp) "" ", ") cc) ""))
+         (goto-char (point-min))
+         (while (re-search-forward "[ \t]+" nil t)
+           (replace-match " " t t))
+         ;; Remove addresses that match `rmail-dont-reply-to-names'.
+         (let ((rmail-dont-reply-to-names message-dont-reply-to-names))
+           (insert (prog1 (rmail-dont-reply-to (buffer-string))
+                     (erase-buffer))))
+         (goto-char (point-min))
+         ;; Perhaps "Mail-Copies-To: never" removed the only address?
+         (when (eobp)
+           (insert (or reply-to from "")))
+         (setq ccalist
+               (mapcar
+                (lambda (addr)
+                  (cons (mail-strip-quoted-names addr) addr))
+                (message-tokenize-header (buffer-string))))
+         (let ((s ccalist))
+           (while s
+             (setq ccalist (delq (assoc (car (pop s)) s) ccalist)))))
+       (setq follow-to (list (cons 'To (cdr (pop ccalist)))))
+       (when ccalist
+         (let ((ccs (cons 'Cc (mapconcat
+                               (lambda (addr) (cdr addr)) ccalist ", "))))
+           (when (string-match "^ +" (cdr ccs))
+             (setcdr ccs (substring (cdr ccs) (match-end 0))))
+           (push ccs follow-to)))))
     follow-to))