2 files changed, 12 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f82c29d6ba5..247bef99213 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-03  Ryan Yeske  <rcyeske@gmail.com>
+
+        * net/rcirc.el (rcirc-url-regexp): Match entire url when it starts
+        with "www".
+
 2006-03-03  Ken Manheimer  <ken.manheimer@gmail.com>
 
         allout.el: Restablished intermediate missing comment header to
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index f2eff379d14..f5cf1ecb7e0 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1635,12 +1635,13 @@ ones added to the list automatically are marked with an asterisk."
 (defvar rcirc-url-regexp
   (rx-to-string
    `(and word-boundary
-         (or "www."
-             (and (or "http" "https" "ftp" "file" "gopher" "news" "telnet" 
-                      "wais" "mailto")
-                  "://"
-                  (1+ (char "-a-zA-Z0-9_."))
-                  (optional ":" (1+ (char "0-9"))))
+         (or (and 
+              (or (and (or "http" "https" "ftp" "file" "gopher" "news" 
+                           "telnet" "wais" "mailto")
+                       "://")
+                  "www.")
+              (1+ (char "-a-zA-Z0-9_."))
+              (optional ":" (1+ (char "0-9"))))
              (and (1+ (char "-a-zA-Z0-9_."))
                   (or ".com" ".net" ".org")
                   word-boundary))