(toplevel): Require font-lock.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 757258f1b83f4a94a3465dcab8ca824bdfae65c1..0fa60981dbecd6a37b76931d0b4683997b7b2c15 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-04  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * hi-lock.el (toplevel): Require font-lock.
+
 2000-08-03  Vinicius Jose Latorre  <vinicius@cpqd.com.br>
 
        * ebnf2ps.el: Get around a bug on skip-chars-forward.
@@ -3117,7 +3121,7 @@
 
 2000-05-07  Dave Love  <fx@gnu.org>
 
-       * time.el: Small doc fixes from Pavel Janík ml..
+       * time.el: Small doc fixes from Pavel Jan\7fk ml..
 
 2000-05-05  Dave Love  <fx@gnu.org>
 

diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 554eacd2f46701956519025ff04f121ea19664fb..f5606d7e4454ea4c3ef4948606ff473ca226749c 100644 (file)
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -79,7 +79,7 @@
 
 ;;; Code:
 
-(eval-when-compile
+(eval-and-compile
   (require 'font-lock))
 
 ;;;###autoload