X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-text.el;h=025172df3e7678cf26193d419aada65d87b64ce4;hb=92dd6d4d1179ba5ddb7b9693b4491b940f0db911;hp=04e23b88d60555c1e4c91582bb9e01f69843a594;hpb=fd03e24ed943e197e4af82c284be8ad80a1ad2b3;p=elisp%2Fsemi.git

diff --git a/mime-text.el b/mime-text.el
index 04e23b8..025172d 100644
--- a/mime-text.el
+++ b/mime-text.el
@@ -46,48 +46,13 @@ SITUATION.  It must be symbol."
 				   (or (mime-content-type-parameter
 					(mime-entity-content-type entity)
 					"charset")
-				       default-mime-charset))
+				       default-mime-charset)
+				   'CRLF)
        )))
   (run-hooks 'mime-text-decode-hook)
   )
 
 
-;;; @ for URL
-;;;
-
-(require 'browse-url)
-
-(defvar mime-text-url-regexp
-  "\\(http\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\):\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?[-a-zA-Z0-9_=?#$@~`%&*+|\\/.,]*[-a-zA-Z0-9_=#$@~`%&*+|\\/]"
-  "*Regexp to match URL in text/plain body.")
-
-(defun mime-text-browse-url (&optional url)
-  (if (fboundp browse-url-browser-function)
-      (if url 
-        (funcall browse-url-browser-function url)
-      (call-interactively browse-url-browser-function))
-    (if (fboundp mime-button-mother-dispatcher)
-	(call-interactively mime-button-mother-dispatcher)
-      )
-    ))
-
-(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
 ;;;
 
@@ -99,7 +64,7 @@ SITUATION.  It must be symbol."
     (if (not (eq (char-after (1- (point))) ?\n))
 	(insert "\n")
       )
-    (mime-text-add-url-buttons)
+    (mime-add-url-buttons)
     (run-hooks 'mime-display-text/plain-hook)
     ))