X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-highlight.el;h=b5afa46a326fcd63513447c0430235c4eda49fec;hb=c849cfd9e0a0a3e4cb6c252d654c78970868e1ed;hp=ff65be5d2fee5c501acd204e4d6e750493f41d6e;hpb=e447920d6ebe73786cbaa0e5896f04bb0423dd5d;p=riece

diff --git a/lisp/riece-highlight.el b/lisp/riece-highlight.el
index ff65be5..b5afa46 100644
--- a/lisp/riece-highlight.el
+++ b/lisp/riece-highlight.el
@@ -28,15 +28,16 @@
 (require 'riece-options)		;riece-channel-list-buffer-mode
 (require 'riece-identity)		;riece-format-identity
 (require 'font-lock)
+(require 'derived)
 
 (defgroup riece-highlight nil
-  "Highlight your IRC buffer"
+  "Highlight IRC buffers"
   :tag "Highlight"
   :prefix "riece-"
   :group 'riece)
 
 (defgroup riece-highlight-faces nil
-  "Faces for highlight your IRC buffer"
+  "Faces for highlight IRC buffers"
   :tag "Faces"
   :prefix "riece-highlight-"
   :group 'riece-highlight)
@@ -189,31 +190,29 @@
 
 (defvar riece-highlight-enabled nil)
 
-(defvar font-lock-support-mode)
+(defconst riece-highlight-description
+  "Highlight IRC buffers")
+
 (defun riece-highlight-setup-dialogue ()
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults '(riece-dialogue-font-lock-keywords t))
-  (make-local-variable 'font-lock-verbose)
-  (setq font-lock-verbose nil)
-  (when (boundp 'font-lock-support-mode)
-    (make-local-variable 'font-lock-support-mode)
-    (setq font-lock-support-mode nil))
-  (make-local-hook 'font-lock-mode-hook)
-  (setq font-lock-mode-hook nil)
+  ;; In XEmacs, auto-initialization of font-lock is not affective
+  ;; when buffer-file-name is not set.
+  (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 'local)
+  (if riece-highlight-enabled
+      (font-lock-mode 1)))
 
 (defun riece-highlight-setup-channel-list ()
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults '(riece-channel-list-font-lock-keywords t))
-  (make-local-variable 'font-lock-verbose)
-  (setq font-lock-verbose nil)
-  (when (boundp 'font-lock-support-mode)
-    (make-local-variable 'font-lock-support-mode)
-    (setq font-lock-support-mode nil))
-  (make-local-hook 'font-lock-mode-hook)
-  (setq font-lock-mode-hook nil))
+  ;; In XEmacs, auto-initialization of font-lock is not affective
+  ;; when buffer-file-name is not set.
+  (font-lock-set-defaults)
+  (if riece-highlight-enabled
+      (font-lock-mode 1)))
 
 (defun riece-highlight-hide-prefix (start end length)
   (save-excursion
@@ -287,7 +286,7 @@
 		 major-mode))
 		'(riece-dialogue-mode riece-channel-list-mode))
 	  (with-current-buffer (car buffers)
-	    (font-lock-mode -1)))
+	    (font-lock-mode 0)))
       (setq buffers (cdr buffers))))
   (setq riece-highlight-enabled nil))