procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/progmodes/js.el (js-indent-first-initialiser): Fix doc, type, version.

Browse source 
First line of the doc string should be a complete sentence.

* etc/NEWS: Mention new option.

# Fix associated ChangeLog entries.
This commit is contained in:
Glenn Morris 2015-03-10 18:40:09 -04:00
parent 8db37916ca
commit 6c9681afe9
4 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/NEWS
View file

@ -389,6 +389,8 @@ The remainder were:
** New ERT function `ert-summarize-tests-batch-and-exit'.
** New js.el option `js-indent-first-initialiser'.
---
** `Info-fontify-maximum-menu-size' can be t for no limit.

18
lisp/ChangeLog
View file

@ -1,16 +1,12 @@
2015-03-10 Glenn Morris <rgm@gnu.org>
* progmodes/js.el (js-indent-first-initialiser):
Fix doc, type, version.
2015-03-10 Jackson Ray Hamilton <jackson@jacksonrayhamilton.com>
* lisp/progmodes/js.el (js--proper-indentation): Add new custom
option `js-indent-first-initialiser' and a function to utilize it,
`js--maybe-goto-declaration-keyword-end'.
* test/indent/js.js: Add local variables.
* test/indent/js-indent-first-initialiser-t.js: New test for
`js-indent-first-initialiser'.
* test/indent/js-indent-first-initialiser-dynamic.js: New test for
`js-indent-first-initialiser'.
* progmodes/js.el (js-indent-first-initialiser): New option.
(js--maybe-goto-declaration-keyword-end): New function.
2015-03-10 Thomas Fitzsimmons <fitzsim@fitzsim.org>

18
lisp/progmodes/js.el
View file

@ -510,12 +510,9 @@ getting timeout messages."
:group 'js)
(defcustom js-indent-first-initialiser nil
"Specially indent the first variable declaration's initialiser
in variable statements.
"Non-nil means specially indent the first variable declaration's initialiser.
Normally, the first declaration's initialiser is unindented, and
subsequent declarations have their identifiers lined up against
the first:
subsequent declarations have their identifiers aligned with it:
var o = {
foo: 3
@ -526,8 +523,8 @@ the first:
},
bar = 2;
When t, always indent the first declaration's initialiser by an
additional level:
If this option has the value t, indent the first declaration's
initialiser by an additional level:
var o = {
foo: 3
@ -538,8 +535,8 @@ additional level:
},
bar = 2;
When `dynamic', if there is only one declaration, don't indent
the first one's initialiser; otherwise, indent it.
If this option has the value `dynamic', if there is only one declaration,
don't indent the first one's initialiser; otherwise, indent it.
var o = {
foo: 3
@ -549,7 +546,8 @@ the first one's initialiser; otherwise, indent it.
foo: 3
},
bar = 2;"
:type 'boolean
:version "25.1"
:type '(choice (const nil) (const t) (const dynamic))
:safe 'symbolp
:group 'js)

8
test/ChangeLog
View file

@ -1,3 +1,11 @@
2015-03-10 Jackson Ray Hamilton <jackson@jacksonrayhamilton.com>
* indent/js.js: Add local variables.
* indent/js-indent-first-initialiser-t.js:
* indent/js-indent-first-initialiser-dynamic.js:
New tests for `js-indent-first-initialiser'.
2015-03-10 Przemyslaw Wojnowski <esperanto@cumego.com>
* automated/cl-lib-tests.el: Add tests for plusp, second, ...