aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2015-03-08 20:30:23 +0200
committerDmitry Gutov2015-03-08 20:30:23 +0200
commitd03ec1cf1662e3dc911439f09e64e8a5a3754832 (patch)
tree6bf5a35d15678a6171c65257f75af2673e2fa074
parent126cd1461a6a6d2a9b5363b2f2628c15fe063f57 (diff)
downloademacs-d03ec1cf1662e3dc911439f09e64e8a5a3754832.tar.gz
emacs-d03ec1cf1662e3dc911439f09e64e8a5a3754832.zip
Fix test/indent/js.js
* test/indent/js.js: Set `js-indent-level' to 2. Fix indentation in an example.
-rw-r--r--test/ChangeLog5
-rw-r--r--test/indent/js.js4
2 files changed, 8 insertions, 1 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index a9c20f6fbfa..92ce4b62a0b 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
12015-03-08 Dmitry Gutov <dgutov@yandex.ru>
2
3 * indent/js.js: Set `js-indent-level' to 2. Fix indentation in an
4 example.
5
12015-03-04 Michael Albinus <michael.albinus@gmx.de> 62015-03-04 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * automated/tramp-tests.el (top): Declare `tramp-get-remote-stat' 8 * automated/tramp-tests.el (top): Declare `tramp-get-remote-stat'
diff --git a/test/indent/js.js b/test/indent/js.js
index d330fa06d5b..f41849da284 100644
--- a/test/indent/js.js
+++ b/test/indent/js.js
@@ -1,3 +1,5 @@
1// -*- js-indent-level: 2 -*-
2
1var a = 1; 3var a = 1;
2b = 2; 4b = 2;
3 5
@@ -9,7 +11,7 @@ var e = 100500,
9 11
10function test () 12function test ()
11{ 13{
12 return /[/]/.test ('/') // (bug#19397) 14 return /[/]/.test ('/') // (bug#19397)
13} 15}
14 16
15var f = bar('/protocols/') 17var f = bar('/protocols/')