diff options
| author | Stefan Monnier | 2013-10-04 17:45:37 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-10-04 17:45:37 -0400 |
| commit | a27c1b72c5d444f591b179d89ab329faee4555b6 (patch) | |
| tree | 06f42b309ca3590f0124929af1d13ed323a3b5fd /lisp | |
| parent | 258ab3bc882036e9b3d85d73d1f22bc29f42f979 (diff) | |
| download | emacs-a27c1b72c5d444f591b179d89ab329faee4555b6.tar.gz emacs-a27c1b72c5d444f591b179d89ab329faee4555b6.zip | |
* lisp/textmodes/css-mode.el (css-smie-rules): Toplevel's a list.
* test/automated/completion-tests.el:
* test/indent/css-mode.css: New files.
Fixes: debbugs:15467
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/textmodes/css-mode.el | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 253f90278cd..2f996cba224 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2013-10-04 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2013-10-04 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * textmodes/css-mode.el (css-smie-rules): Toplevel's a list (bug#15467). | ||
| 4 | |||
| 5 | 2013-10-04 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 6 | |||
| 3 | * subr.el (read-passwd): Hide chars even when called within a context | 7 | * subr.el (read-passwd): Hide chars even when called within a context |
| 4 | where after-change-functions is disabled (bug#15501). | 8 | where after-change-functions is disabled (bug#15501). |
| 5 | (set-temporary-overlay-map): Don't remove oneself from pre-command-hook | 9 | (set-temporary-overlay-map): Don't remove oneself from pre-command-hook |
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 9c32604b4f4..0f4daa9a35c 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el | |||
| @@ -302,6 +302,7 @@ | |||
| 302 | (pcase (cons kind token) | 302 | (pcase (cons kind token) |
| 303 | (`(:elem . basic) css-indent-offset) | 303 | (`(:elem . basic) css-indent-offset) |
| 304 | (`(:elem . arg) 0) | 304 | (`(:elem . arg) 0) |
| 305 | (`(:list-intro . "") t) ;"" stands for BOB (bug#15467). | ||
| 305 | (`(:before . "{") (if (smie-rule-hanging-p) | 306 | (`(:before . "{") (if (smie-rule-hanging-p) |
| 306 | (smie-rule-parent 0))))) | 307 | (smie-rule-parent 0))))) |
| 307 | 308 | ||