diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/textmodes/css-mode.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e100573a225..4ab5fdaab76 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-06-28 Deniz Dogan <deniz@dogan.se> | ||
| 2 | |||
| 3 | * textmodes/css-mode.el (css-font-lock-keywords): Fix grouped | ||
| 4 | selectors (Bug#5732). | ||
| 5 | |||
| 1 | 2011-06-27 Jari Aalto <jari.aalto@cante.net> | 6 | 2011-06-27 Jari Aalto <jari.aalto@cante.net> |
| 2 | 7 | ||
| 3 | * eshell/em-ls.el: Display `ls -l' dates in ISO format (Bug#8440). | 8 | * 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 @@ | |||
| 240 | ;; thus prevent this highlighting from being applied (actually now that | 240 | ;; thus prevent this highlighting from being applied (actually now that |
| 241 | ;; I use `append' this should work better). But really the part of hte | 241 | ;; I use `append' this should work better). But really the part of hte |
| 242 | ;; selector between [...] should simply not be highlighted. | 242 | ;; selector between [...] should simply not be highlighted. |
| 243 | (,(concat "^\\([ \t]*[^@:{\n][^:{\n]+\\(?::" (regexp-opt css-pseudo-ids t) | 243 | (,(concat "^\\([ \t]*[^@:{}\n][^:{}]+\\(?::" (regexp-opt css-pseudo-ids t) |
| 244 | "\\(?:([^)]+)\\)?[^:{\n]*\\)*\\)\\(?:\n[ \t]*\\)*{") | 244 | "\\(?:([^)]+)\\)?[^:{\n]*\\)*\\)\\(?:\n[ \t]*\\)*{") |
| 245 | (1 'css-selector append)) | 245 | (1 'css-selector append)) |
| 246 | ;; In the above rule, we allow the open-brace to be on some subsequent | 246 | ;; In the above rule, we allow the open-brace to be on some subsequent |