3 files changed, 84 insertions, 12 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index ea11f9429f0..a5ac25a92a1 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * indent/scss-mode.scss: New file.
+        * indent/css-mode.css: Add a few uneventful examples.
+
 2014-10-15  Eli Zaretskii  <eliz@gnu.org>
 
         * BidiCharacterTest.txt: New file, from Unicode.
@@ -28,8 +33,8 @@
 
 2014-09-26  Leo Liu  <sdl.web@gmail.com>
 
-        * automated/cl-lib.el (cl-digit-char-p, cl-parse-integer): New
-        tests.  (Bug#18557)
+        * automated/cl-lib.el (cl-digit-char-p, cl-parse-integer):
+        New tests.  (Bug#18557)
 
 2014-09-24  Ulf Jasper  <ulf.jasper@web.de>
 
@@ -39,8 +44,8 @@
 
 2014-09-09  Eli Zaretskii  <eliz@gnu.org>
 
-        * automated/fns-tests.el (fns-tests-collate-sort): Bind
-        w32-collate-ignore-punctuation to t when sorting according to
+        * automated/fns-tests.el (fns-tests-collate-sort):
+        Bind w32-collate-ignore-punctuation to t when sorting according to
         UTS#10 rules.
 
 2014-09-07  Michael Albinus  <michael.albinus@gmx.de>
@@ -555,8 +560,8 @@
 
         * automated/subword-tests.el (subword-tests2): More subword tests.
 
-        * automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
-        test: correct parsing of keyword arguments.
+        * automated/cl-lib.el (cl-lib-keyword-names-versus-values):
+        New test: correct parsing of keyword arguments.
 
 2014-03-22  Dmitry Gutov  <dgutov@yandex.ru>
 
@@ -651,8 +656,8 @@
 
 2014-02-17  Michael Albinus  <michael.albinus@gmx.de>
 
-        * automated/tramp-tests.el (tramp-test28-shell-command): Perform
-        an initial `sit-for' prior the while loop.
+        * automated/tramp-tests.el (tramp-test28-shell-command):
+        Perform an initial `sit-for' prior the while loop.
 
 2014-02-16  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -674,8 +679,8 @@
 
         * automated/tramp-tests.el (tramp-test26-process-file): Improve test.
         (tramp-test27-start-file-process): Use "_p" as argument of lambda.
-        (tramp-test28-shell-command): Improve `shell-command' test.  Add
-        `async-shell-command' tests.
+        (tramp-test28-shell-command): Improve `shell-command' test.
+        Add `async-shell-command' tests.
 
 2014-02-04  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -731,8 +736,8 @@
 
 2014-01-13  Michael Albinus  <michael.albinus@gmx.de>
 
-        * automated/ert-tests.el (ert-test-record-backtrace): Reenable
-        test case with adapted test string.  (Bug#13064)
+        * automated/ert-tests.el (ert-test-record-backtrace):
+        Reenable test case with adapted test string.  (Bug#13064)
 
 2013-12-28  Glenn Morris  <rgm@gnu.org>
 
diff --git a/test/indent/css-mode.css b/test/indent/css-mode.css
index 4dbab06975c..564ac16f954 100644
--- a/test/indent/css-mode.css
+++ b/test/indent/css-mode.css
@@ -1,7 +1,17 @@
+/* asdfasdf */
+
 .xxx
 {
 }
 
+article[role="main"] {
+    width: 60%;
+}
+
+/* asdfasdf */
+@foo x2 {
+    bla:toto;
+}
 .x2
 {
     foo: bar;
diff --git a/test/indent/scss-mode.scss b/test/indent/scss-mode.scss
new file mode 100644
index 00000000000..7a29929efca
--- /dev/null
+++ b/test/indent/scss-mode.scss
@@ -0,0 +1,57 @@
+// Comment!
+
+nav {
+    ul {
+        margin: 0;              /* More comment */
+        padding: 0;
+        list-style: none;
+    }
+
+    li { display: inline-block; }
+
+    a {
+        display: block;
+        padding: 6px 12px;
+        text-decoration: none;
+    }
+}
+nav ul {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+
+nav li {
+  display: inline-block;
+}
+
+nav a var
+{
+  display: block;
+  padding: 6px 12px;
+  text-decoration: none;
+}
+
+$name: foo;
+$attr: border;
+p.#{$name} var
+{
+    x#{$attr}-color: blue;
+}
+article[role="main"] {
+    $toto: 500 !global;
+    float: left;
+    width: 600px / 888px * 100%;
+    height: 100px / 888px * 100%;
+}
+
+@import 'reset';
+
+@mixin border-radius($radius) {
+    -webkit-border-radius: $radius;
+    -moz-border-radius: $radius;
+    -ms-border-radius: $radius;
+    border-radius: $radius;
+}
+
+.box { @include border-radius(10px); }