[Emacs-diffs] /srv/bzr/emacs/trunk r104287: * lisp/net/rcirc.el (rcirc-markup-urls): Check if rcirc-url-regexp is nil.

[Deniz Dogan]

------------------------------------------------------------
revno: 104287
committer: Deniz Dogan <address@hidden>
branch nick: emacs-trunk
timestamp: Thu 2011-05-19 14:38:39 +0200
message:
  * lisp/net/rcirc.el (rcirc-markup-urls): Check if rcirc-url-regexp is nil.
modified:
  lisp/ChangeLog
  lisp/net/rcirc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-19 07:55:34 +0000
+++ b/lisp/ChangeLog    2011-05-19 12:38:39 +0000
@@ -1,6 +1,7 @@
 2011-05-19  Deniz Dogan  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2011-05-19 07:55:34 +0000
+++ b/lisp/net/rcirc.el 2011-05-19 12:38:39 +0000
@@ -2394,7 +2394,8 @@
        (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)