* riece-addon.el (riece-addon-list-mode): Call font-lock-set-defaults.

[riece] / lisp / riece-highlight.el

diff --git a/lisp/riece-highlight.el b/lisp/riece-highlight.el
index ead7a2a..b1746ef 100644 (file)
--- a/lisp/riece-highlight.el
+++ b/lisp/riece-highlight.el
@@ -30,13 +30,13 @@
 (require 'font-lock)
 
 (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)
@@ -192,31 +192,24 @@
 (defconst riece-highlight-description
   "Highlight IRC buffers")
 
-(defvar font-lock-support-mode)
 (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)
+  (if (featurep 'xemacs)
+      ;; In XEmacs, auto-initialization of font-lock is not affective
+      ;; when buffer-file-name is not set.
+      (font-lock-set-defaults)
+    (make-local-variable 'font-lock-defaults)
+    (setq font-lock-defaults '(riece-dialogue-font-lock-keywords t)))
   (make-local-hook 'after-change-functions)
   (add-hook 'after-change-functions
            'riece-highlight-hide-prefix nil 'local))
 
 (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))
+  (if (featurep 'xemacs)
+      ;; In XEmacs, auto-initialization of font-lock is not affective
+      ;; when buffer-file-name is not set.
+      (font-lock-set-defaults)
+    (make-local-variable 'font-lock-defaults)
+    (setq font-lock-defaults '(riece-channel-list-font-lock-keywords t))))
 
 (defun riece-highlight-hide-prefix (start end length)
   (save-excursion