branch: master
commit 44c289fa816427565d8a580aeaa7e265ac6f0e52
Author: Dmitry Gutov <[email protected]>
Commit: Dmitry Gutov <[email protected]>
Copy edits
---
NEWS.md | 6 +++---
js2-mode.el | 20 +++++++++++---------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index d309168..5cf87f0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,9 +3,9 @@
## Next
* Support for ES7 exponentiation operator.
-* The `js2-include-?-externs` are now evaluated on demand.
- In particular, they can now effectively be used
- as file- or directory-local variables.
+* `js2-include-*-externs` are now evaluated on demand. As a result,
+ they can now be effectively used as file- or directory-local
+ variables.
## 2016-06-23
diff --git a/js2-mode.el b/js2-mode.el
index 518fd26..7d52e07 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -115,7 +115,7 @@
decodeURI decodeURIComponent encodeURI
encodeURIComponent escape eval isFinite isNaN
parseFloat parseInt undefined unescape))
-"Ecma-262 externs. Never highlighted by `js2-highlight-undeclared-vars'.")
+"Ecma-262 externs. Never highlighted as undeclared variables.")
(defvar js2-browser-externs
(mapcar 'symbol-name
@@ -7072,18 +7072,20 @@ later. NODE must be a name node."
(defun js2-highlight-undeclared-vars ()
"After entire parse is finished, look for undeclared variable references.
We have to wait until entire buffer is parsed, since JavaScript permits var
-decls to occur after they're used.
+declarations to occur after they're used.
Some identifiers may be assumed to be externally defined.
These externs are not highlighted, even if there is no declaration
-for them in the source code.
+for them in the source code (in the current file).
+
The list of externs consists of the following:
-- the list `js2-ecma262-externs' for basic names from the ECMAScript language
standard
-- depending on the buffer-local variables `js2-include-?-externs'
- the corresponding `js2-?-externs' to add names for certain environments
- like the browser or node/rhino
-- two user-customizable lists `js2-global-externs' and `js2-additional-externs'
- of which the latter is a buffer-local variable
+
+ - `js2-ecma262-externs' for basic names from the ECMAScript language
standard.
+ - Depending on the buffer-local variables `js2-include-*-externs'
+ the corresponding `js2-*-externs' to add names for certain environments
+ like the browser, Node or Rhino.
+ - Two customizable lists `js2-global-externs' and `js2-additional-externs',
+ the latter of which should be set per-buffer.
See especially `js2-additional-externs' for further details about externs."
(let ((default-externs
