mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-03 11:33:37 +00:00
Code Issues Releases Activity

(font-lock-fontify-buffer, font-lock-fontify-region): Make sure we've setup

Browse Source 
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.
This commit is contained in:
Stefan Monnier 2006-01-03 17:00:35 +00:00
parent e7b394e177
commit 1c360af385
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/ChangeLog
View File

@ -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.

6
lisp/font-lock.el
View File

@ -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 @@ The value of this variable is used when Font Lock mode is turned on."
(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 @@ The value of this variable is used when Font Lock mode is turned on."
(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 @@ The value of this variable is used when Font Lock mode is turned on."
(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)