diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-10-07 11:40:24 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-10-07 11:40:24 -0400 |
| commit | bdc6b4c8f6953c561317abf1bad7fc0c0cd069de (patch) | |
| tree | b4b44773a24f11a5300e129c454807706497e43e /lisp/textmodes/css-mode.el | |
| parent | 764636db721a3e8a56a33ade742a56d6956c0752 (diff) | |
| download | emacs-bdc6b4c8f6953c561317abf1bad7fc0c0cd069de.tar.gz emacs-bdc6b4c8f6953c561317abf1bad7fc0c0cd069de.tar.bz2 emacs-bdc6b4c8f6953c561317abf1bad7fc0c0cd069de.zip | |
* lisp/textmodes/css-mode.el (css-smie-rules): Fix indentation.
(css-mode): Use electric-indent-chars.
Fixes: debbugs:15467
Diffstat (limited to 'lisp/textmodes/css-mode.el')
| -rw-r--r-- | lisp/textmodes/css-mode.el | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 0f4daa9a35c..e8271725875 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -302,7 +302,7 @@ (pcase (cons kind token) (`(:elem . basic) css-indent-offset) (`(:elem . arg) 0) - (`(:list-intro . "") t) ;"" stands for BOB (bug#15467). + (`(:list-intro . ,(or `";" `"")) t) ;"" stands for BOB (bug#15467). (`(:before . "{") (if (smie-rule-hanging-p) (smie-rule-parent 0))))) @@ -321,12 +321,8 @@ (smie-setup css-smie-grammar #'css-smie-rules :forward-token #'css-smie--forward-token :backward-token #'css-smie--backward-token) - (when css-electric-keys - (let ((fc (make-char-table 'auto-fill-chars))) - (set-char-table-parent fc auto-fill-chars) - (dolist (c css-electric-keys) - (aset fc c 'indent-according-to-mode)) - (setq-local auto-fill-chars fc)))) + (setq-local electric-indent-chars + (append css-electric-keys electric-indent-chars))) (defvar comment-continue) |