(font-lock-set-defaults): Autoload it for Emacs.

(gnus-message-citation-mode): Require font-lock for XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc5992c..efcb473 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-cite.el (font-lock-set-defaults): Autoload it for Emacs.
+       (gnus-message-citation-mode): Require font-lock for XEmacs.
+
 2007-03-06  Daiki Ueno  <ueno@unixuser.org>
 
        * mml-smime.el (mml-smime-use): New variable; default to use openssl.

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index 77d76fc..1e5dcab 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -1175,6 +1175,10 @@ Returns nil if there is no such line before LIMIT, t otherwise."
   (defvar font-lock-keywords)
   (defvar font-lock-set-defaults))
 
+(eval-and-compile
+  (unless (featurep 'xemacs)
+    (autoload 'font-lock-set-defaults "font-lock")))
+
 (define-minor-mode gnus-message-citation-mode
   "Toggle `gnus-message-citation-mode' in current buffer.
 This buffer local minor mode provides additional font-lock support for
@@ -1207,8 +1211,10 @@ positive."
          (kill-local-variable default))))
     ;; Force `font-lock-set-defaults' to update `font-lock-keywords'.
     (if (featurep 'xemacs)
-       (setq font-lock-defaults-computed nil
-             font-lock-keywords nil)
+       (progn
+         (require 'font-lock)
+         (setq font-lock-defaults-computed nil
+               font-lock-keywords nil))
       (setq font-lock-set-defaults nil))
     (font-lock-set-defaults)
     (font-lock-fontify-buffer)))