aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-14 15:50:25 +0200
committerLars Magne Ingebrigtsen2011-07-14 15:50:25 +0200
commitf2182a765ac9c71d0d55ed27b097f8025db0d252 (patch)
tree26cffe4533afba48d66cf7519c93076a538a36dd
parentf0fcdf4bf698f58127f56c207db4f2ac02df17ad (diff)
downloademacs-f2182a765ac9c71d0d55ed27b097f8025db0d252.tar.gz
emacs-f2182a765ac9c71d0d55ed27b097f8025db0d252.zip
* font-lock.el (font-lock-maximum-decoration): Mention what numeric levels mean.
Fixes: debbugs:6935
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/font-lock.el1
2 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3cc219a01d9..1edb18ecb4c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-07-14 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-14 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * font-lock.el (font-lock-maximum-decoration): Mention what
4 numeric levels mean (bug#6935).
5
3 * startup.el (initial-buffer-choice): Don't mention the `none' 6 * startup.el (initial-buffer-choice): Don't mention the `none'
4 selection, which is against policy. 7 selection, which is against policy.
5 8
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 6c76142c59d..6902ce98ab1 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -254,6 +254,7 @@ for buffers in Rmail mode, and size is irrelevant otherwise."
254If nil, use the default decoration (typically the minimum available). 254If nil, use the default decoration (typically the minimum available).
255If t, use the maximum decoration available. 255If t, use the maximum decoration available.
256If a number, use that level of decoration (or if not available the maximum). 256If a number, use that level of decoration (or if not available the maximum).
257The higher the number, the more decoration is done.
257If a list, each element should be a cons pair of the form (MAJOR-MODE . LEVEL), 258If a list, each element should be a cons pair of the form (MAJOR-MODE . LEVEL),
258where MAJOR-MODE is a symbol or t (meaning the default). For example: 259where MAJOR-MODE is a symbol or t (meaning the default). For example:
259 ((c-mode . t) (c++-mode . 2) (t . 1)) 260 ((c-mode . t) (c++-mode . 2) (t . 1))