X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-keyword.el;h=85251b7790b2bf13c546deb37f706f265f29d36d;hb=bcdd299ffdc3037790bcd9eaf2c082835e8ccd45;hp=03b17277a301acac725c89cf9526a74a953ae64c;hpb=2e8d72b091af0ce1e3673f90d8024739328a0d7c;p=elisp%2Friece.git

diff --git a/lisp/riece-keyword.el b/lisp/riece-keyword.el
index 03b1727..85251b7 100644
--- a/lisp/riece-keyword.el
+++ b/lisp/riece-keyword.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:
 
@@ -66,15 +66,13 @@ and the matched message object."
   :group 'riece-highlight-faces)
 (defvar riece-keyword-face 'riece-keyword-face)
 
-(defvar riece-keyword-enabled nil)
-
 (defconst riece-keyword-description
   "Detect keywords in IRC buffers.")
 
 ;;; The old XEmacs package doesn't have autoload setting for regexp-opt.
 (autoload 'regexp-opt "regexp-opt")
 (defun riece-keyword-message-filter (message)
-  (if (and riece-keyword-enabled
+  (if (and (get 'riece-keyword 'riece-addon-enabled)
 	   riece-keywords
 	   ;; Ignore messages which belongs to myself.
 	   (not (riece-message-own-p message)))
@@ -115,11 +113,8 @@ and the matched message object."
 (defun riece-keyword-insinuate ()
   (add-hook 'riece-message-filter-functions 'riece-keyword-message-filter))
 
-(defun riece-keyword-enable ()
-  (setq riece-keyword-enabled t))
-
-(defun riece-keyword-disable ()
-  (setq riece-keyword-enabled nil))
+(defun riece-keyword-uninstall ()
+  (remove-hook 'riece-message-filter-functions 'riece-keyword-message-filter))
 
 (provide 'riece-keyword)