[Emacs-diffs] master 6c9681a 2/2: * lisp/progmodes/js.el (js-indent-first-initialiser): Fix doc, type, version.

[Glenn Morris]

branch: master
commit 6c9681afe9d7296bc984f602a26cf78d577fcc1e
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * lisp/progmodes/js.el (js-indent-first-initialiser): Fix doc, type, 
version.
    First line of the doc string should be a complete sentence.
    
    * etc/NEWS: Mention new option.
    
    # Fix associated ChangeLog entries.
---
 etc/NEWS             |    2 ++
 lisp/ChangeLog       |   16 ++++++----------
 lisp/progmodes/js.el |   18 ++++++++----------
 test/ChangeLog       |    8 ++++++++
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index ad8b6f2..6f59064 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -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.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7cf53d..5184167 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,16 +1,12 @@
-2015-03-10  Jackson Ray Hamilton  <address@hidden>
-
-       * 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'.
+2015-03-10  Glenn Morris  <address@hidden>
 
-       * test/indent/js.js: Add local variables.
+       * progmodes/js.el (js-indent-first-initialiser):
+       Fix doc, type, version.
 
-       * test/indent/js-indent-first-initialiser-t.js: New test for
-       `js-indent-first-initialiser'.
+2015-03-10  Jackson Ray Hamilton  <address@hidden>
 
-       * 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  <address@hidden>
 
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 27e67bb..7e54742 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -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)
 
diff --git a/test/ChangeLog b/test/ChangeLog
index 03cc281..93ee3c5 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-10  Jackson Ray Hamilton  <address@hidden>
+
+       * 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  <address@hidden>
 
        * automated/cl-lib-tests.el: Add tests for plusp, second, ...