# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1136307635 0
# Node ID 8ebf91fa890e0591e66c77a7eded883ff92ed41f
# Parent  ab3fdc2bada63d6e373e9697fc25f5655d760c0f
(font-lock-fontify-buffer, font-lock-fontify-region): Make sure we've setup
font-lock's vars.  It may influence which function we then call.
(font-lock-default-fontify-buffer): Don't bother calling set-defaults
here since it's too late anyway.

diff -r ab3fdc2bada6 -r 8ebf91fa890e lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jan 03 16:56:15 2006 +0000
+++ b/lisp/ChangeLog	Tue Jan 03 17:00:35 2006 +0000
@@ -1,3 +1,11 @@
+2006-01-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* font-lock.el (font-lock-fontify-buffer, font-lock-fontify-region):
+	Make sure we've setup font-lock's vars.  It may influence which
+	function we then call.
+	(font-lock-default-fontify-buffer): Don't bother calling set-defaults
+	here since it's too late anyway.
+
 2006-01-03  Romain Francoise  <romain@orebokech.com>
 
 	* startup.el (fancy-splash-tail, normal-splash-screen):
@@ -42,8 +50,8 @@
 	(custom-theme-reset-variables, custom-reset-variables): Mark as
 	XEmacs compatibility functions.  We don't actually use these.
 
-	* cus-edit.el (custom-variable-state-set): Use
-	custom-variable-theme-value instead of custom-theme-value.
+	* cus-edit.el (custom-variable-state-set):
+	Use custom-variable-theme-value instead of custom-theme-value.
 	(custom-face-state-set): Rename `standard' theme to `changed'.
 	(custom-save-variables, custom-save-faces): Delete unneeded
 	references to custom-reset-variables.
diff -r ab3fdc2bada6 -r 8ebf91fa890e lisp/font-lock.el
--- a/lisp/font-lock.el	Tue Jan 03 16:56:15 2006 +0000
+++ b/lisp/font-lock.el	Tue Jan 03 17:00:35 2006 +0000
@@ -1,7 +1,7 @@
 ;;; font-lock.el --- Electric font lock mode
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004 2005 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: jwz, then rms, then sm
 ;; Maintainer: FSF
@@ -980,6 +980,7 @@
 (defun font-lock-fontify-buffer ()
   "Fontify the current buffer the way the function `font-lock-mode' would."
   (interactive)
+  (font-lock-set-defaults)
   (let ((font-lock-verbose (or font-lock-verbose (interactive-p))))
     (funcall font-lock-fontify-buffer-function)))
 
@@ -987,6 +988,7 @@
   (funcall font-lock-unfontify-buffer-function))
 
 (defun font-lock-fontify-region (beg end &optional loudly)
+  (font-lock-set-defaults)
   (funcall font-lock-fontify-region-function beg end loudly))
 
 (defun font-lock-unfontify-region (beg end)
@@ -1000,8 +1002,6 @@
     (with-temp-message
 	(when verbose
 	  (format "Fontifying %s..." (buffer-name)))
-      ;; Make sure we have the right `font-lock-keywords' etc.
-      (font-lock-set-defaults)
       ;; Make sure we fontify etc. in the whole buffer.
       (save-restriction
 	(widen)