Merge from origin/emacs-25

[gnu-emacs] / test / manual / indent / scss-mode.scss

diff --git a/test/manual/indent/scss-mode.scss b/test/manual/indent/scss-mode.scss
index 02a4a98a8c57d6fbe72c2e9d943a229bae58dbdb..e1ec90a529985b6fd7ba5de04b529ac84cb448c8 100644 (file)
--- a/test/manual/indent/scss-mode.scss
+++ b/test/manual/indent/scss-mode.scss
@@ -40,11 +40,20 @@ p.#{$name} var
 }
 article[role="main"] {
     $toto: 500 !global;
-    float: left;
+    $var-with-default: 300 !default;
+    float: left !important;
     width: 600px / 888px * 100%;
     height: 100px / 888px * 100%;
 }
 
+%placeholder {
+    color: #f0f0f0;
+}
+
+button {
+    @extend %placeholder !optional;
+}
+
 @import 'reset';
 
 @mixin border-radius($radius) {