2001-02-07 11:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* message.el (message-make-forward-subject): Argument decoded.
	(message-forward): Use it when digest.

	* gnus-uu.el (gnus-uu-grab-articles): Shoot down original article
	buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15dc95d..3cc908c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2001-02-07 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-make-forward-subject): Argument decoded.
+       (message-forward): Use it when digest.
+
+       * gnus-uu.el (gnus-uu-grab-articles): Shoot down original article
+       buffer.
+
 2001-02-07  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * message.el (message-generate-headers-first): Doc fix.

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 9138cc4..2ff4624 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -1,6 +1,6 @@
 ;;; gnus-uu.el --- extract (uu)encoded files in Gnus
-;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
+;;        2001 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Created: 2 Oct 1993
@@ -531,7 +531,7 @@ didn't work, and overwrite existing files.  Otherwise, ask each time."
              n nil))
     (gnus-setup-message 'forward
       (setq gnus-uu-digest-from-subject nil)
-      (setq gnus-uu-digest-buffer 
+      (setq gnus-uu-digest-buffer
            (gnus-get-buffer-create " *gnus-uu-forward*"))
       (gnus-uu-decode-save n file)
       (switch-to-buffer gnus-uu-digest-buffer)
@@ -901,7 +901,7 @@ When called interactively, prompt for REGEXP."
              ;; These two are necessary for XEmacs 19.12 fascism.
              (put-text-property (point-min) (point-max) 'invisible nil)
              (put-text-property (point-min) (point-max) 'intangible nil))
-           (when (and message-forward-as-mime 
+           (when (and message-forward-as-mime
                       message-forward-show-mml
                       gnus-uu-digest-buffer)
              (mm-enable-multibyte)
@@ -944,7 +944,7 @@ When called interactively, prompt for REGEXP."
                (insert sorthead)
                (goto-char (point-min))
                (when (re-search-forward "^Subject: \\(.*\\)$" nil t)
-                 (setq subj (buffer-substring (match-beginning 1) 
+                 (setq subj (buffer-substring (match-beginning 1)
                                               (match-end 1))))
                (goto-char (point-max))
                (insert body))
@@ -988,7 +988,7 @@ When called interactively, prompt for REGEXP."
                (with-current-buffer gnus-uu-digest-buffer
                  (goto-char (point-max))
                  (insert-buffer "*gnus-uu-body*"))
-             (let ((coding-system-for-write mm-text-coding-system) 
+             (let ((coding-system-for-write mm-text-coding-system)
                    (file-name-coding-system nnmail-pathname-coding-system))
                (write-region
                 (point-min) (point-max) gnus-uu-saved-article-name t)))))
@@ -1416,6 +1416,9 @@ When called interactively, prompt for REGEXP."
          (while article-series
            (gnus-summary-tick-article (pop article-series) t)))))
 
+    ;; The original article buffer is hosed, shoot it down.
+    (gnus-kill-buffer gnus-original-article-buffer)
+
     result-files))
 
 (defun gnus-uu-grab-view (file)
@@ -1593,7 +1596,7 @@ Gnus might fail to display all of it.")
              (unless
                  (unwind-protect
                      (with-current-buffer buffer
-                       (insert (substitute-command-keys 
+                       (insert (substitute-command-keys
                                 gnus-uu-unshar-warning))
                        (goto-char (point-min))
                        (display-buffer buffer)

diff --git a/lisp/message.el b/lisp/message.el
index 19195be..06d9e52 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4315,7 +4315,7 @@ The form is: Fwd: Subject, where Subject is the original subject of
 the message."
   (concat "Fwd: " subject))
 
-(defun message-make-forward-subject ()
+(defun message-make-forward-subject (&optional decoded)
   "Return a Subject header suitable for the message in the current buffer."
   (save-excursion
     (save-restriction
@@ -4324,7 +4324,9 @@ the message."
            (subject (message-fetch-field "Subject")))
        (setq subject
              (if subject
-                 (mail-decode-encoded-word-string subject)
+                 (if decoded 
+                     subject
+                   (mail-decode-encoded-word-string subject))
                ""))
        (if message-wash-forwarded-subjects
            (setq subject (message-wash-subject subject)))
@@ -4346,9 +4348,9 @@ the message."
 Optional NEWS will use news to forward instead of mail.
 Optional DIGEST will use digest to forward."
   (interactive "P")
-  (let* ((cur (current-buffer))
-        (subject (message-make-forward-subject))
-        art-beg)
+  (let ((cur (current-buffer))
+       (subject (message-make-forward-subject digest))
+       art-beg)
     (if news
        (message-news nil subject)
       (message-mail nil subject))