Mercurial > emacs
changeset 108306:8ceadb47c51e
Highlight vendor specific properties.
* textmodes/css-mode.el (css-proprietary-nmstart-re): New var.
(css-proprietary-property): New face.
(css-font-lock-keywords): Use them.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 07 May 2010 13:47:56 -0400 |
| parents | 8bf1951b8dc0 |
| children | 767894eefe6c |
| files | lisp/ChangeLog lisp/textmodes/css-mode.el |
| diffstat | 2 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri May 07 20:14:26 2010 +0300 +++ b/lisp/ChangeLog Fri May 07 13:47:56 2010 -0400 @@ -1,3 +1,11 @@ +2010-05-07 Deniz Dogan <deniz.a.m.dogan@gmail.com> (tiny change) + Stefan Monnier <monnier@iro.umontreal.ca> + + Highlight vendor specific properties. + * textmodes/css-mode.el (css-proprietary-nmstart-re): New var. + (css-proprietary-property): New face. + (css-font-lock-keywords): Use them. + 2010-05-07 Eli Zaretskii <eliz@gnu.org> * cus-start.el (all): Add native condition for tool-bar-* symbols.
--- a/lisp/textmodes/css-mode.el Fri May 07 20:14:26 2010 +0300 +++ b/lisp/textmodes/css-mode.el Fri May 07 13:47:56 2010 -0400 @@ -212,6 +212,8 @@ (defconst css-nmchar-re (concat "\\(?:[-[:alnum:]]\\|" css-escapes-re "\\)")) (defconst css-nmstart-re (concat "\\(?:[[:alpha:]]\\|" css-escapes-re "\\)")) (defconst css-ident-re (concat css-nmstart-re css-nmchar-re "*")) +(defconst css-proprietary-nmstart-re ;; Vendor-specific properties. + "[-_]\\(?:ms\\|moz\\|o\\|webkit\\|khtml\\)-") (defconst css-name-re (concat css-nmchar-re "+")) (defface css-selector '((t :inherit font-lock-function-name-face)) @@ -220,6 +222,8 @@ (defface css-property '((t :inherit font-lock-variable-name-face)) "Face to use for properties." :group 'css) +(defface css-proprietary-property '((t :inherit (css-property italic))) + "Face to use for vendor-specific properties.") (defvar css-font-lock-keywords `(("!\\s-*important" . font-lock-builtin-face) @@ -251,8 +255,11 @@ ;; No face. nil))) ;; Properties. Again, we don't limit ourselves to css-property-ids. - (,(concat "\\(?:[{;]\\|^\\)[ \t]*\\(" css-ident-re "\\)\\s-*:") - (1 'css-property)))) + (,(concat "\\(?:[{;]\\|^\\)[ \t]*\\(" + "\\(?:\\(" css-proprietary-nmstart-re "\\)\\|" + css-nmstart-re "\\)" css-nmchar-re "*" + "\\)\\s-*:") + (1 (if (match-end 2) 'css-proprietary-property 'css-property))))) (defvar css-font-lock-defaults '(css-font-lock-keywords nil t))