From: yamaoka <yamaoka>
Date: Fri, 12 Feb 1999 00:33:26 +0000 (+0000)
Subject: * (message-make-forward-subject): Use "(none)" if the original article has no
X-Git-Tag: gnus-6_10_7~6
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=636a171455e871ba63ad0a64cfd09b63b04f0bb0;p=elisp%2Fgnus.git-

* (message-make-forward-subject): Use "(none)" if the original article has no
subject.
---

diff --git a/lisp/message.el b/lisp/message.el
index bc45b2d..f1098ff 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4079,14 +4079,14 @@ the message."
       (current-buffer)
       (message-narrow-to-head)
       (let ((funcs message-make-forward-subject-function)
-	    (subject (if message-wash-forwarded-subjects
-			 (message-wash-subject
-			  (or (nnheader-decode-subject
-			       (message-fetch-field "Subject"))
-			      ""))
-		       (or (nnheader-decode-subject
-			    (message-fetch-field "Subject"))
-			   ""))))
+	    (subject (message-fetch-field "Subject")))
+	(setq subject
+	      (if subject
+		  (if message-wash-forwarded-subjects
+		      (message-wash-subject
+		       (nnheader-decode-subject subject))
+		    (nnheader-decode-subject subject))
+		"(none)"))
 	;; Make sure funcs is a list.
 	(and funcs
 	     (not (listp funcs))