# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1164073050 0
# Node ID b67c1da1e80e0ef3ad825d681abac74d7939e85b
# Parent  cb533833bfb7ff4d841371b2e897057146c52a39
(thing-at-point-url-at-point):  Don't add a redundant scheme.

(thing-at-point-uri-schemes): Added schemes that
are new to the list at IANA.  Also added irc, mms, mmsh.

diff -r cb533833bfb7 -r b67c1da1e80e lisp/thingatpt.el
--- a/lisp/thingatpt.el	Tue Nov 21 01:34:30 2006 +0000
+++ b/lisp/thingatpt.el	Tue Nov 21 01:37:30 2006 +0000
@@ -214,15 +214,18 @@
 ``thing-at-point-url-regexp''.")
 
 (defvar thing-at-point-uri-schemes
-  ;; Officials from http://www.iana.org/assignments/uri-schemes
+  ;; Officials from http://www.iana.org/assignments/uri-schemes.html
   '("ftp://" "http://" "gopher://" "mailto:" "news:" "nntp:"
     "telnet://" "wais://" "file:/" "prospero:" "z39.50s:" "z39.50r:"
     "cid:" "mid:" "vemmi:" "service:" "imap:" "nfs:" "acap:" "rtsp:"
     "tip:" "pop:" "data:" "dav:" "opaquelocktoken:" "sip:" "tel:" "fax:"
     "modem:" "ldap:" "https://" "soap.beep:" "soap.beeps:" "urn:" "go:"
     "afs:" "tn3270:" "mailserver:"
+    "crid:" "dict:" "dns:" "dtn:" "h323:" "im:" "info:" "ipp:"
+    "iris.beep:" "mtqp:" "mupdate:" "pres:" "sips:" "snmp:" "tag:"
+    "tftp:" "xmlrpc.beep:" "xmlrpc.beeps:" "xmpp:"
   ;; Compatibility
-    "snews:")
+    "snews:" "irc:" "mms://" "mmsh://")
   "Uniform Resource Identifier (URI) Schemes.")
 
 (defvar thing-at-point-url-regexp
@@ -275,7 +278,10 @@
 	  ;; strip whitespace
 	  (while (string-match "[ \t\n\r]+" url)
 	    (setq url (replace-match "" t t url)))
-	  (and short (setq url (concat (cond ((string-match "@" url)
+	  (and short (setq url (concat (cond ((string-match "^[a-zA-Z]+:" url)
+					       ;; already has a URL scheme.
+					       "")
+					     ((string-match "@" url)
                                               "mailto:")
 					     ;; e.g. ftp.swiss... or ftp-swiss...
                                              ((string-match "^ftp" url)