From c1feceddf4fe370127aced0e80081dda10794d22 Mon Sep 17 00:00:00 2001 From: shuhei-k Date: Wed, 24 Jun 1998 12:27:00 +0000 Subject: [PATCH] Moved URL stuff to semi-def.el. --- mime-text.el | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/mime-text.el b/mime-text.el index 04e23b8..60e9625 100644 --- a/mime-text.el +++ b/mime-text.el @@ -52,42 +52,6 @@ SITUATION. It must be symbol." ) -;;; @ 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 +63,7 @@ SITUATION. It must be symbol." (if (not (eq (char-after (1- (point))) ?\n)) (insert "\n") ) - (mime-text-add-url-buttons) + (mime-browse-add-url-buttons) (run-hooks 'mime-display-text/plain-hook) )) -- 1.7.10.4