diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-01-06 16:13:05 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-01-06 16:13:05 +0000 |
| commit | 7854b17c10a4f9c79e9410c6c55b904bc4908693 (patch) | |
| tree | e676c3b2a17b2cef4421f56939433583e4a84b39 /lisp/font-lock.el | |
| parent | 568a55a6b7395b847dac9de2a5f47a6d12d99d69 (diff) | |
| parent | 597d3fc033e7a5b172a1c1050893e0f99c4ffb70 (diff) | |
| download | emacs-7854b17c10a4f9c79e9410c6c55b904bc4908693.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 683-684)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-683
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-684
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-493
Diffstat (limited to 'lisp/font-lock.el')
| -rw-r--r-- | lisp/font-lock.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 7819a0e81cc..4e592da0e9c 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -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) |