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>
** 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.
+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>
* progmodes/js.el (js-indent-first-initialiser):
(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
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
* 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.
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):
new function.
(c-guess-basic-syntax): New CASE 5R (extracted from 5B) to handle
2012-09-09 Alan Mackenzie <acm@muc.de>
* 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\)?.
(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.
: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 = {
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
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
(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
+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>
* indent/js.js: Add local variables.
+++ /dev/null
-var foo = function() {
- return 7;
-};
-
-var foo = function() {
- return 7;
- },
- bar = 8;
-
-var foo = function() {
- return 7;
- },
- bar = function() {
- return 8;
- };
-
-// Local Variables:
-// indent-tabs-mode: nil
-// js-indent-level: 2
-// js-indent-first-initialiser: dynamic
-// End:
-
-// The following test intentionally produces a scan error and should
-// be placed below all other tests to prevent awkward indentation.
-// (It still thinks it's within the body of a function.)
-
-var foo = function() {
- return 7;
- ,
- bar = 8;
+++ /dev/null
-var foo = function() {
- return 7;
- };
-
-var foo = function() {
- return 7;
- },
- bar = 8;
-
-var foo = function() {
- return 7;
- },
- bar = function() {
- return 8;
- };
-
-// Local Variables:
-// indent-tabs-mode: nil
-// js-indent-level: 2
-// js-indent-first-initialiser: t
-// End:
--- /dev/null
+var foo = function() {
+ return 7;
+};
+
+var foo = function() {
+ return 7;
+ },
+ bar = 8;
+
+var foo = function() {
+ return 7;
+ },
+ bar = function() {
+ return 8;
+ };
+
+// Local Variables:
+// indent-tabs-mode: nil
+// js-indent-level: 2
+// js-indent-first-initializer: dynamic
+// End:
+
+// The following test intentionally produces a scan error and should
+// be placed below all other tests to prevent awkward indentation.
+// (It still thinks it's within the body of a function.)
+
+var foo = function() {
+ return 7;
+ ,
+ bar = 8;
--- /dev/null
+var foo = function() {
+ return 7;
+ };
+
+var foo = function() {
+ return 7;
+ },
+ bar = 8;
+
+var foo = function() {
+ return 7;
+ },
+ bar = function() {
+ return 8;
+ };
+
+// Local Variables:
+// indent-tabs-mode: nil
+// js-indent-level: 2
+// js-indent-first-init: t
+// End:
projects / emacs.git / commitdiff