From f766c2ec0f3945c50b14e1e3661c139af8b9ced8 Mon Sep 17 00:00:00 2001 From: tomo Date: Thu, 15 Apr 2004 10:39:35 +0000 Subject: [PATCH] (eword-decode-encoded-text): Fix bug when `must-unfold' is specified; eliminate CR too when `must-unfold' is specified. --- eword-decode.el | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) 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 ;; MORIOKA Tomohiko @@ -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