From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 29 Oct 2002 18:12:33 +0000 (+0000)
Subject: (goto-address-url-regexp): Don't match `mailto'.
X-Git-Tag: ttn-vms-21-2-B4~12668
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=019f8c1e2e5f6addd40d508e2bfcef0dc8245307;p=emacs.git

(goto-address-url-regexp): Don't match `mailto'.
---

diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 9cb91eb6c2e..47b49725563 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -102,7 +102,13 @@ But only if `goto-address-highlight-p' is also non-nil."
   "[-a-zA-Z0-9._+]+@\\([-a-zA-z0-9_]+\\.\\)+[a-zA-Z0-9]+"
   "A regular expression probably matching an e-mail address.")
 
-(defvar goto-address-url-regexp thing-at-point-url-regexp
+(defvar goto-address-url-regexp
+  (concat "\\<\\("
+	  (mapconcat 'identity
+		     (delete "mailto:" (copy-sequence thing-at-point-uri-schemes))
+		     "\\|")
+	  "\\)"
+          thing-at-point-url-path-regexp)
   ;; (concat "\\b\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|"
   ;; 	  "telnet\\|wais\\):\\(//[-a-zA-Z0-9_.]+:"
   ;; 	  "[0-9]*\\)?[-a-zA-Z0-9_=?#$@~`%&*+|\\/.,]*"