aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/font-core.el15
2 files changed, 10 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 56e49dd666a..b7d10e75ea7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-10-20 Romain Francoise <romain@orebokech.com>
2
3 * font-core.el (font-lock-mode): Doc fix.
4
12005-10-20 Kim F. Storm <storm@cua.dk> 52005-10-20 Kim F. Storm <storm@cua.dk>
2 6
3 * ido.el (ido-is-tramp-root): Simplify regexp matching tramp root. 7 * ido.el (ido-is-tramp-root): Simplify regexp matching tramp root.
diff --git a/lisp/font-core.el b/lisp/font-core.el
index 4af6e1c41f0..27212f9fc68 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -118,17 +118,14 @@ of `font-lock-global-modes'. For example, put in your ~/.emacs:
118 118
119 (global-font-lock-mode t) 119 (global-font-lock-mode t)
120 120
121There are a number of support modes that may be used to speed up Font Lock mode 121Where major modes support different levels of fontification, you can use
122in various ways, specified via the variable `font-lock-support-mode'. Where 122the variable `font-lock-maximum-decoration' to specify which level you
123major modes support different levels of fontification, you can use the variable 123generally prefer. When you turn Font Lock mode on/off the buffer is
124`font-lock-maximum-decoration' to specify which level you generally prefer. 124fontified/defontified, though fontification occurs only if the buffer is
125When you turn Font Lock mode on/off the buffer is fontified/defontified, though 125less than `font-lock-maximum-size'.
126fontification occurs only if the buffer is less than `font-lock-maximum-size'.
127 126
128For example, to specify that Font Lock mode uses Lazy Lock mode as a support 127For example, to use maximum levels of fontification, put in your ~/.emacs:
129mode and use maximum levels of fontification, put in your ~/.emacs:
130 128
131 (setq font-lock-support-mode 'lazy-lock-mode)
132 (setq font-lock-maximum-decoration t) 129 (setq font-lock-maximum-decoration t)
133 130
134To add your own highlighting for some major mode, and modify the highlighting 131To add your own highlighting for some major mode, and modify the highlighting