[Emacs-diffs] trunk r114560: * lisp/textmodes/css-mode.el (css-smie-rules): Fix indentation.

[Stefan Monnier]

------------------------------------------------------------
revno: 114560
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15467
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-10-07 11:40:24 -0400
message:
  * lisp/textmodes/css-mode.el (css-smie-rules): Fix indentation.
  (css-mode): Use electric-indent-chars.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/textmodes/css-mode.el     cssmode.el-20091113204419-o5vbwnq5f7feedwu-5050
  test/indent/css-mode.css       cssmode.css-20131004214415-leh4zls88xu60yhv-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-07 13:54:48 +0000
+++ b/lisp/ChangeLog    2013-10-07 15:40:24 +0000
@@ -1,5 +1,8 @@
 2013-10-07  Stefan Monnier  <address@hidden>
 
+       * 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.

=== modified file 'lisp/textmodes/css-mode.el'
--- a/lisp/textmodes/css-mode.el        2013-10-04 21:45:37 +0000
+++ b/lisp/textmodes/css-mode.el        2013-10-07 15:40:24 +0000
@@ -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)
 

=== modified file 'test/indent/css-mode.css'
--- a/test/indent/css-mode.css  2013-10-04 21:45:37 +0000
+++ b/test/indent/css-mode.css  2013-10-07 15:40:24 +0000
@@ -1,3 +1,11 @@
 .xxx
 {
 }
+
+.x2
+{
+}
+
+div.x3
+{
+}