diff lisp/ChangeLog @ 109008:646e914bd0fd

* lisp/font-lock.el (font-lock-major-mode): Rename from font-lock-mode-major-mode to distinguish it from global-font-lock-mode's own font-lock-mode-major-mode. (font-lock-set-defaults): * lisp/font-core.el (font-lock-default-function): Adjust users. (font-lock-mode): Don't set it at all.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 16 Jun 2010 16:00:22 -0400
parents fb83c83549bb
children 6c39bda25895 b36e6aac8cf2
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Jun 15 13:41:21 2010 +0200
+++ b/lisp/ChangeLog	Wed Jun 16 16:00:22 2010 -0400
@@ -1,3 +1,12 @@
+2010-06-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* font-lock.el (font-lock-major-mode): Rename from
+	font-lock-mode-major-mode to distinguish it from
+	global-font-lock-mode's own font-lock-mode-major-mode (bug#6135).
+	(font-lock-set-defaults):
+	* font-core.el (font-lock-default-function): Adjust users.
+	(font-lock-mode): Don't set it at all.
+
 2010-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* vc-annotate.el (vc-annotate): Use vc-read-revision.