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

diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 9cb91eb6c2e7cb85302c54a184fb845457adf54a..47b497255639ef6cec4f1942630bb921c981764a 100644 (file)
--- 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_=?#$@~`%&*+|\\/.,]*"