(mime-text-insert-decoded-body): Delete unnecessary

[elisp/semi.git] / mime-text.el

diff --git a/mime-text.el b/mime-text.el
index c60b097..bcfb209 100644 (file)
--- a/mime-text.el
+++ b/mime-text.el
@@ -27,20 +27,6 @@
 (require 'mime-view)
 
 
-;;; @ buffer local variables in raw-buffer
-;;;
-
-(defvar mime-raw-representation-type nil
-  "Representation-type of mime-raw-buffer.
-It must be nil, `binary' or `cooked'.
-If it is nil, `mime-raw-representation-type-alist' is used as default
-value.
-Notice that this variable is usually used as buffer local variable in
-raw-buffer.")
-
-(make-variable-buffer-local 'mime-raw-representation-type)
-
-
 ;;; @ code conversion
 ;;;
 
@@ -50,27 +36,27 @@ It decodes MIME-encoding then code-converts as MIME-charset.
 MIME-encoding is value of field 'encoding of SITUATION.  It must be
 'nil or string.  MIME-charset is value of field \"charset\" of
 SITUATION.  It must be symbol."
-  (let ((presentation-type
-        (save-excursion
-          (set-buffer mime-raw-buffer)
-          (or mime-raw-representation-type
-              (cdr (or (assq major-mode mime-raw-representation-type-alist)
-                       (assq t mime-raw-representation-type-alist)))
-              ))))
-    (save-restriction
-      (insert-buffer-substring mime-raw-buffer
-                              (mime-entity-body-start entity)
-                              (mime-entity-body-end entity))
-      (let ((encoding (mime-entity-encoding entity)))
-       (mime-decode-region (point-min) (point-max) encoding)
-       (if (or (eq presentation-type 'binary)
-               (not (member encoding '(nil "7bit" "8bit" "binary"))))
-           (decode-mime-charset-region (point-min)(point-max)
-                                       (or (mime-content-type-parameter
-                                            (mime-entity-content-type entity)
-                                            "charset")
-                                           default-mime-charset))
-         ))))
+  (let* ((buffer (mime-entity-buffer entity))
+        (presentation-type
+         (save-excursion
+           (set-buffer buffer)
+           (or mime-raw-representation-type
+               (cdr (or (assq major-mode mime-raw-representation-type-alist)
+                        (assq t mime-raw-representation-type-alist)))
+               ))))
+    (insert-buffer-substring buffer
+                            (mime-entity-body-start entity)
+                            (mime-entity-body-end entity))
+    (let ((encoding (mime-entity-encoding entity)))
+      (mime-decode-region (point-min) (point-max) encoding)
+      (if (or (eq presentation-type 'binary)
+             (not (member encoding '(nil "7bit" "8bit" "binary"))))
+         (decode-mime-charset-region (point-min)(point-max)
+                                     (or (mime-content-type-parameter
+                                          (mime-entity-content-type entity)
+                                          "charset")
+                                         default-mime-charset))
+       )))
   (run-hooks 'mime-text-decode-hook)
   )
 
@@ -114,7 +100,7 @@ SITUATION.  It must be symbol."
 ;;; @ content filters for mime-text
 ;;;
 
-(defun mime-preview-text/plain (entity situation)
+(defun mime-display-text/plain (entity situation)
   (save-restriction
     (narrow-to-region (point-max)(point-max))
     (mime-text-insert-decoded-body entity)
@@ -123,10 +109,10 @@ SITUATION.  It must be symbol."
        (insert "\n")
       )
     (mime-text-add-url-buttons)
-    (run-hooks 'mime-preview-text/plain-hook)
+    (run-hooks 'mime-display-text/plain-hook)
     ))
 
-(defun mime-preview-text/richtext (entity situation)
+(defun mime-display-text/richtext (entity situation)
   (save-restriction
     (narrow-to-region (point-max)(point-max))
     (mime-text-insert-decoded-body entity)
@@ -135,7 +121,7 @@ SITUATION.  It must be symbol."
       (richtext-decode beg (point-max))
       )))
 
-(defun mime-preview-text/enriched (entity situation)
+(defun mime-display-text/enriched (entity situation)
   (save-restriction
     (narrow-to-region (point-max)(point-max))
     (mime-text-insert-decoded-body entity)