* lisp/net/rcirc.el (rcirc-markup-urls): Check if rcirc-url-regexp is nil.

lisp/ChangeLog

@@ -1,6 +1,7 @@
 2011-05-19  Deniz Dogan  <deniz@dogan.se>
 
 	* net/rcirc.el (rcirc-mode): Initialize rcirc-urls to nil.
+	(rcirc-markup-urls): Check if rcirc-url-regexp is nil.
 
 2011-05-19  Glenn Morris  <rgm@gnu.org>
 

lisp/net/rcirc.el

@@ -2394,7 +2394,8 @@ keywords when no KEYWORD is given."
 	(rcirc-record-activity (current-buffer) 'nick)))))
 
 (defun rcirc-markup-urls (sender response)
-  (while (re-search-forward rcirc-url-regexp nil t)
+  (while (and rcirc-url-regexp ;; nil means disable URL catching
+              (re-search-forward rcirc-url-regexp nil t))
     (let ((start (match-beginning 0))
 	  (end (match-end 0)))
       (rcirc-add-face start end 'rcirc-url)