X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-url.el;h=449e27bc6be4c4580155f1e77bcf2b9aa7d4d124;hp=105098d2d9a40d1483711bf7c641171e85173a52;hb=21290cb15e3b73ec3d7528885a5c2bad990d4b8d;hpb=0bf5872c5bdee5416703521dc629fc4511d3c550

diff --git a/lisp/riece-url.el b/lisp/riece-url.el
index 105098d..449e27b 100644
--- a/lisp/riece-url.el
+++ b/lisp/riece-url.el
@@ -22,15 +22,24 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
+;; To use, add the following line to your ~/.riece/init.el:
+;; (add-to-list 'riece-addons 'riece-url)
+
 ;;; Code:
 
+(require 'riece-options)
+(require 'riece-menu)			;riece-menu-items
+
+(autoload 'browse-url "browse-url")
 (defvar browse-url-browser-function)
 
 (defgroup riece-url nil
   "URL Browsing in IRC buffer."
-  :group 'riece-vars)
+  :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)
@@ -40,29 +49,45 @@
 
 (autoload 'widget-convert-button "wid-edit")
 
-(defun riece-url-add-buttons (start end)
+(defun riece-url-scan-region (start end)
   (save-excursion
     (goto-char start)
     (while (re-search-forward riece-url-regexp end t)
       (let ((url (match-string 0)))
-	(widget-convert-button
-	 'url-link (match-beginning 0) (match-end 0) url)
+	(if (memq 'riece-highlight riece-addons)
+	    (widget-convert-button
+	     'url-link (match-beginning 0) (match-end 0) url))
 	(unless (member url riece-urls)
 	  (setq riece-urls (cons url riece-urls)))))))
 
 (defun riece-command-browse-url (&optional url)
   (interactive
-   (list (completing-read "Open URL:" (mapcar #'list riece-urls))))
+   (list (completing-read "Open URL: " (mapcar #'list riece-urls))))
   (browse-url url))
 
+(defun riece-url-create-menu (menu)
+  (mapcar (lambda (url)
+	    (vector url (list 'browse-url url)))
+	  riece-urls))
+	    
 (defvar riece-dialogue-mode-map)
 
 (defun riece-url-requires ()
-  '(riece-highlight))
+  (append (if (memq 'riece-highlight riece-addons)
+	      '(riece-highlight))
+	  (if (memq 'riece-menu riece-addons)
+	      '(riece-menu))))
 
 (defun riece-url-insinuate ()
-  (add-hook 'riece-after-insert-functions 'riece-url-add-buttons)
-  (define-key riece-dialogue-mode-map "U" 'riece-command-browse-url))
+  (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 ()
+		  (easy-menu-add-item
+		   nil (list (car riece-menu-items))
+		   '("Open URL..." :filter riece-url-create-menu)))
+		t)))
 
 (provide 'riece-url)