diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-05-06 21:06:31 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-05-06 21:06:31 +0000 |
| commit | c25b55138a36cf5f334070baf79ce61c1e956eed (patch) | |
| tree | 74ec7f847395839fae3acd0179f1a779c5ebc3b9 /lisp/font-lock.el | |
| parent | 97c57fb2b8d271b2beba317c6213ab34190bfac7 (diff) | |
| parent | 31640842b6cd2970ced612a422fa785d2d718dc0 (diff) | |
| download | emacs-c25b55138a36cf5f334070baf79ce61c1e956eed.tar.gz emacs-c25b55138a36cf5f334070baf79ce61c1e956eed.tar.bz2 emacs-c25b55138a36cf5f334070baf79ce61c1e956eed.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 68, 286-291)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-286
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-287
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-288
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-289
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-290
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-291
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-68
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-341
Diffstat (limited to 'lisp/font-lock.el')
| -rw-r--r-- | lisp/font-lock.el | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 241b08cc834..ab7f3206850 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -339,6 +339,10 @@ If a number, only buffers greater than this size have fontification messages." (defvar font-lock-warning-face 'font-lock-warning-face "Face name to use for things that should stand out.") +(defvar font-lock-negation-char-face 'font-lock-negation-char-face + "Face name to use for easy to overlook negation. +This can be an \"!\" or the \"n\" in \"ifndef\".") + (defvar font-lock-preprocessor-face 'font-lock-preprocessor-face "Face name to use for preprocessor directives.") @@ -386,7 +390,7 @@ word \"bar\" following the word \"anchor\" then MATCH-ANCHORED may be required. MATCH-HIGHLIGHT should be of the form: - (MATCH FACENAME [[OVERRIDE [LAXMATCH]]) + (MATCH FACENAME [OVERRIDE [LAXMATCH]]) MATCH is the subexpression of MATCHER to be highlighted. FACENAME is an expression whose value is the face name to use. Face default attributes @@ -1761,6 +1765,16 @@ Sets various variables using `font-lock-defaults' (or, if nil, using "Font Lock mode face used to highlight warnings." :group 'font-lock-highlighting-faces) +;; Matches font-lock-builtin-face, because that is used for #ifndef and +;; font-lock-keyword-face, which alas make-mode uses for ifndef +(defface font-lock-negation-char-face + '((((class color) (min-colors 88) (background light)) (:foreground "VioletRed" :weight bold)) + (((class color) (min-colors 88) (background dark)) (:foreground "MediumOrchid1" :weight bold)) + (((class color) (min-colors 8)) (:foreground "red" :weight bold)) + (t (:inverse-video t :weight bold))) + "Font Lock mode face used to highlight easy to overlook negation." + :group 'font-lock-highlighting-faces) + (defface font-lock-preprocessor-face '((t :inherit font-lock-builtin-face)) "Font Lock mode face used to highlight preprocessor directives." |