update.

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

diff --git a/mime-view.el b/mime-view.el
index 80fb95e..637b148 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -406,40 +406,38 @@ Each elements are regexp of field-name.")
                           (body . visible)))
 
 (ctree-set-calist-strictly
- 'mime-preview-condition '((body . visible)
-                          (body-presentation-method . with-filter)
-                          (body-filter . mime-preview-filter-for-text/plain)))
+ 'mime-preview-condition
+ '((body . visible)
+   (body-presentation-method . mime-preview-text/plain)))
 
 (ctree-set-calist-strictly
- 'mime-preview-condition '((type . nil)
-                          (body . visible)
-                          (body-presentation-method . with-filter)
-                          (body-filter . mime-preview-filter-for-text/plain)))
+ 'mime-preview-condition
+ '((type . nil)
+   (body . visible)
+   (body-presentation-method . mime-preview-text/plain)))
 
 (ctree-set-calist-strictly
- 'mime-preview-condition '((type . text)(subtype . enriched)
-                          (body . visible)
-                          (body-presentation-method . with-filter)
-                          (body-filter
-                           . mime-preview-filter-for-text/enriched)))
+ 'mime-preview-condition
+ '((type . text)(subtype . enriched)
+   (body . visible)
+   (body-presentation-method . mime-preview-text/enriched)))
 
 (ctree-set-calist-strictly
- 'mime-preview-condition '((type . text)(subtype . richtext)
-                          (body . visible)
-                          (body-presentation-method . with-filter)
-                          (body-filter
-                           . mime-preview-filter-for-text/richtext)))
+ 'mime-preview-condition
+ '((type . text)(subtype . richtext)
+   (body . visible)
+   (body-presentation-method . mime-preview-text/richtext)))
 
 (ctree-set-calist-strictly
- 'mime-preview-condition '((type . text)(subtype . t)
-                          (body . visible)
-                          (body-presentation-method . with-filter)
-                          (body-filter . mime-preview-filter-for-text/plain)))
+ 'mime-preview-condition
+ '((type . text)(subtype . t)
+   (body . visible)
+   (body-presentation-method . mime-preview-text/plain)))
 
 (ctree-set-calist-strictly
  'mime-preview-condition '((type . message)(subtype . partial)
                           (body-presentation-method
-                           . mime-view-insert-message/partial-button)))
+                           . mime-preview-message/partial-button)))
 
 (ctree-set-calist-strictly
  'mime-preview-condition '((type . message)(subtype . rfc822)
@@ -457,24 +455,21 @@ Each elements are regexp of field-name.")
 ;;; @@@ entity filter
 ;;;
 
-(autoload 'mime-preview-filter-for-text/plain "mime-text")
-(autoload 'mime-preview-filter-for-text/enriched "mime-text")
-(autoload 'mime-preview-filter-for-text/richtext "mime-text")
+(autoload 'mime-preview-text/plain "mime-text")
+(autoload 'mime-preview-text/enriched "mime-text")
+(autoload 'mime-preview-text/richtext "mime-text")
 
-(defvar mime-text-decoder-alist
-  '((mime-show-message-mode    . mime-text-decode-buffer)
-    (mime-temp-message-mode    . mime-text-decode-buffer)
-    (t                         . mime-text-decode-buffer-maybe)
+(defvar mime-raw-representation-type-alist
+  '((mime-show-message-mode     . binary)
+    (mime-temp-message-mode     . binary)
+    (t                          . cooked)
     )
-  "Alist of major-mode vs. mime-text-decoder.
-Each element looks like (SYMBOL . FUNCTION).  SYMBOL is major-mode or
-t.  t means default.
-
-Specification of FUNCTION is described in DOC-string of variable
-`mime-text-decoder'.
-
-This value is overridden by buffer local variable `mime-text-decoder'
-if it is not nil.")
+  "Alist of major-mode vs. representation-type of mime-raw-buffer.
+Each element looks like (SYMBOL . REPRESENTATION-TYPE).  SYMBOL is
+major-mode or t.  t means default.  REPRESENTATION-TYPE must be
+`binary' or `cooked'.
+This value is overridden by buffer local variable
+`mime-raw-representation-type' if it is not nil.")
 
 
 (defvar mime-view-announcement-for-message/partial
@@ -487,7 +482,7 @@ This is message/partial style split message.
 Please press `v' key in this buffer."
     ))
 
-(defun mime-view-insert-message/partial-button (&optional situation)
+(defun mime-preview-message/partial-button (&optional entity situation)
   (save-restriction
     (goto-char (point-max))
     (if (not (search-backward "\n\n" nil t))
@@ -694,10 +689,6 @@ The compressed face will be piped to this command.")
 
 (defvar mime-view-uuencode-encoding-name-list '("x-uue" "x-uuencode"))
 
-(defvar mime-raw-buffer-coding-system-alist
-  `((t . ,(mime-charset-to-coding-system default-mime-charset)))
-  "Alist of major-mode vs. corresponding coding-system of `mime-raw-buffer'.")
-
 
 ;;; @ buffer setup
 ;;;
@@ -802,7 +793,7 @@ The compressed face will be piped to this command.")
                 (funcall body-filter situation)
                 )))
            ((functionp body-presentation-method)
-            (funcall body-presentation-method situation)
+            (funcall body-presentation-method entity situation)
             ))
       (or header-is-visible
          body-presentation-method