From: Glenn Morris <rgm@gnu.org>
Date: Tue, 10 Mar 2015 22:40:09 +0000 (-0400)
Subject: * lisp/progmodes/js.el (js-indent-first-initialiser): Fix doc, type, version.
X-Git-Tag: emacs-25.0.90~2564^2~179
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c9681afe9d7296bc984f602a26cf78d577fcc1e;p=emacs.git

* 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.
---

diff --git a/etc/NEWS b/etc/NEWS
index ad8b6f27812..6f59064560e 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 c7cf53df5e0..5184167ecd8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,16 +1,12 @@
-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'.
+2015-03-10  Glenn Morris  <rgm@gnu.org>
 
-	* 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  <jackson@jacksonrayhamilton.com>
 
-	* 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>
 
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 27e67bb77c1..7e547428da9 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 03cc2818478..93ee3c5bc16 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -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, ...