Add 5.0.0 changes.

[riece] / lisp / riece-ctlseq.el

diff --git a/lisp/riece-ctlseq.el b/lisp/riece-ctlseq.el
index fa8117f..bf3d4b3 100644 (file)
--- a/lisp/riece-ctlseq.el
+++ b/lisp/riece-ctlseq.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:
 
@@ -57,9 +57,7 @@
 (defvar riece-ctlseq-face-cache nil)
 (defvar riece-ctlseq-face-counter 0)
 
-(defvar riece-ctlseq-enabled nil)
-
-(defvar riece-ctlseq-description
+(defconst riece-ctlseq-description
   "Mark up control sequences in IRC buffers.")
 
 (defun riece-ctlseq-compatible-attributes-p (this other)
@@ -156,7 +154,7 @@
     attrs)))
 
 (defun riece-ctlseq-message-filter (message)
-  (if riece-ctlseq-enabled
+  (if (get 'riece-ctlseq 'riece-addon-enabled)
       (let ((start 0)
            (end (length (riece-message-text message)))
            attrs)
@@ -187,11 +185,8 @@
 (defun riece-ctlseq-insinuate ()
   (add-hook 'riece-message-filter-functions 'riece-ctlseq-message-filter))
 
-(defun riece-ctlseq-enable ()
-  (setq riece-ctlseq-enabled t))
-
-(defun riece-ctlseq-disable ()
-  (setq riece-ctlseq-enabled nil))
+(defun riece-ctlseq-uninstall ()
+  (remove-hook 'riece-message-filter-functions 'riece-ctlseq-message-filter))
 
 (provide 'riece-ctlseq)