From: yamaoka <yamaoka>
Date: Wed, 21 Oct 1998 08:08:05 +0000 (+0000)
Subject: Sync up with the latest semi-1_10.
X-Git-Tag: wemi-1_10_1~8
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8158f79f55cab1ef1eeabad3c758b52d167ddbaf;p=elisp%2Fsemi.git

Sync up with the latest semi-1_10.
---

diff --git a/ChangeLog b/ChangeLog
index 46a092e..eeab6b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+1998-10-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* mime-view.el, SEMI-ELS: Move function `mime-display-text/plain',
+	`mime-display-text/enriched' and `mime-display-text/richtext' from
+	mime-text to mime-view.el; abolish mime-text.el.
+
+	* mime-play.el: Don't Require `mime-text' when compiling.
+
+	* mime-w3.el: Require `mime' instead of `mime-text'.
+
+1998-10-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* semi-setup.el (mime-setup-enable-inline-image): Use `(featurep
+	'xemacs)' instead of `running-xemacs'.
+
 1998-10-20  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 	* README.en (Required environment): Modify to require APEL 9.5 and
diff --git a/SEMI-ELS b/SEMI-ELS
index ff195ea..6ffa7fc 100644
--- a/SEMI-ELS
+++ b/SEMI-ELS
@@ -6,7 +6,7 @@
 
 (setq semi-modules-to-compile
       '(signature
-	semi-def mime-view mime-text mime-play mime-partial mime-edit
+	semi-def mime-view mime-play mime-partial mime-edit
 	semi-setup mail-mime-setup))
 
 (setq semi-modules-not-to-compile nil)
diff --git a/mime-play.el b/mime-play.el
index 11fc355..4772f9a 100644
--- a/mime-play.el
+++ b/mime-play.el
@@ -31,7 +31,6 @@
 (require 'filename)
 
 (eval-when-compile
-  (require 'mime-text)
   (condition-case nil
       (require 'bbdb)
     (error (defvar bbdb-buffer-name nil)))
diff --git a/mime-view.el b/mime-view.el
index 9b1c31e..ea5c815 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -421,9 +421,38 @@ Each elements are regexp of field-name.")
 ;;; @@@ entity presentation
 ;;;
 
-(autoload 'mime-display-text/plain "mime-text")
-(autoload 'mime-display-text/enriched "mime-text")
-(autoload 'mime-display-text/richtext "mime-text")
+(defun mime-display-text/plain (entity situation)
+  (save-restriction
+    (narrow-to-region (point-max)(point-max))
+    (mime-insert-text-content entity)
+    (run-hooks 'mime-text-decode-hook)
+    (goto-char (point-max))
+    (if (not (eq (char-after (1- (point))) ?\n))
+	(insert "\n")
+      )
+    (mime-add-url-buttons)
+    (run-hooks 'mime-display-text/plain-hook)
+    ))
+
+(defun mime-display-text/richtext (entity situation)
+  (save-restriction
+    (narrow-to-region (point-max)(point-max))
+    (mime-insert-text-content entity)
+    (run-hooks 'mime-text-decode-hook)
+    (let ((beg (point-min)))
+      (remove-text-properties beg (point-max) '(face nil))
+      (richtext-decode beg (point-max))
+      )))
+
+(defun mime-display-text/enriched (entity situation)
+  (save-restriction
+    (narrow-to-region (point-max)(point-max))
+    (mime-insert-text-content entity)
+    (run-hooks 'mime-text-decode-hook)
+    (let ((beg (point-min)))
+      (remove-text-properties beg (point-max) '(face nil))
+      (enriched-decode beg (point-max))
+      )))
 
 (defvar mime-view-announcement-for-message/partial
   (if (and (>= emacs-major-version 19) window-system)
diff --git a/mime-w3.el b/mime-w3.el
index d9c1948..a3d3349 100644
--- a/mime-w3.el
+++ b/mime-w3.el
@@ -25,7 +25,7 @@
 ;;; Code:
 
 (require 'w3)
-(require 'mime-text)
+(require 'mime)
 
 (defmacro mime-put-keymap-region (start end keymap)
   `(put-text-property ,start ,end
diff --git a/semi-setup.el b/semi-setup.el
index e7decc8..9137f02 100644
--- a/semi-setup.el
+++ b/semi-setup.el
@@ -44,7 +44,7 @@ it is used as hook to set."
 ;; for image/* and X-Face
 (defvar mime-setup-enable-inline-image
   (and window-system
-       (or running-xemacs
+       (or (featurep 'xemacs)
 	   (and (featurep 'mule)(module-installed-p 'bitmap))
 	   ))
   "*If it is non-nil, semi-setup sets up to use mime-image.")