# HG changeset patch
# User Colin Walters <walters@gnu.org>
# Date 1023857447 0
# Node ID 877fc0c210444d2768eb2d2a05c7e9a824e9dc1a
# Parent  d6822e2dafb3769ccb77e2cc1c6e4112705f3518
*** empty log message ***

diff -r d6822e2dafb3 -r 877fc0c21044 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jun 12 03:39:00 2002 +0000
+++ b/lisp/ChangeLog	Wed Jun 12 04:50:47 2002 +0000
@@ -1,3 +1,12 @@
+2002-06-12  Colin Walters  <walters@debian.org>
+
+	* font-core.el (font-lock-core-only): Variable deleted.  All uses
+	removed.
+	(font-lock-set-defaults): Variable alist settings moved back into
+	font-lock-set-defaults-1.
+	(turn-on-font-lock-if-enabled): Always turn on font-lock unless it
+	is specifically excluded by the user.
+
 2002-06-11  Richard M. Stallman  <rms@gnu.org>
 
 	* format.el (format-alist): Document new element PRESERVE.