diff options
| author | K. Handa | 2015-09-01 20:46:15 +0900 |
|---|---|---|
| committer | K. Handa | 2015-09-01 20:46:15 +0900 |
| commit | 3e0e2339cd379eeba8d9bc758f2e8e574144e252 (patch) | |
| tree | 9d119efed6e52e5c24dbd84836148157271799a8 /lisp/textmodes/css-mode.el | |
| parent | 524eeb2e5e158d98ea52fe5ebe4768c4433ba8b2 (diff) | |
| parent | ff0a92f6461941902eb9e974bdd2ff9adacb7bc4 (diff) | |
| download | emacs-3e0e2339cd379eeba8d9bc758f2e8e574144e252.tar.gz emacs-3e0e2339cd379eeba8d9bc758f2e8e574144e252.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/textmodes/css-mode.el')
| -rw-r--r-- | lisp/textmodes/css-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index d73780caf36..639456dc77e 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el | |||
| @@ -344,7 +344,7 @@ | |||
| 344 | (`(:elem . arg) 0) | 344 | (`(:elem . arg) 0) |
| 345 | (`(:list-intro . ,(or `";" `"")) t) ;"" stands for BOB (bug#15467). | 345 | (`(:list-intro . ,(or `";" `"")) t) ;"" stands for BOB (bug#15467). |
| 346 | (`(:before . "{") | 346 | (`(:before . "{") |
| 347 | (when (smie-rule-hanging-p) | 347 | (when (or (smie-rule-hanging-p) (smie-rule-bolp)) |
| 348 | (smie-backward-sexp ";") | 348 | (smie-backward-sexp ";") |
| 349 | (smie-indent-virtual))) | 349 | (smie-indent-virtual))) |
| 350 | (`(:before . ,(or "{" "(")) | 350 | (`(:before . ,(or "{" "(")) |