update.

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

diff --git a/mime-text.el b/mime-text.el
index 4eccab3..6a22fbd 100644 (file)
--- a/mime-text.el
+++ b/mime-text.el
@@ -64,7 +64,7 @@ See also variable `mime-charset-coding-system-alist'."
       (mime-text-decode-buffer charset)
       ))
 
-(defun mime-decode-text-body (situation)
+(defun mime-text-decode-body (situation)
   "Decode current buffer as text body.
 It decodes MIME-encoding then code-converts as MIME-charset.
 MIME-encoding is value of field 'encoding of SITUATION.  It must be
@@ -112,40 +112,47 @@ local variable `mime-text-decoder' and variable
       )
     ))
 
+(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 (situation)
-  (mime-decode-text-body situation)
+(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 (situation)
+(defun mime-preview-filter-for-text/richtext (situation)
   (let ((beg (point-min)))
     (remove-text-properties beg (point-max) '(face nil))
-    (mime-decode-text-body situation)
+    (mime-text-decode-body situation)
     (richtext-decode beg (point-max))
     ))
 
-(defun mime-view-filter-for-text/enriched (situation)
+(defun mime-preview-filter-for-text/enriched (situation)
   (let ((beg (point-min)))
     (remove-text-properties beg (point-max) '(face nil))
-    (mime-decode-text-body situation)
+    (mime-text-decode-body situation)
     (enriched-decode beg (point-max))
     ))