Commit bdc6b4c8 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/textmodes/css-mode.el (css-smie-rules): Fix indentation.

(css-mode): Use electric-indent-chars.

Fixes: debbugs:15467
parent 764636db
2013-10-07 Stefan Monnier <monnier@iro.umontreal.ca>
* textmodes/css-mode.el (css-smie-rules): Fix indentation (bug#15467).
(css-mode): Use electric-indent-chars.
* nxml/nxml-mode.el: Use lexical-binding and syntax-propertize.
(font-lock-beg, font-lock-end): Move before first use.
(nxml-mode): Use syntax-propertize-function.
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment