Modify for SEMI 1.2.4 (Arimagawa).

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

diff --git a/mime-text.el b/mime-text.el
index 63e859a..6a22fbd 100644 (file)
--- a/mime-text.el
+++ b/mime-text.el
@@ -64,28 +64,33 @@ See also variable `mime-charset-coding-system-alist'."
       (mime-text-decode-buffer charset)
       ))
 
-(defun mime-decode-text-body (charset encoding)
+(defun mime-text-decode-body (situation)
   "Decode current buffer as text body.
-It decodes MIME-encoding as ENCODING then code-converts as MIME
-CHARSET.  CHARSET is SYMBOL and ENCODING is nil or STRING.
-
-It calls text decoder for MIME charset specified by buffer local
-variable `mime-text-decoder' and variable `mime-text-decoder-alist'."
-  (mime-decode-region (point-min) (point-max) encoding)
-  (goto-char (point-min))
-  (while (search-forward "\r\n" nil t)
-    (replace-match "\n")
-    )
-  (let ((text-decoder
-        (save-excursion
-          (set-buffer mime-raw-buffer)
-          (or mime-text-decoder
-              (cdr (or (assq major-mode mime-text-decoder-alist)
-                       (assq t mime-text-decoder-alist)))
-              ))))
-    (and (functionp text-decoder)
-        (funcall text-decoder charset encoding)
-        )))
+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.
+This function calls text-decoder for MIME-charset specified by buffer
+local variable `mime-text-decoder' and variable
+`mime-text-decoder-alist'."
+  (let ((encoding (cdr (assq 'encoding situation))))
+    (mime-decode-region (point-min) (point-max) encoding)
+    (goto-char (point-min))
+    (while (search-forward "\r\n" nil t)
+      (replace-match "\n")
+      )
+    (let ((text-decoder
+          (save-excursion
+            (set-buffer mime-raw-buffer)
+            (or mime-text-decoder
+                (cdr (or (assq major-mode mime-text-decoder-alist)
+                         (assq t mime-text-decoder-alist)))
+                ))))
+      (and (functionp text-decoder)
+          (funcall text-decoder (cdr (assoc "charset" situation)) encoding)
+          ))
+    (run-hooks 'mime-text-decode-hook)
+    ))
 
 
 ;;; @ for URL
@@ -107,44 +112,47 @@ variable `mime-text-decoder' and variable `mime-text-decoder-alist'."
       )
     ))
 
+(defsubst mime-text-add-url-buttons ()
+  "Add URL-buttons for text body."
+  (goto-char (point-min))
+  (while (re-search-forward mime-text-url-regexp nil t)
+    (let ((beg (match-beginning 0))
+         (end (match-end 0)))
+      (mime-add-button beg end #'mime-text-browse-url
+                      (list (buffer-substring beg end)))
+      )))
+
+(defun mime-text-add-url-buttons-maybe ()
+  "Add URL-buttons if 'browse-url-browser-function is not 'nil."
+  (if browse-url-browser-function
+      (mime-text-add-url-buttons)
+    ))
+
 
 ;;; @ content filters for mime-text
 ;;;
 
-(defun mime-view-filter-for-text/plain (ctype params encoding)
-  (mime-decode-text-body (cdr (assoc "charset" params)) encoding)
+(defun mime-preview-filter-for-text/plain (situation)
+  (mime-text-decode-body situation)
   (goto-char (point-max))
   (if (not (eq (char-after (1- (point))) ?\n))
       (insert "\n")
     )
-  (if browse-url-browser-function
-      (progn
-       (goto-char (point-min))
-       (while (re-search-forward mime-text-url-regexp nil t)
-         (let ((beg (match-beginning 0))
-               (end (match-end 0)))
-           (mime-add-button beg end
-                            (function mime-text-browse-url)
-                            (list (buffer-substring beg end))))
-         )))
-  (run-hooks 'mime-view-plain-text-preview-hook)
+  (mime-text-add-url-buttons)
+  (run-hooks 'mime-preview-text/plain-hook)
   )
 
-(defun mime-view-filter-for-text/richtext (ctype params encoding)
-  (let* ((charset (cdr (assoc "charset" params)))
-        (beg (point-min))
-        )
+(defun mime-preview-filter-for-text/richtext (situation)
+  (let ((beg (point-min)))
     (remove-text-properties beg (point-max) '(face nil))
-    (mime-decode-text-body charset encoding)
+    (mime-text-decode-body situation)
     (richtext-decode beg (point-max))
     ))
 
-(defun mime-view-filter-for-text/enriched (ctype params encoding)
-  (let* ((charset (cdr (assoc "charset" params)))
-        (beg (point-min))
-        )
+(defun mime-preview-filter-for-text/enriched (situation)
+  (let ((beg (point-min)))
     (remove-text-properties beg (point-max) '(face nil))
-    (mime-decode-text-body charset encoding)
+    (mime-text-decode-body situation)
     (enriched-decode beg (point-max))
     ))