Merge from origin/emacs-25

b787d55 More format-time-string change fixups
13c8f29 make-xwidget unused arg cleanup
36e05f0 Remove unused arguments from make-xwidget
1042217 Document incompatible changes in 'format-time-string'
7228eb8 Improve documentation of byte-code objects
0020047 Adapt calls to 'format-time-string' to changes in Emacs 25
17b5152 Improve vc-diff with Git backend
c28f87a (js--continued-expression-p): Special-case unary plus and minus
2d02a5f ; * lisp/vc/vc-annotate.el (vc-annotate): Clarify commentary.
9151f16 Prevent C++ Mode wrongly fontifying some identifiers near tem...
b3b523c Avoid crashes due to insanely large columns in tabulated-list...
a3daa34 Teach M-x disassemble a default argument.
e30c3e9 Fix EOL decoding in vc-annotate with SVN back-end on MS-Windows
df441b3 Fix OS X specific settings in tramp-tests
2244331 Finish fixing a cacheing bug in CC Mode (see 2016-03-09)

# Conflicts:
#	lisp/net/tramp-sh.el
#	lisp/progmodes/cc-engine.el

1 files changed, 6 insertions, 0 deletions

diff --git a/test/manual/indent/js.js b/test/manual/indent/js.js
index d843f615fd8..61c7b440ea3 100644
--- a/test/manual/indent/js.js
+++ b/test/manual/indent/js.js
@@ -95,6 +95,12 @@ Foobar
     console.log(num);
   });
 
+var arr = [
+  -1, 2,
+  -3, 4 +
+    -5
+];
+
 // Local Variables:
 // indent-tabs-mode: nil
 // js-indent-level: 2