diff options
| author | Simen Heggestøyl <simenheg@gmail.com> | 2015-02-09 12:26:14 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-02-09 12:26:14 -0500 |
| commit | 42c99697b685a908abb587d2b73878df25e9c34f (patch) | |
| tree | 89976acdcec8a9905320c2a99162a2b7f2482161 | |
| parent | cbf1c1f2c7d38b732c3e76c677478ed30a4fee14 (diff) | |
| download | emacs-42c99697b685a908abb587d2b73878df25e9c34f.tar.gz | |
Fixes: debbugs:19815
* lisp/textmodes/css-mode.el (css-smie-rules): Fix paren indent.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/textmodes/css-mode.el | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e86d62da05a..12d4c944f47 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-02-09 Simen Heggestøyl <simenheg@gmail.com> (tiny change) + + * textmodes/css-mode.el (css-smie-rules): Fix paren indent (bug#19815). + 2015-02-09 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/cl-generic.el (cl--generic-lambda): Use macroexp-parse-body. diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index f6a3ca64dd9..44dc4dff3de 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -331,8 +331,8 @@ (`(:elem . basic) css-indent-offset) (`(:elem . arg) 0) (`(:list-intro . ,(or `";" `"")) t) ;"" stands for BOB (bug#15467). - (`(:before . "{") (if (smie-rule-hanging-p) - (smie-rule-parent 0))))) + (`(:before . ,(or "{" "(")) + (if (smie-rule-hanging-p) (smie-rule-parent 0))))) ;;;###autoload (define-derived-mode css-mode fundamental-mode "CSS" |