Commit 2a1be9eb authored by Paul Eggert's avatar Paul Eggert
Browse files

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.
parent c3ca6a91
...@@ -394,7 +394,7 @@ ...@@ -394,7 +394,7 @@
2014-11-25 Glenn Morris <rgm@gnu.org> 2014-11-25 Glenn Morris <rgm@gnu.org>
* configure.ac: Fix yesterday's use of uninitialised $version. * configure.ac: Fix yesterday's use of uninitialized $version.
2014-11-25 Oscar Fuentes <ofv@wanadoo.es> 2014-11-25 Oscar Fuentes <ofv@wanadoo.es>
......
...@@ -389,7 +389,7 @@ The remainder were: ...@@ -389,7 +389,7 @@ The remainder were:
** New ERT function `ert-summarize-tests-batch-and-exit'. ** 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. ** `Info-fontify-maximum-menu-size' can be t for no limit.
......
2015-03-10 Paul Eggert <eggert@cs.ucla.edu>
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 <rgm@gnu.org> 2015-03-10 Glenn Morris <rgm@gnu.org>
   
* progmodes/js.el (js-indent-first-initialiser): * progmodes/js.el (js-indent-first-initialiser):
...@@ -4551,7 +4558,7 @@ ...@@ -4551,7 +4558,7 @@
(tildify-foreach-region-function): New variable specifying (tildify-foreach-region-function): New variable specifying
a function determining portions of buffer that should be a function determining portions of buffer that should be
tildified. It allows major modes to create a filtering function 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 `tildify--deprecated-ignore-evironments' by default to handle now
deprecated `tildify-ignored-environments-alist' variable. deprecated `tildify-ignored-environments-alist' variable.
(tildify--foreach-region): A new function that takes (tildify--foreach-region): A new function that takes
...@@ -9015,7 +9022,7 @@ ...@@ -9015,7 +9022,7 @@
file-format 2 --- ie. no local printers --- and 3 --- i.e. may have file-format 2 --- ie. no local printers --- and 3 --- i.e. may have
local printers. local printers.
(ses-localvars): Add local variables needed for local printer handling. (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-paramlines-plist): Add param-line for number of local printers.
(ses-paramfmt-plist): New defconst, needed for code factorization (ses-paramfmt-plist): New defconst, needed for code factorization
between functions `ses-set-parameter' and between functions `ses-set-parameter' and
...@@ -12275,7 +12282,7 @@ ...@@ -12275,7 +12282,7 @@
* progmodes/cc-mode.el (c-initialize-cc-mode): Add CC Mode hooks * progmodes/cc-mode.el (c-initialize-cc-mode): Add CC Mode hooks
to electric-indent-{,local-}-mode. to electric-indent-{,local-}-mode.
(c-basic-common-init): Set electric-indent-inhibit. (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): (c-electric-indent-mode-hook, c-electric-indent-local-mode-hook):
New hook functions which propagate electric-indent-mode to CC mode. New hook functions which propagate electric-indent-mode to CC mode.
   
...@@ -24212,7 +24219,7 @@ ...@@ -24212,7 +24219,7 @@
   
2013-04-30 Alan Mackenzie <acm@muc.de> 2013-04-30 Alan Mackenzie <acm@muc.de>
   
Handle arbitrarily long C++ member initialisation lists. Handle arbitrarily long C++ member initialization lists.
* progmodes/cc-engine.el (c-back-over-member-initializers): * progmodes/cc-engine.el (c-back-over-member-initializers):
new function. new function.
(c-guess-basic-syntax): New CASE 5R (extracted from 5B) to handle (c-guess-basic-syntax): New CASE 5R (extracted from 5B) to handle
......
...@@ -6751,7 +6751,7 @@ ...@@ -6751,7 +6751,7 @@
2012-09-09 Alan Mackenzie <acm@muc.de> 2012-09-09 Alan Mackenzie <acm@muc.de>
   
* progmodes/cc-engine.el (c-state-cache-init): * 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): (c-record-parse-state-state):
Record c-state-semi-nonlit-pos-cache\(-limit\)?. Record c-state-semi-nonlit-pos-cache\(-limit\)?.
   
...@@ -15662,7 +15662,7 @@ ...@@ -15662,7 +15662,7 @@
(c-nonlabel-token-key): Allow string literals for AWK. (c-nonlabel-token-key): Allow string literals for AWK.
Refactor for the other modes. 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 Tidy up and accelerate c-in-literal, etc. by using the c-parse-state
routines. Limit backward searching in c-font-lock-enclosing.decl. routines. Limit backward searching in c-font-lock-enclosing.decl.
   
......
...@@ -509,9 +509,9 @@ getting timeout messages." ...@@ -509,9 +509,9 @@ getting timeout messages."
:type 'integer :type 'integer
:group 'js) :group 'js)
(defcustom js-indent-first-initialiser nil (defcustom js-indent-first-init nil
"Non-nil means specially indent the first variable declaration's initialiser. "Non-nil means specially indent the first variable declaration's initializer.
Normally, the first declaration's initialiser is unindented, and Normally, the first declaration's initializer is unindented, and
subsequent declarations have their identifiers aligned with it: subsequent declarations have their identifiers aligned with it:
var o = { var o = {
...@@ -524,7 +524,7 @@ subsequent declarations have their identifiers aligned with it: ...@@ -524,7 +524,7 @@ subsequent declarations have their identifiers aligned with it:
bar = 2; bar = 2;
If this option has the value t, indent the first declaration's If this option has the value t, indent the first declaration's
initialiser by an additional level: initializer by an additional level:
var o = { var o = {
foo: 3 foo: 3
...@@ -536,7 +536,7 @@ initialiser by an additional level: ...@@ -536,7 +536,7 @@ initialiser by an additional level:
bar = 2; bar = 2;
If this option has the value `dynamic', if there is only one declaration, 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 = { var o = {
foo: 3 foo: 3
...@@ -1902,14 +1902,14 @@ In particular, return the buffer position of the first `for' kwd." ...@@ -1902,14 +1902,14 @@ In particular, return the buffer position of the first `for' kwd."
(defun js--maybe-goto-declaration-keyword-end (parse-status) (defun js--maybe-goto-declaration-keyword-end (parse-status)
"Helper function for `js--proper-indentation'. "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 point to the end of a variable declaration keyword so that
indentation is aligned to that column." indentation is aligned to that column."
(cond (cond
((eq js-indent-first-initialiser t) ((eq js-indent-first-init t)
(when (looking-at js--declaration-keyword-re) (when (looking-at js--declaration-keyword-re)
(goto-char (1+ (match-end 0))))) (goto-char (1+ (match-end 0)))))
((eq js-indent-first-initialiser 'dynamic) ((eq js-indent-first-init 'dynamic)
(let ((bracket (nth 1 parse-status)) (let ((bracket (nth 1 parse-status))
declaration-keyword-end declaration-keyword-end
at-closing-bracket-p at-closing-bracket-p
......
2015-03-10 Paul Eggert <eggert@cs.ucla.edu>
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 <jackson@jacksonrayhamilton.com> 2015-03-10 Jackson Ray Hamilton <jackson@jacksonrayhamilton.com>
* indent/js.js: Add local variables. * indent/js.js: Add local variables.
......
...@@ -17,7 +17,7 @@ var foo = function() { ...@@ -17,7 +17,7 @@ var foo = function() {
// Local Variables: // Local Variables:
// indent-tabs-mode: nil // indent-tabs-mode: nil
// js-indent-level: 2 // js-indent-level: 2
// js-indent-first-initialiser: dynamic // js-indent-first-initializer: dynamic
// End: // End:
// The following test intentionally produces a scan error and should // The following test intentionally produces a scan error and should
......
...@@ -17,5 +17,5 @@ var foo = function() { ...@@ -17,5 +17,5 @@ var foo = function() {
// Local Variables: // Local Variables:
// indent-tabs-mode: nil // indent-tabs-mode: nil
// js-indent-level: 2 // js-indent-level: 2
// js-indent-first-initialiser: t // js-indent-first-init: t
// End: // End:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment