* textmodes/css-mode.el (css-font-lock-keywords): Fix grouped selectors.

Fixes: debbugs:5732

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e100573a22542f3d8f28c4ef602ff44fe147f67b..4ab5fdaab762cbe02ab0f53d8225495a089b865c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-28  Deniz Dogan  <deniz@dogan.se>
+
+       * textmodes/css-mode.el (css-font-lock-keywords): Fix grouped
+       selectors (Bug#5732).
+
 2011-06-27  Jari Aalto  <jari.aalto@cante.net>
 
        * 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 ef51fb250355a555b45d3679b1fb1d964e23a0dc..0a8f0b303c96ee5f507c1e4f62888c796213c063 100644 (file)
--- 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