* Riece: Version 2.0.2 released.

[riece] / lisp / riece-eval.el

diff --git a/lisp/riece-eval.el b/lisp/riece-eval.el
index cbd1c85..d90e8ee 100644 (file)
--- a/lisp/riece-eval.el
+++ b/lisp/riece-eval.el
@@ -45,13 +45,11 @@
   :type 'boolean
   :group 'riece-eval)
 
-(defvar riece-eval-enabled nil)
-
 (defconst riece-eval-description
   "Evaluate an input string as an elisp form.")
 
 (defun riece-eval-display-message-function (message)
-  (when (and riece-eval-enabled
+  (when (and (get 'riece-eval 'riece-addon-enabled)
             (riece-message-own-p message)
             (string-match riece-eval-regexp (riece-message-text message)))
     (let* ((form (match-string 1 (riece-message-text message)))
@@ -87,11 +85,9 @@
   (add-hook 'riece-after-display-message-functions
            'riece-eval-display-message-function))
 
-(defun riece-eval-enable ()
-  (setq riece-eval-enabled t))
-
-(defun riece-eval-disable ()
-  (setq riece-eval-enabled nil))
+(defun riece-eval-uninstall ()
+  (remove-hook 'riece-after-display-message-functions
+              'riece-eval-display-message-function))
 
 (provide 'riece-eval)