Fix byte-compile error

[riece] / lisp / riece-highlight.el

diff --git a/lisp/riece-highlight.el b/lisp/riece-highlight.el
index 97e9af1..0a5a87d 100644 (file)
--- a/lisp/riece-highlight.el
+++ b/lisp/riece-highlight.el
@@ -1,4 +1,4 @@
-;;; riece-highlight.el --- highlight IRC buffers
+;;; riece-highlight.el --- highlight IRC buffers -*- lexical-binding: t -*-
 ;; Copyright (C) 1998-2003 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -194,8 +194,13 @@
   :group 'riece-highlight)
 
 (unless (riece-facep 'riece-modeline-current-face)
-  (make-face 'riece-modeline-current-face
-            "Face used for displaying the current channel in modeline.")
+  ;; In Emacs, set-face-doc-string is an alias to
+  ;; set-face-documentation, but we use the former since it is
+  ;; available in both Emacs and XEmacs.
+  (make-face 'riece-modeline-current-face)
+  (set-face-doc-string
+   'riece-modeline-current-face
+   "Face used for displaying the current channel in modeline.")
   (if (featurep 'xemacs)
       (set-face-parent 'riece-modeline-current-face 'modeline))
   (set-face-foreground 'riece-modeline-current-face
@@ -214,7 +219,7 @@
   ;; 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)
+  (riece-make-local-hook 'after-change-functions)
   (add-hook 'after-change-functions
            'riece-highlight-hide-prefix nil t)
   (if (get 'riece-highlight 'riece-addon-enabled)
@@ -229,7 +234,7 @@
   (if (get 'riece-highlight 'riece-addon-enabled)
       (font-lock-mode 1)))
 
-(defun riece-highlight-hide-prefix (start end length)
+(defun riece-highlight-hide-prefix (start _end _length)
   (save-excursion
     (goto-char start)
     (if (looking-at riece-prefix-regexp)
@@ -282,8 +287,7 @@
     (save-excursion
       (while buffers
        (set-buffer (car buffers))
-       (if (eq (derived-mode-class major-mode)
-               'riece-dialogue-mode)
+       (if (riece-derived-mode-p 'riece-dialogue-mode)
            (remove-hook 'after-change-functions
                         'riece-highlight-hide-prefix t))
        (setq buffers (cdr buffers)))))
@@ -303,10 +307,9 @@
 (defun riece-highlight-enable ()
   (let ((buffers riece-buffer-list))
     (while buffers
-      (if (memq (derived-mode-class
-              (with-current-buffer (car buffers)
-                major-mode))
-               '(riece-dialogue-mode riece-channel-list-mode))
+      (if (with-current-buffer (car buffers)
+           (riece-derived-mode-p 'riece-dialogue-mode
+                                 'riece-channel-list-mode))
          (with-current-buffer (car buffers)
            (font-lock-mode 1)))
       (setq buffers (cdr buffers)))))
@@ -314,10 +317,9 @@
 (defun riece-highlight-disable ()
   (let ((buffers riece-buffer-list))
     (while buffers
-      (if (memq (derived-mode-class
-              (with-current-buffer (car buffers)
-                major-mode))
-               '(riece-dialogue-mode riece-channel-list-mode))
+      (if (with-current-buffer (car buffers)
+           (riece-derived-mode-p 'riece-dialogue-mode
+                                 'riece-channel-list-mode))
          (with-current-buffer (car buffers)
            (font-lock-mode 0)))
       (setq buffers (cdr buffers)))))