[Emacs-diffs] /srv/bzr/emacs/trunk r100189: Highlight vendor specific properties.

[Stefan Monnier]

------------------------------------------------------------
revno: 100189
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2010-05-07 13:47:56 -0400
message:
  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.
modified:
  lisp/ChangeLog
  lisp/textmodes/css-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-07 14:18:27 +0000
+++ b/lisp/ChangeLog    2010-05-07 17:47:56 +0000
@@ -1,3 +1,11 @@
+2010-05-07  Deniz Dogan <address@hidden>  (tiny change)
+            Stefan Monnier  <address@hidden>
+
+       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  <address@hidden>
 
        * cus-start.el (all): Add native condition for tool-bar-* symbols.

=== modified file 'lisp/textmodes/css-mode.el'
--- a/lisp/textmodes/css-mode.el        2010-01-13 08:35:10 +0000
+++ b/lisp/textmodes/css-mode.el        2010-05-07 17:47:56 +0000
@@ -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))