Fixed the last change.

diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index fb3a987..9ffa494 100644 (file)
--- a/lisp/riece-addon.el
+++ b/lisp/riece-addon.el
@@ -220,12 +220,11 @@ All normal editing commands are turned off."
        truncate-lines t
        buffer-read-only t)
   (use-local-map riece-addon-list-mode-map)
-  (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-addon-list-font-lock-keywords t)))
+  (make-local-variable 'font-lock-defaults)
+  (setq font-lock-defaults '(riece-addon-list-font-lock-keywords t))
+  ;; In XEmacs, auto-initialization of font-lock is not affective
+  ;; when buffer-file-name is not set.
+  (font-lock-set-defaults)
   (run-hooks 'riece-addon-list-mode-hook))
 
 (defun riece-command-list-addons ()

diff --git a/lisp/riece-highlight.el b/lisp/riece-highlight.el
index b1746ef..e484ea6 100644 (file)
--- a/lisp/riece-highlight.el
+++ b/lisp/riece-highlight.el
@@ -193,23 +193,21 @@
   "Highlight IRC buffers")
 
 (defun riece-highlight-setup-dialogue ()
-  (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-variable 'font-lock-defaults)
+  (setq font-lock-defaults '(riece-dialogue-font-lock-keywords t))
+  ;; 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))
 
 (defun riece-highlight-setup-channel-list ()
-  (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))))
+  (make-local-variable 'font-lock-defaults)
+  (setq font-lock-defaults '(riece-channel-list-font-lock-keywords t))
+  ;; In XEmacs, auto-initialization of font-lock is not affective
+  ;; when buffer-file-name is not set.
+  (font-lock-set-defaults))
 
 (defun riece-highlight-hide-prefix (start end length)
   (save-excursion