* message.el (message-followup): Handle "Mail-Copies-To:" correctly.

 (message-get-reply-headers): Ditto.

diff --git a/ChangeLog b/ChangeLog
index 22d0512..7a1accb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-15  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * lisp/message.el (message-followup): Handle "Mail-Copies-To:"
+       correctly.
+       (message-get-reply-headers): Ditto.
+
 2001-01-15  Keiichi Suzuki  <keiichi@nanap.org>
 
        * lisp/gnus-bbdb.el (gnus-bbdb/update-record): Save excursion

diff --git a/lisp/message.el b/lisp/message.el
index 8236075..c9c27a4 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4509,30 +4509,30 @@ OTHER-HEADERS is an alist of header/value pairs."
     (when mct
       (cond
        ((and (or (equal (downcase mct) "never")
-                (equal (downcase mct) "nobody"))
-            (or (not (eq message-use-mail-copies-to 'ask))
-                (message-y-or-n-p
-                 (concat "Obey Mail-Copies-To: never? ") t "\
+                (equal (downcase mct) "nobody")))
+       (when (or (not (eq message-use-mail-copies-to 'ask))
+                 (message-y-or-n-p
+                  (concat "Obey Mail-Copies-To: never? ") t "\
 You should normally obey the Mail-Copies-To: header.
 
-       `Mail-Copies-To: never'
-directs you not to send your response to the author.")))
-       (setq never-mct t)
+       `Mail-Copies-To: " mct "'
+directs you not to send your response to the author."))
+         (setq never-mct t))
        (setq mct nil))
        ((and (or (equal (downcase mct) "always")
-                (equal (downcase mct) "poster"))
-            (or (not (eq message-use-mail-copies-to 'ask))
-                (message-y-or-n-p
-                 (concat "Obey Mail-Copies-To: always? ") t "\
+                (equal (downcase mct) "poster")))
+       (if (or (not (eq message-use-mail-copies-to 'ask))
+               (message-y-or-n-p
+                (concat "Obey Mail-Copies-To: always? ") t "\
 You should normally obey the Mail-Copies-To: header.
 
-       `Mail-Copies-To: always'
-sends a copy of your response to the author.")))
-       (setq mct (or mrt reply-to from)))
+       `Mail-Copies-To: " mct "'
+sends a copy of your response to the author."))
+           (setq mct (or mrt reply-to from))
+         (setq mct nil)))
        ((and (eq message-use-mail-copies-to 'ask)
-            (not
-             (message-y-or-n-p
-              (concat "Obey Mail-Copies-To: " mct " ? ") t "\
+            (not (message-y-or-n-p
+                  (concat "Obey Mail-Copies-To: " mct " ? ") t "\
 You should normally obey the Mail-Copies-To: header.
 
        `Mail-Copies-To: " mct "'
@@ -4570,18 +4570,18 @@ that further discussion should take place only in "
       (let (ccalist)
        (save-excursion
          (message-set-work-buffer)
-          (if (and mft
-                   message-use-followup-to
-                   (or (not (eq message-use-followup-to 'ask))
-                       (message-y-or-n-p "Obey Mail-Followup-To? " t "\
+         (if (and mft
+                  message-use-followup-to
+                  (or (not (eq message-use-followup-to 'ask))
+                      (message-y-or-n-p "Obey Mail-Followup-To? " t "\
 You should normally obey the Mail-Followup-To: header.  In this
 article, it has the value of
 
 " mft "
 
 which directs your response to " (if (string-match "," mft)
-                              "the specified addresses"
-                            "that address only") ".
+                                    "the specified addresses"
+                                  "that address only") ".
 
 If a message is posted to several mailing lists, Mail-Followup-To is
 often used to direct the following discussion to one list only,
@@ -4593,7 +4593,7 @@ responses here are directed to other addresses.")))
              (insert mft)
            (unless never-mct
              (insert (or mrt reply-to from "")))
-           (insert (if to (concat (if (bolp) "" ", ") to "") ""))
+           (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))
@@ -4744,25 +4744,19 @@ If TO-NEWSGROUPS, use that as the new Newsgroups line."
     (when mct
       (cond
        ((and (or (equal (downcase mct) "never")
-                (equal (downcase mct) "nobody"))
-            (or (not (eq message-use-mail-copies-to 'ask))
-                (message-y-or-n-p
-                 (concat "Obey Mail-Copies-To: never? ") t "\
-You should normally obey the Mail-Copies-To: header.
-
-       `Mail-Copies-To: never'
-directs you not to send your response to the author.")))
+                (equal (downcase mct) "nobody")))
        (setq mct nil))
        ((and (or (equal (downcase mct) "always")
-                (equal (downcase mct) "poster"))
-            (or (not (eq message-use-mail-copies-to 'ask))
-                (message-y-or-n-p
-                 (concat "Obey Mail-Copies-To: always? ") t "\
+                (equal (downcase mct) "poster")))
+       (if (or (not (eq message-use-mail-copies-to 'ask))
+               (message-y-or-n-p
+                (concat "Obey Mail-Copies-To: always? ") t "\
 You should normally obey the Mail-Copies-To: header.
 
-       `Mail-Copies-To: always'
-sends a copy of your response to the author.")))
-       (setq mct (or mrt reply-to from)))
+       `Mail-Copies-To: " mct "'
+sends a copy of your response to the author."))
+           (setq mct (or mrt reply-to from))
+         (setq mct nil)))
        ((and (eq message-use-mail-copies-to 'ask)
             (not
              (message-y-or-n-p
@@ -4773,8 +4767,7 @@ You should normally obey the Mail-Copies-To: header.
 sends a copy of your response to " (if (string-match "," mct)
                                       "the specified addresses"
                                     "that address") ".")))
-       (setq mct nil))
-       ))
+       (setq mct nil))))
 
     (unless follow-to
       (cond