2000-12-20 04:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* message.el (message-make-forward-subject): Don't widen. Decode.
	(message-forward): Don't decode subject.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 414b3aa..2fe61b0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-20 04:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-make-forward-subject): Don't widen. Decode.
+       (message-forward): Don't decode subject.
+
 2000-12-20  Christoph Conrad <C.Conrad@cli.de>
 
        * qp.el (quoted-printable-encode-region): Upcase QP.

diff --git a/lisp/message.el b/lisp/message.el
index abb9bdf..36c5f45 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4208,13 +4208,19 @@ the message."
   "Return a Subject header suitable for the message in the current buffer."
   (save-excursion
     (save-restriction
-      (current-buffer)
-      (message-narrow-to-head)
+      (narrow-to-region
+       (goto-char (point-min))
+       (if (search-forward "\n\n" nil 1)
+          (1- (point))
+        (point-max)))
       (let ((funcs message-make-forward-subject-function)
-           (subject (if message-wash-forwarded-subjects
-                        (message-wash-subject
-                         (or (message-fetch-field "Subject") ""))
-                      (or (message-fetch-field "Subject") ""))))
+           (subject (message-fetch-field "Subject")))
+       (setq subject
+             (if subject
+                 (mail-decode-encoded-word-string subject)
+               ""))
+       (if message-wash-forwarded-subjects
+           (setq subject (message-wash-subject subject)))
        ;; Make sure funcs is a list.
        (and funcs
             (not (listp funcs))
@@ -4234,8 +4240,7 @@ Optional NEWS will use news to forward instead of mail.
 Optional DIGEST will use digest to forward."
   (interactive "P")
   (let* ((cur (current-buffer))
-        (subject (mail-decode-encoded-word-string
-                  (message-make-forward-subject)))
+        (subject (message-make-forward-subject))
         art-beg)
     (if news
        (message-news nil subject)