From d69552e1a6b211e7d91b65ac990187967b741a05 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Thu, 15 Apr 2004 12:39:39 +0000
Subject: [PATCH] Synch to flim-1_14 200404151040.

---
 ChangeLog       |    6 ++++++
 eword-decode.el |   18 ++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 685f1a5..ec0420b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-15  MORIOKA Tomohiko  <tomo@m17n.org>
+
+	* eword-decode.el (eword-decode-encoded-text): Fix bug when
+	`must-unfold' is specified; eliminate CR too when `must-unfold' is
+	specified.
+
 2004-04-13  Kenichi Okada  <okada@opaopa.org>
 
 	* mel-u.el (mime-write-decoded-region): Use make-temp-file.
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))))
-- 
1.7.10.4