(goto-address-url-regexp): Remove `data:' URLs from goto-address-url-regexp.

2 files changed, 17 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 26a056ac990..3f0715379ee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-04  Edward O'Connor  <hober0@gmail.com>  (tiny change)
+
+	* net/goto-addr.el (goto-address-url-regexp): Remove `data:' URLs
+	from goto-address-url-regexp.
+
 2005-11-04  Carsten Dominik  <dominik@science.uva.nl>
 
 	* textmodes/org.el: (org-read-date, org-goto-calendar)
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 98a8b0a29e1..d86a8ecdf2d 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -105,12 +105,18 @@ A value of t means there is no limit--fontify regardless of the size."
   "A regular expression probably matching an e-mail address.")
 
 (defvar goto-address-url-regexp
-  (concat "\\<\\("
-	  (mapconcat 'identity
-		     (delete "mailto:" (copy-sequence thing-at-point-uri-schemes))
-		     "\\|")
-	  "\\)"
-          thing-at-point-url-path-regexp)
+  (concat
+   "\\<\\("
+   (mapconcat 'identity
+              (delete "mailto:"
+		      ;; Remove `data:', as it's not terribly useful to follow
+		      ;; those.  Leaving them causes `use Data::Dumper;' to be
+		      ;; fontified oddly in Perl files.
+                      (delete "data:"
+                              (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_=?#$@~`%&*+|\\/.,]*"