X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-url.el;h=1c2f4dd8468f03137ad2e4d6c444651ebefc7b42;hb=6802b2a9d24c465268b988ba836ce6cf4b32cde2;hp=73c7e02e575beee52f6fb8b8a400bc54f0715cbb;hpb=f28a703826e524017114912aa79e0a07ee4c2cae;p=elisp%2Friece.git

diff --git a/lisp/riece-url.el b/lisp/riece-url.el
index 73c7e02..1c2f4dd 100644
--- a/lisp/riece-url.el
+++ b/lisp/riece-url.el
@@ -1,4 +1,4 @@
-;;; riece-url.el --- URL collector add-on
+;;; riece-url.el --- collect URL in IRC buffers
 ;; Copyright (C) 1998-2003 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -19,24 +19,25 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
-;; To use, add the following line to your ~/.riece/init.el:
-;; (add-to-list 'riece-addons 'riece-url)
+;; NOTE: This is an add-on module for Riece.
 
 ;;; Code:
 
 (require 'riece-options)
 (require 'riece-menu)			;riece-menu-items
+(require 'easymenu)
 
 (autoload 'browse-url "browse-url")
 (defvar browse-url-browser-function)
 
 (defgroup riece-url nil
   "URL Browsing in IRC buffer."
+  :prefix "riece-"
   :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_=#$@~`%&*+|\\/;]"
@@ -51,7 +52,7 @@ For example:
         '((\"\\\\bBug#\\\\([0-9]+\\\\)\\\\b\" .
            \"http://bugs.debian.org/\\\\1\")))
 
-This will map a string \"Bug#12345\" to a URL
+This maps a string \"Bug#12345\" to a URL
 \"http://bugs.debian.org/12345\"."
   :type 'alist
   :group 'riece-url)
@@ -59,10 +60,8 @@ This will map a string \"Bug#12345\" to a URL
 (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")
+  "Collect URL in IRC buffers.")
 
 (autoload 'widget-convert-button "wid-edit")
 
@@ -95,7 +94,8 @@ This will map a string \"Bug#12345\" to a URL
       (save-excursion
 	(goto-char start)
 	(while (re-search-forward (car (car alist)) end t)
-	  (let ((url (riece-url-replace-match (cdr (car alist)))))
+	  (let ((url (save-match-data
+		       (riece-url-replace-match (cdr (car alist))))))
 	    (if (memq 'riece-highlight riece-addons)
 		(widget-convert-button
 		 'url-link (match-beginning 0) (match-end 0) url))
@@ -121,23 +121,31 @@ This will map a string \"Bug#12345\" to a URL
 	  (if (memq 'riece-menu riece-addons)
 	      '(riece-menu))))
 
+(defun riece-url-command-mode-hook ()
+  (easy-menu-add-item
+   nil (list (car riece-menu-items))
+   '("Open URL..." :filter riece-url-create-menu)))
+
 (defun riece-url-insinuate ()
   (add-hook 'riece-after-insert-functions 'riece-url-scan-region)
   (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)))
+		'riece-url-command-mode-hook
 		t)))
 
+(defun riece-url-uninstall ()
+  (easy-menu-remove-item
+   nil (list (car riece-menu-items))
+   "Open URL...")
+  (remove-hook 'riece-after-insert-functions 'riece-url-scan-region)
+  (remove-hook 'riece-command-mode-hook
+	       'riece-url-command-mode-hook))
+
 (defun riece-url-enable ()
-  (define-key riece-dialogue-mode-map "U" 'riece-command-browse-url)
-  (setq riece-url-enabled t))
+  (define-key riece-dialogue-mode-map "U" 'riece-command-browse-url))
 
 (defun riece-url-disable ()
-  (define-key riece-dialogue-mode-map "U" nil)
-  (setq riece-url-enabled nil))
+  (define-key riece-dialogue-mode-map "U" nil))
 
 (provide 'riece-url)