Remove hooks local to dialog buffers.

[riece] / lisp / riece-highlight.el

diff --git a/lisp/riece-highlight.el b/lisp/riece-highlight.el
index b9dd902..1164918 100644 (file)
--- a/lisp/riece-highlight.el
+++ b/lisp/riece-highlight.el
@@ -22,6 +22,10 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
+;; NOTE: This is an add-on module for Riece.
+
 ;;; Code:
 
 (require 'riece-globals)
@@ -32,13 +36,13 @@
 (require 'derived)
 
 (defgroup riece-highlight nil
-  "Highlight IRC buffers"
+  "Decorate IRC buffers with faces and fonts."
   :tag "Highlight"
   :prefix "riece-"
   :group 'riece)
 
 (defgroup riece-highlight-faces nil
-  "Faces for highlight IRC buffers"
+  "Faces for highlight IRC buffers."
   :tag "Faces"
   :prefix "riece-highlight-"
   :group 'riece-highlight)
@@ -200,14 +204,11 @@
 (defvar riece-highlight-enabled nil)
 
 (defconst riece-highlight-description
-  "Highlight IRC buffers")
+  "Highlight IRC buffers.")
 
 (defun riece-highlight-server-match (limit)
-  (let ((match-data (match-data)))
-    (if (re-search-forward "(from [^)]+)$" limit t)
-       (if (get-text-property (match-beginning 0) 'riece-server-name)
-           t
-         (store-match-data match-data)))))
+  (and (re-search-forward "(from [^)]+)$" limit t)
+       (get-text-property (match-beginning 0) 'riece-server-name)))
 
 (defun riece-highlight-setup-dialogue ()
   (make-local-variable 'font-lock-defaults)
@@ -217,7 +218,7 @@
   (font-lock-set-defaults)
   (make-local-hook 'after-change-functions)
   (add-hook 'after-change-functions
-           'riece-highlight-hide-prefix nil 'local)
+           'riece-highlight-hide-prefix nil t)
   (if riece-highlight-enabled
       (font-lock-mode 1)))
 
@@ -263,12 +264,8 @@
 (defun riece-highlight-insinuate ()
   (put 'riece-channel-mode 'font-lock-defaults
        '(riece-dialogue-font-lock-keywords t))
-  (add-hook 'riece-channel-mode-hook
-           'riece-highlight-setup-dialogue)
   (put 'riece-others-mode 'font-lock-defaults
        '(riece-dialogue-font-lock-keywords t))
-  (add-hook 'riece-others-mode-hook
-           'riece-highlight-setup-dialogue)
   (put 'riece-dialogue-mode 'font-lock-defaults
        '(riece-dialogue-font-lock-keywords t))
   (add-hook 'riece-dialogue-mode-hook
@@ -282,6 +279,29 @@
   (add-hook 'riece-after-insert-functions
            'riece-highlight-put-overlay-faces))
 
+(defun riece-highlight-uninstall ()
+  (let ((buffers riece-buffer-list))
+    (save-excursion
+      (while buffers
+       (set-buffer (car buffers))
+       (if (eq (derived-mode-class major-mode)
+               'riece-dialogue-mode)
+           (remove-hook 'after-change-functions
+                        'riece-highlight-hide-prefix t))
+       (setq buffers (cdr buffers)))))
+  (remprop 'riece-channel-mode 'font-lock-defaults)
+  (remprop 'riece-others-mode 'font-lock-defaults)
+  (remprop 'riece-dialogue-mode 'font-lock-defaults)
+  (remove-hook 'riece-dialogue-mode-hook
+              'riece-highlight-setup-dialogue)
+  (remprop 'riece-channel-list-mode 'font-lock-defaults)
+  (remove-hook 'riece-channel-list-mode-hook
+              'riece-highlight-setup-channel-list)
+  (remove-hook 'riece-format-identity-for-channel-list-indicator-functions
+              'riece-highlight-format-identity-for-channel-list-indicator)
+  (remove-hook 'riece-after-insert-functions
+              'riece-highlight-put-overlay-faces))
+
 (defun riece-highlight-enable ()
   (let ((buffers riece-buffer-list))
     (while buffers