[Emacs-diffs] master 2a1be9e: Prefer "initialize" to "initialise"

[Paul Eggert]

branch: master
commit 2a1be9eb2361f705e61839b78e8bba1d841944f6
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Prefer "initialize" to "initialise"
    
    * lisp/progmodes/js.el (js-indent-first-init):
    Rename from js-indent-first-initialiser, to avoid worrying about
    American vs British spelling.  All uses changed.
    * test/indent/js-indent-init-t.js: Rename from
    indent/js-indent-first-initialiser-t.js.
    * test/indent/js-indent-init-dynamic.js: Rename from
    test/indent/js-indent-first-initialiser-dynamic.js.
---
 ChangeLog                                          |    2 +-
 etc/NEWS                                           |    2 +-
 lisp/ChangeLog                                     |   15 +++++++++++----
 lisp/ChangeLog.16                                  |    4 ++--
 lisp/progmodes/js.el                               |   16 ++++++++--------
 test/ChangeLog                                     |    8 ++++++++
 ...aliser-dynamic.js => js-indent-init-dynamic.js} |    2 +-
 ...-first-initialiser-t.js => js-indent-init-t.js} |    2 +-
 8 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e5c922..4f6523e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -394,7 +394,7 @@
 
 2014-11-25  Glenn Morris  <address@hidden>
 
-       * configure.ac: Fix yesterday's use of uninitialised $version.
+       * configure.ac: Fix yesterday's use of uninitialized $version.
 
 2014-11-25  Oscar Fuentes  <address@hidden>
 
diff --git a/etc/NEWS b/etc/NEWS
index 6f59064..75d55de 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -389,7 +389,7 @@ The remainder were:
 
 ** New ERT function `ert-summarize-tests-batch-and-exit'.
 
-** New js.el option `js-indent-first-initialiser'.
+** New js.el option `js-indent-first-init'.
 
 ---
 ** `Info-fontify-maximum-menu-size' can be t for no limit.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b798e14..b25988d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-10  Paul Eggert  <address@hidden>
+
+       Prefer "initialize" to "initialise"
+       * progmodes/js.el (js-indent-first-init):
+       Rename from js-indent-first-initialiser, to avoid worrying about
+       American vs British spelling.  All uses changed.
+
 2015-03-10  Glenn Morris  <address@hidden>
 
        * progmodes/js.el (js-indent-first-initialiser):
@@ -4551,7 +4558,7 @@
        (tildify-foreach-region-function): New variable specifying
        a function determining portions of buffer that should be
        tildified.  It allows major modes to create a filtering function
-       more elaborate than a set of regular expressions.  Initialised to
+       more elaborate than a set of regular expressions.  Initialized to
        `tildify--deprecated-ignore-evironments' by default to handle now
        deprecated `tildify-ignored-environments-alist' variable.
        (tildify--foreach-region): A new function that takes
@@ -9015,7 +9022,7 @@
        file-format 2 --- ie. no local printers --- and 3 --- i.e. may have
        local printers.
        (ses-localvars): Add local variables needed for local printer handling.
-       (ses-set-localvars): Handle hashmap initialisation.
+       (ses-set-localvars): Handle hashmap initialization.
        (ses-paramlines-plist): Add param-line for number of local printers.
        (ses-paramfmt-plist): New defconst, needed for code factorization
        between functions `ses-set-parameter' and
@@ -12275,7 +12282,7 @@
        * progmodes/cc-mode.el (c-initialize-cc-mode): Add CC Mode hooks
        to electric-indent-{,local-}-mode.
        (c-basic-common-init): Set electric-indent-inhibit.
-       Initialise c-electric-flag from electric-indent-mode.
+       Initialize c-electric-flag from electric-indent-mode.
        (c-electric-indent-mode-hook, c-electric-indent-local-mode-hook):
        New hook functions which propagate electric-indent-mode to CC mode.
 
@@ -24212,7 +24219,7 @@
 
 2013-04-30  Alan Mackenzie  <address@hidden>
 
-       Handle arbitrarily long C++ member initialisation lists.
+       Handle arbitrarily long C++ member initialization lists.
        * progmodes/cc-engine.el (c-back-over-member-initializers):
        new function.
        (c-guess-basic-syntax): New CASE 5R (extracted from 5B) to handle
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index 14ee914..bf8a973 100644
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -6751,7 +6751,7 @@
 2012-09-09  Alan Mackenzie  <address@hidden>
 
        * progmodes/cc-engine.el (c-state-cache-init):
-       Initialise c-state-semi-nonlit-pos-cache\(-limit\)? properly.
+       Initialize c-state-semi-nonlit-pos-cache\(-limit\)? properly.
        (c-record-parse-state-state):
        Record c-state-semi-nonlit-pos-cache\(-limit\)?.
 
@@ -15662,7 +15662,7 @@
        (c-nonlabel-token-key): Allow string literals for AWK.
        Refactor for the other modes.
 
-       Large brace-block initialisation makes CC Mode slow: Fix.
+       Large brace-block initialization makes CC Mode slow: Fix.
        Tidy up and accelerate c-in-literal, etc. by using the c-parse-state
        routines.  Limit backward searching in c-font-lock-enclosing.decl.
 
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 7e54742..ff00298 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -509,9 +509,9 @@ getting timeout messages."
   :type 'integer
   :group 'js)
 
-(defcustom js-indent-first-initialiser nil
-  "Non-nil means specially indent the first variable declaration's initialiser.
-Normally, the first declaration's initialiser is unindented, and
+(defcustom js-indent-first-init nil
+  "Non-nil means specially indent the first variable declaration's initializer.
+Normally, the first declaration's initializer is unindented, and
 subsequent declarations have their identifiers aligned with it:
 
   var o = {
@@ -524,7 +524,7 @@ subsequent declarations have their identifiers aligned with 
it:
       bar = 2;
 
 If this option has the value t, indent the first declaration's
-initialiser by an additional level:
+initializer by an additional level:
 
   var o = {
           foo: 3
@@ -536,7 +536,7 @@ initialiser by an additional level:
       bar = 2;
 
 If this option has the value `dynamic', if there is only one declaration,
-don't indent the first one's initialiser; otherwise, indent it.
+don't indent the first one's initializer; otherwise, indent it.
 
   var o = {
       foo: 3
@@ -1902,14 +1902,14 @@ In particular, return the buffer position of the first 
`for' kwd."
 
 (defun js--maybe-goto-declaration-keyword-end (parse-status)
   "Helper function for `js--proper-indentation'.
-Depending on the value of `js-indent-first-initialiser', move
+Depending on the value of `js-indent-first-init', move
 point to the end of a variable declaration keyword so that
 indentation is aligned to that column."
   (cond
-   ((eq js-indent-first-initialiser t)
+   ((eq js-indent-first-init t)
     (when (looking-at js--declaration-keyword-re)
       (goto-char (1+ (match-end 0)))))
-   ((eq js-indent-first-initialiser 'dynamic)
+   ((eq js-indent-first-init 'dynamic)
     (let ((bracket (nth 1 parse-status))
           declaration-keyword-end
           at-closing-bracket-p
diff --git a/test/ChangeLog b/test/ChangeLog
index 93ee3c5..fba6cfc 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-10  Paul Eggert  <address@hidden>
+
+       Prefer "initialize" to "initialise"
+       * indent/js-indent-init-t.js: Rename from
+       indent/js-indent-first-initialiser-t.js.
+       * indent/js-indent-init-dynamic.js: Rename from
+       test/indent/js-indent-first-initialiser-dynamic.js.
+
 2015-03-10  Jackson Ray Hamilton  <address@hidden>
 
        * indent/js.js: Add local variables.
diff --git a/test/indent/js-indent-first-initialiser-dynamic.js 
b/test/indent/js-indent-init-dynamic.js
similarity index 92%
rename from test/indent/js-indent-first-initialiser-dynamic.js
rename to test/indent/js-indent-init-dynamic.js
index 9c705db..f330c2c 100644
--- a/test/indent/js-indent-first-initialiser-dynamic.js
+++ b/test/indent/js-indent-init-dynamic.js
@@ -17,7 +17,7 @@ var foo = function() {
 // Local Variables:
 // indent-tabs-mode: nil
 // js-indent-level: 2
-// js-indent-first-initialiser: dynamic
+// js-indent-first-initializer: dynamic
 // End:
 
 // The following test intentionally produces a scan error and should
diff --git a/test/indent/js-indent-first-initialiser-t.js 
b/test/indent/js-indent-init-t.js
similarity index 88%
rename from test/indent/js-indent-first-initialiser-t.js
rename to test/indent/js-indent-init-t.js
index 2f08527..bb75542 100644
--- a/test/indent/js-indent-first-initialiser-t.js
+++ b/test/indent/js-indent-init-t.js
@@ -17,5 +17,5 @@ var foo = function() {
 // Local Variables:
 // indent-tabs-mode: nil
 // js-indent-level: 2
-// js-indent-first-initialiser: t
+// js-indent-first-init: t
 // End: