From 9ff90d99bf2848e37b559e8fea77df05ffd2eba3 Mon Sep 17 00:00:00 2001 From: Deniz Dogan Date: Thu, 19 May 2011 14:38:39 +0200 Subject: [PATCH] * lisp/net/rcirc.el (rcirc-markup-urls): Check if rcirc-url-regexp is nil. --- lisp/ChangeLog | 1 + lisp/net/rcirc.el | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index df5025dacc8..00ca21c903b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,7 @@ 2011-05-19 Deniz Dogan * 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 diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 3a423379b64..0d02688beed 100644 --- a/lisp/net/rcirc.el +++ b/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) -- 2.39.2