* riece-alias.el (riece-alias-use-atmark): New user option. If

[riece] / lisp / riece-url.el

diff --git a/lisp/riece-url.el b/lisp/riece-url.el
index f7155bc..3e72b79 100644 (file)
--- a/lisp/riece-url.el
+++ b/lisp/riece-url.el
@@ -39,7 +39,7 @@
   "URL Browsing in IRC buffer."
   :group 'riece)
 
-(defcustom riece-url-regexp  "\\b\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\):\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?[-a-zA-Z0-9_=?#$@~`%&*+|\\/.,]*[-a-zA-Z0-9_=#$@~`%&*+|\\/]"
+(defcustom riece-url-regexp  "\\b\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\):\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?[-a-zA-Z0-9_=?#$@~`%&*+|\\/.,;]*[-a-zA-Z0-9_=#$@~`%&*+|\\/;]"
   "Regular expression that matches URLs."
   :group 'riece-url
   :type 'regexp)
@@ -47,6 +47,11 @@
 (defvar riece-urls nil
   "A list of URL which appears in Riece buffers.")
 
+(defvar riece-url-enabled nil)
+
+(defconst riece-url-description
+  "Collect URL in IRC buffers")
+
 (autoload 'widget-convert-button "wid-edit")
 
 (defun riece-url-scan-region (start end)
@@ -69,7 +74,7 @@
   (mapcar (lambda (url)
            (vector url (list 'browse-url url)))
          riece-urls))
-           
+
 (defvar riece-dialogue-mode-map)
 
 (defun riece-url-requires ()
@@ -80,7 +85,6 @@
 
 (defun riece-url-insinuate ()
   (add-hook 'riece-after-insert-functions 'riece-url-scan-region)
-  (define-key riece-dialogue-mode-map "U" 'riece-command-browse-url)
   (if (memq 'riece-menu riece-addons)
       (add-hook 'riece-command-mode-hook
                (lambda ()
@@ -89,6 +93,14 @@
                   '("Open URL..." :filter riece-url-create-menu)))
                t)))
 
+(defun riece-url-enable ()
+  (define-key riece-dialogue-mode-map "U" 'riece-command-browse-url)
+  (setq riece-url-enabled t))
+
+(defun riece-url-disable ()
+  (define-key riece-dialogue-mode-map "U" nil)
+  (setq riece-url-enabled nil))
+
 (provide 'riece-url)
 
 ;;; riece-url.el ends here