Merge from origin/emacs-25

ea26c8a * lisp/net/browse-url.el (browse-url-default-browser): Lower
        priority of non-free Chrome.
0fac75f Improve the custom type of some user options.
2df0e04 Highlight CSS variables with variable name face
3cf5e81 * lisp/gnus/gnus-kill.el (gnus-winconf-kill-file): Not
        user-serviceable.
2a5233c Mark some user options that can get evalled as risky.
39b166f Disable DebPrint in sys_read on MS-Windows
9fd0189 ;Fix ChangeLog entry
4bb7233 Fix typos in Introduction to Emacs Lisp manual

1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index d402fb19955..96a82baa56c 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -215,7 +215,7 @@
 (defconst css-escapes-re
   "\\\\\\(?:[^\000-\037\177]\\|[0-9a-fA-F]+[ \n\t\r\f]?\\)")
 (defconst css-nmchar-re (concat "\\(?:[-[:alnum:]]\\|" css-escapes-re "\\)"))
-(defconst css-nmstart-re (concat "\\(?:--\\)?\\(?:[[:alpha:]]\\|" css-escapes-re "\\)"))
+(defconst css-nmstart-re (concat "\\(?:[[:alpha:]]\\|" css-escapes-re "\\)"))
 (defconst css-ident-re ;; (concat css-nmstart-re css-nmchar-re "*")
   ;; Apparently, "at rules" names can start with a dash, e.g. @-moz-keyframes.
   (concat css-nmchar-re "+"))
@@ -246,6 +246,8 @@
     ;; Since "An at-rule consists of everything up to and including the next
     ;; semicolon (;) or the next block, whichever comes first."
     (,(concat "@" css-ident-re) (0 font-lock-builtin-face))
+    ;; Variables.
+    (,(concat "--" css-ident-re) (0 font-lock-variable-name-face))
     ;; Selectors.
     ;; FIXME: attribute selectors don't work well because they may contain
     ;; strings which have already been highlighted as f-l-string-face and