From: keiichi <keiichi>
Date: Mon, 16 Nov 1998 02:34:57 +0000 (+0000)
Subject: Sync up with `semi-vcard'.
X-Git-Tag: keiichi-1_11-199811302358~1
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=7a31f7027586be9214f47e9851a0cede37faf91c;p=elisp%2Fsemi.git

Sync up with `semi-vcard'.
---

diff --git a/mime-view.el b/mime-view.el
index 837942d..abab840 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -440,6 +440,7 @@ Each elements are regexp of field-name.")
     (run-hooks 'mime-display-text/plain-hook)
     ))
 
+<<<<<<< mime-view.el
 (defun mime-display-text/richtext (entity situation)
   (save-restriction
     (narrow-to-region (point-max)(point-max))
@@ -463,8 +464,7 @@ Each elements are regexp of field-name.")
 (defun mime-display-text/x-vcard (entity situation)
   (save-restriction
     (narrow-to-region (point-max)(point-max))
-    (mime-insert-text-content entity)
-    (run-hooks 'mime-text-decode-hook)
+    (insert (string-as-multibyte (mime-entity-content entity)))
     (goto-char (point-min))
     (while (re-search-forward
             "\\(;\\(encoding=\\)?quoted-printable:\\)\\(\\(=[0-9A-F][0-9A-F]\\|=\r\n\\|[^\r\n]\\)*\\)"