From ad85fe1f1b0719e4e33596a0eb60aa3f0fca74fe Mon Sep 17 00:00:00 2001 From: Deniz Dogan Date: Tue, 28 Jun 2011 13:23:01 +0200 Subject: [PATCH] * textmodes/css-mode.el (css-font-lock-keywords): Fix grouped selectors. Fixes: debbugs:5732 --- lisp/ChangeLog | 5 +++++ lisp/textmodes/css-mode.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e100573a225..4ab5fdaab76 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-06-28 Deniz Dogan + + * textmodes/css-mode.el (css-font-lock-keywords): Fix grouped + selectors (Bug#5732). + 2011-06-27 Jari Aalto * eshell/em-ls.el: Display `ls -l' dates in ISO format (Bug#8440). diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index ef51fb25035..0a8f0b303c9 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -240,7 +240,7 @@ ;; thus prevent this highlighting from being applied (actually now that ;; I use `append' this should work better). But really the part of hte ;; selector between [...] should simply not be highlighted. - (,(concat "^\\([ \t]*[^@:{\n][^:{\n]+\\(?::" (regexp-opt css-pseudo-ids t) + (,(concat "^\\([ \t]*[^@:{}\n][^:{}]+\\(?::" (regexp-opt css-pseudo-ids t) "\\(?:([^)]+)\\)?[^:{\n]*\\)*\\)\\(?:\n[ \t]*\\)*{") (1 'css-selector append)) ;; In the above rule, we allow the open-brace to be on some subsequent