From: morioka <morioka>
Date: Tue, 30 Jun 1998 14:42:41 +0000 (+0000)
Subject: (eword-decode-encoded-text): Use `decode-mime-charset-string'.
X-Git-Tag: flim-1_8_0~15
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=0ef20c771605d0055ba5bbd17e6590f1eb16f7f2;p=elisp%2Fflim.git

(eword-decode-encoded-text): Use `decode-mime-charset-string'.
---

diff --git a/eword-decode.el b/eword-decode.el
index f0e74e5..600a027 100644
--- a/eword-decode.el
+++ b/eword-decode.el
@@ -333,21 +333,18 @@ as a version of Net$cape)."
                  (error "Invalid encoding %s" encoding)
                  )))
               )
-	  (if dest
-	      (progn
-		(setq dest (decode-coding-string dest cs))
-		(if must-unfold
-		    (mapconcat (function
-				(lambda (chr)
-				  (cond
-                                   ((eq chr ?\n) "")
-                                   ((eq chr ?\t) " ")
-                                   (t (char-to-string chr)))
-				  ))
-			       (std11-unfold-string dest)
-			       "")
-		  dest)
-		))))))
+	  (when dest
+	    (setq dest (decode-mime-charset-string dest charset))
+	    (if must-unfold
+		(mapconcat (function
+			    (lambda (chr)
+			      (cond ((eq chr ?\n) "")
+				    ((eq chr ?\t) " ")
+				    (t (char-to-string chr)))
+			      ))
+			   (std11-unfold-string dest)
+			   "")
+	      dest))))))
 
 
 ;;; @ lexical analyze