Synch to flim-1_14 200404151040.

diff --git a/ChangeLog b/ChangeLog
index 685f1a5..ec0420b 100644 (file)
--- 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 (file)
--- 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))))