From: tomo <tomo>
Date: Thu, 15 Apr 2004 10:39:35 +0000 (+0000)
Subject: (eword-decode-encoded-text): Fix bug when `must-unfold' is specified;
X-Git-Tag: flim-1_14_7~15
X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Fflim.git;a=commitdiff_plain;h=f766c2ec0f3945c50b14e1e3661c139af8b9ced8

(eword-decode-encoded-text): Fix bug when `must-unfold' is specified;
eliminate CR too when `must-unfold' is specified.
---

diff --git a/eword-decode.el b/eword-decode.el
index 0b2d19a..311e080 100644
--- a/eword-decode.el
+++ b/eword-decode.el
@@ -1,6 +1,6 @@
 ;;; eword-decode.el --- RFC 2047 based encoded-word decoder for GNU Emacs
 
-;; Copyright (C) 1995,96,97,98,99,2000,01,03 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98,99,2000,01,03,04 Free Software Foundation, Inc.
 
 ;; Author: ENAMI Tsugutomo <enami@sys.ptg.sony.co.jp>
 ;;         MORIOKA Tomohiko <tomo@m17n.org>
@@ -578,13 +578,15 @@ as a version of Net$cape)."
       (when dest
 	(setq dest (decode-mime-charset-string dest charset))
 	(when must-unfold
-	  (mapconcat
-	   (function
-	    (lambda (chr)
-	      (cond ((eq chr ?\n) "")
-		    ((eq chr ?\t) " ")
-		    (t (char-to-string chr)))))
-	   (std11-unfold-string dest) ""))
+	  (setq dest
+		(mapconcat
+		 (function
+		  (lambda (chr)
+		    (cond ((eq chr ?\n) "")
+			  ((eq chr ?\r) "")
+			  ((eq chr ?\t) " ")
+			  (t (char-to-string chr)))))
+		 (std11-unfold-string dest) "")))
 	(when language
 	  (put-text-property 0 (length dest) 'mime-language language dest))
 	dest))))