X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-url.el;h=1c2f4dd8468f03137ad2e4d6c444651ebefc7b42;hb=bf2df5d4bf0f70c7f102eb924e352f83d46f3fa4;hp=848d24d1fd9bc1c50353dbf2e861882078e11afe;hpb=2e8d72b091af0ce1e3673f90d8024739328a0d7c;p=elisp%2Friece.git

diff --git a/lisp/riece-url.el b/lisp/riece-url.el
index 848d24d..1c2f4dd 100644
--- a/lisp/riece-url.el
+++ b/lisp/riece-url.el
@@ -19,8 +19,8 @@
 
 ;; 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:
 
@@ -30,6 +30,7 @@
 
 (require 'riece-options)
 (require 'riece-menu)			;riece-menu-items
+(require 'easymenu)
 
 (autoload 'browse-url "browse-url")
 (defvar browse-url-browser-function)
@@ -59,8 +60,6 @@ This maps 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.")
 
@@ -122,23 +121,31 @@ This maps 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)