From: Colin Walters <walters@gnu.org>
Date: Wed, 12 Jun 2002 04:50:47 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~14665
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=333c5e0cba58e3d475b4c833196c21d4eba7a70c;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05706d68c16..c9d25507f30 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.