From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 5 Sep 2001 13:38:49 +0000 (+0000)
Subject: (toplevel): Require `jit-lock' only if
X-Git-Tag: emacs-pretest-21.0.106~230
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=54f73af324b7ed66e6c0dc72b215680b29f58fe2;p=emacs.git

(toplevel): Require `jit-lock' only if
font-lock-support-mode is set to jit-lock-mode.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b57fb4e8c55..2f99a7a70cc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-05  Gerd Moellmann  <gerd@gnu.org>
+
+	* font-lock.el (toplevel): Require `jit-lock' only if
+	font-lock-support-mode is set to jit-lock-mode.
+
 2001-09-05  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* international/quail.el (quail-use-package, quail-inactivate)
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index ba59b9568ea..ef4bf6f2836 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2981,6 +2981,8 @@ See also `java-font-lock-extra-types'.")
 ;; Provide ourselves:
 
 (provide 'font-lock)
-(require 'jit-lock)
+
+(when (eq font-lock-support-mode 'jit-lock-mode)
+  (require 'jit-lock))
 
 ;;; font-lock.el ends here