summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
authorDeniz Dogan <deniz@dogan.se>2011-05-19 14:38:39 +0200
committerDeniz Dogan <deniz@dogan.se>2011-05-19 14:38:39 +0200
commit9ff90d99bf2848e37b559e8fea77df05ffd2eba3 (patch)
tree7f5847f8c1bb049e164631a31da81ee25fc521fc /lisp/net
parent827456405341fd4f697bb73b303c85d0a2e36470 (diff)
downloademacs-9ff90d99bf2848e37b559e8fea77df05ffd2eba3.tar.gz
emacs-9ff90d99bf2848e37b559e8fea77df05ffd2eba3.tar.bz2
emacs-9ff90d99bf2848e37b559e8fea77df05ffd2eba3.zip
* lisp/net/rcirc.el (rcirc-markup-urls): Check if rcirc-url-regexp is nil.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/rcirc.el3
1 files changed, 2 insertions, 1 deletions
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)