diff options
| author | Vibhav Pant <vibhavp@gmail.com> | 2017-01-30 18:35:43 +0530 |
|---|---|---|
| committer | Vibhav Pant <vibhavp@gmail.com> | 2017-01-30 18:35:43 +0530 |
| commit | bf7f7c0d82a56ed1b76358657e74ca2833b19fe2 (patch) | |
| tree | 90f357b4a735ca7c90d1881ef9948186b9f919df /lisp/textmodes/css-mode.el | |
| parent | 25d38a06eceb0853190a2d9acf53d85686f524bd (diff) | |
| parent | 9c4dfdd1af9f97c6a8d7e922b68a39052116790c (diff) | |
| download | emacs-bf7f7c0d82a56ed1b76358657e74ca2833b19fe2.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/byte-switch
Diffstat (limited to 'lisp/textmodes/css-mode.el')
| -rw-r--r-- | lisp/textmodes/css-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index dfe1cf0c341..c81c3f62e16 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -27,7 +27,6 @@ ;;; Todo: -;; - electric ; and } ;; - filling code with auto-fill-mode ;; - fix font-lock errors with multi-line selectors @@ -667,6 +666,8 @@ cannot be completed sensibly: `custom-ident', ;; Variables. (,(concat "--" css-ident-re) (0 font-lock-variable-name-face)) ;; Selectors. + ;; Allow plain ":root" as a selector. + ("^[ \t]*\\(:root\\)\\(?:[\n \t]*\\)*{" (1 'css-selector keep)) ;; FIXME: attribute selectors don't work well because they may contain ;; strings which have already been highlighted as f-l-string-face and ;; thus prevent this highlighting from being applied (actually now that |