]> code.delx.au - gnu-emacs-elpa/log
gnu-emacs-elpa
9 years agoMerge pull request #191 from purcell/cl-lib
Dmitry Gutov [Tue, 30 Dec 2014 15:05:01 +0000 (17:05 +0200)]
Merge pull request #191 from purcell/cl-lib

Replace usage of 'cl with 'cl-lib

9 years agoHighlight methods with font-lock-function-name-face
Dmitry Gutov [Tue, 30 Dec 2014 14:28:17 +0000 (16:28 +0200)]
Highlight methods with font-lock-function-name-face

Fixes #192

9 years agoReplace usage of 'cl with 'cl-lib
Steve Purcell [Mon, 29 Dec 2014 15:32:33 +0000 (15:32 +0000)]
Replace usage of 'cl with 'cl-lib

9 years agoSupport ES6 module syntax
Charles Lowell [Mon, 29 Dec 2014 01:06:12 +0000 (03:06 +0200)]
Support ES6 module syntax

Closes #175

9 years agojs2-parse-for: Reword docstring and comments
Dmitry Gutov [Sun, 28 Dec 2014 20:54:19 +0000 (22:54 +0200)]
js2-parse-for: Reword docstring and comments

9 years agoMake catch-node inherit from scope
Dmitry Gutov [Sun, 28 Dec 2014 20:53:45 +0000 (22:53 +0200)]
Make catch-node inherit from scope

Fixes #190

9 years agoLimit the scope of `with-silent-modifications'
Dmitry Gutov [Wed, 24 Dec 2014 11:47:04 +0000 (13:47 +0200)]
Limit the scope of `with-silent-modifications'

Fixes #188

9 years agoDo not declare fn expression's name in the enclosing scope
Dmitry Gutov [Sun, 7 Dec 2014 05:47:52 +0000 (07:47 +0200)]
Do not declare fn expression's name in the enclosing scope

Fixes #186

9 years agoFix js2-visit-tagged-template
Dmitry Gutov [Sun, 7 Dec 2014 03:52:35 +0000 (05:52 +0200)]
Fix js2-visit-tagged-template

9 years agoAdd js2-language-version check for template literals
Dmitry Gutov [Mon, 1 Dec 2014 13:09:32 +0000 (15:09 +0200)]
Add js2-language-version check for template literals

9 years agoDrop `js2-allow-keywords-as-property-names' and `js2-valid-prop-name-token'
Dmitry Gutov [Mon, 1 Dec 2014 13:03:54 +0000 (15:03 +0200)]
Drop `js2-allow-keywords-as-property-names' and `js2-valid-prop-name-token'

In favor of js2-language-version check and the new function
js2-get-prop-name-token, respectively.

9 years agoParse tagged templates
Dmitry Gutov [Mon, 1 Dec 2014 01:09:58 +0000 (03:09 +0200)]
Parse tagged templates

Closes #153

9 years agoComment the new token types
Dmitry Gutov [Sun, 30 Nov 2014 18:26:28 +0000 (20:26 +0200)]
Comment the new token types

9 years agoNo need to explicitly apply face to string nodes
Dmitry Gutov [Sun, 30 Nov 2014 18:23:32 +0000 (20:23 +0200)]
No need to explicitly apply face to string nodes

9 years agoHandle template substitutions
Dmitry Gutov [Sun, 30 Nov 2014 18:17:48 +0000 (20:17 +0200)]
Handle template substitutions

#153

9 years agoImplement template strings, ignoring substitutions
Dmitry Gutov [Fri, 28 Nov 2014 03:01:26 +0000 (05:01 +0200)]
Implement template strings, ignoring substitutions

Issue #153

9 years agojs2-imenu-extension-styles: Turn into defvar
Chen Bin [Sat, 22 Nov 2014 01:41:21 +0000 (03:41 +0200)]
js2-imenu-extension-styles: Turn into defvar

Closes #169

9 years agojs2-parse-plain-property: Disallow numbers as abbreviated props
Dmitry Gutov [Fri, 21 Nov 2014 15:30:41 +0000 (17:30 +0200)]
js2-parse-plain-property: Disallow numbers as abbreviated props

9 years agojs2-parse-named-prop: Highlight externals in abbreviated props
Dmitry Gutov [Fri, 21 Nov 2014 14:53:06 +0000 (16:53 +0200)]
js2-parse-named-prop: Highlight externals in abbreviated props

9 years agoSimplify parsing of destructuring literals
Dmitry Gutov [Fri, 21 Nov 2014 14:11:34 +0000 (16:11 +0200)]
Simplify parsing of destructuring literals

js2-parse-named-prop: Drop the "in destructuring" case, parse as abbreviated props.
js2-define-destruct-symbols: Don't expect js2-name nodes directly in js2-object-node.
js2-object-prop-node: Document `SHORTHAND'.

9 years agoMerge branch 'master' of github.com:shicks/js2-mode into shicks-master
Dmitry Gutov [Tue, 18 Nov 2014 12:58:24 +0000 (14:58 +0200)]
Merge branch 'master' of github.com:shicks/js2-mode into shicks-master

Conflicts:
js2-mode.el

9 years agoBump the version
Dmitry Gutov [Tue, 18 Nov 2014 12:51:24 +0000 (14:51 +0200)]
Bump the version

9 years ago'enum' is not a keyword
Dmitry Gutov [Tue, 18 Nov 2014 00:13:35 +0000 (02:13 +0200)]
'enum' is not a keyword

Fixes #183

9 years agoHandle orphan functions on the right side of js2-var-init-node
Dmitry Gutov [Mon, 17 Nov 2014 02:24:03 +0000 (04:24 +0200)]
Handle orphan functions on the right side of js2-var-init-node

Fixes #182

9 years agoBump the version
Dmitry Gutov [Sat, 15 Nov 2014 20:29:14 +0000 (22:29 +0200)]
Bump the version

9 years agoMerge pull request #180 from simenheg/master
Dmitry Gutov [Sat, 15 Nov 2014 18:54:08 +0000 (20:54 +0200)]
Merge pull request #180 from simenheg/master

Fix toggling single-line comments

9 years agoFix toggling single-line comments
Simen Heggestøyl [Sat, 15 Nov 2014 16:19:50 +0000 (17:19 +0100)]
Fix toggling single-line comments

Fixes #179

9 years agoFix string literals in parser.el test harness.
Stephen Hicks [Tue, 11 Nov 2014 02:13:42 +0000 (18:13 -0800)]
Fix string literals in parser.el test harness.

Previously all string literals in tests would fail, because they referred to a temporary buffer that no longer exists.  This fix works around this by extending the life of the temporary input buffer.

9 years agoSupport parsing the ES6 'super' keyword.
Stephen Hicks [Tue, 11 Nov 2014 02:05:31 +0000 (18:05 -0800)]
Support parsing the ES6 'super' keyword.

This is basically implemented by imitating the handling of 'this', since they behave in very similar ways.  The keyword is defined in the various productions in §12.3 of the draft ES6 spec: http://people.mozilla.org/~jorendorff/es6-draft.html#sec-left-hand-side-expressions, and usage examples are available at e.g. https://github.com/lukehoban/es6features#classes.

9 years agoSupport parsing the ES6 'static' keyword.
Stephen Hicks [Tue, 11 Nov 2014 01:59:47 +0000 (17:59 -0800)]
Support parsing the ES6 'static' keyword.

This is defined in the ClassElement production in §14.5 of the draft ES6 spec: http://people.mozilla.org/~jorendorff/es6-draft.html#sec-class-definitions, and usage examples are available at e.g. https://github.com/lukehoban/es6features#classes.

9 years agoSupport ES6 class statements/expressions.
Stephen Hicks [Tue, 11 Nov 2014 01:54:25 +0000 (17:54 -0800)]
Support ES6 class statements/expressions.

This is specified in §14.5 of the draft ES6 spec: http://people.mozilla.org/~jorendorff/es6-draft.html#sec-class-definitions, and described via examples at https://github.com/lukehoban/es6features#enhanced-object-literals.  This commit does not yet add support for the 'static' keyword.

9 years agojs2-imenu-walk-ast: Look up js2-imenu-show-module-pattern in v-i-n case, too
Dmitry Gutov [Thu, 13 Nov 2014 17:24:27 +0000 (19:24 +0200)]
js2-imenu-walk-ast: Look up js2-imenu-show-module-pattern in v-i-n case, too

9 years agojs2-imenu-record-module-pattern: Support `js2-var-init-node'
Dmitry Gutov [Thu, 13 Nov 2014 07:16:47 +0000 (09:16 +0200)]
js2-imenu-record-module-pattern: Support `js2-var-init-node'

* Update `js2-imenu-walk-ast' accordingly.

9 years agoSupport orphan functions on the right side of assignments
Dmitry Gutov [Thu, 13 Nov 2014 06:34:06 +0000 (08:34 +0200)]
Support orphan functions on the right side of assignments

* js2-imenu-extras.el (js2-imenu-extras-setup): Use the new hook
instead of `js2-post-parse-callbacks'.
(js2-imenu-record-orphan-function): Rename, update the caller.
(js2-imenu-record-orphan-assign-node-function): New function, to
handle orphan functions on the right side of assignments.
(js2-imenu-walk-ast): Use it.

* js2-mode.el (js2-build-imenu-callbacks): New hook variable.
(js2-browse-postprocess-chains): Use it.  Make it take no
arguments and be aware of `js2-imenu-recorder'.
(js2-wrapper-function-p): Check that the wrapped function is the
call's target.
(js2-build-imenu-index): Run `js2-browse-postprocess-chains' even
when `js2-imenu-recorder' is empty.  It might get modified in
callbacks.
(js2-browse-postprocess-chains): When skipping a function, remove
its entry from `js2-imenu-function-map'.

Based on
https://github.com/redguardtoo/js2-mode/commit/efc5d4704d260522d04b5642c844711ba1cfc7f7#commitcomment-8441004.

9 years agoSupport ES6 computed property names.
Stephen Hicks [Tue, 11 Nov 2014 01:42:57 +0000 (17:42 -0800)]
Support ES6 computed property names.

This is specified by the ComputedPropertyName production in §12.2.5 of the draft ES6 spec: http://people.mozilla.org/~jorendorff/es6-draft.html#sec-object-initializer, and discussed at https://github.com/lukehoban/es6features\#enhanced-object-literals.

9 years agoAdd support for 'u' and 'y' RegExp flags in ES6 mode.
Stephen Hicks [Tue, 11 Nov 2014 01:25:28 +0000 (17:25 -0800)]
Add support for 'u' and 'y' RegExp flags in ES6 mode.

These flags are defined in §12.2.7.1 of the draft spec: http://people.mozilla.org/\~jorendorff/es6-draft.html\#sec-primary-expression-regular-expression-literals-static-semantics-early-errors (narrowing the RegularExpressionFlags production defined in §11.8.5).  The new flags are described at https://mathiasbynens.be/notes/es6-unicode-regex.

9 years agoSupport method definitions in object literals.
Stephen Hicks [Tue, 11 Nov 2014 01:17:08 +0000 (17:17 -0800)]
Support method definitions in object literals.

This is specified in §14.3 of the current draft spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-method-definitions, and discussed with examples at http://ariya.ofilabs.com/2013/03/es6-and-method-definitions.html.

9 years agoAdd ES6 class externs
Stephen Hicks [Tue, 11 Nov 2014 00:59:04 +0000 (16:59 -0800)]
Add ES6 class externs

These are delineated in §18.3 of the draft spec, Constructor Properties of the Global Object: http://people.mozilla.org/~jorendorff/es6-draft.html#sec-constructor-properties-of-the-global-object.

9 years agoSupport short-hand object literals {foo, bar} everywhere.
Stephen Hicks [Tue, 11 Nov 2014 00:14:14 +0000 (16:14 -0800)]
Support short-hand object literals {foo, bar} everywhere.

This is specified in §12.2.5 of the draft spec (http://people.mozilla.org/~jorendorff/es6-draft.html#sec-object-initializer) by the production [PropertyDefinition : IdentifierReference], and discussed e.g. in http://ariya.ofilabs.com/2013/02/es6-and-object-literal-property-value-shorthand.html.

9 years agoCheck in LICENSE
Dmitry Gutov [Thu, 6 Nov 2014 18:20:59 +0000 (20:20 +0200)]
Check in LICENSE

9 years agoIndent after `+='
Dmitry Gutov [Wed, 5 Nov 2014 09:54:28 +0000 (11:54 +0200)]
Indent after `+='

Closes #174

9 years agoSupport object destructuring inside arrow function args
Dmitry Gutov [Wed, 5 Nov 2014 09:45:15 +0000 (11:45 +0200)]
Support object destructuring inside arrow function args

* js2-mode.el (js2-parse-plain-property): Don't move too far when
there's no colon.
(js2-parse-assign-expr): Restore the previous value of
`js2-parsed-errors' after arrow token is found.

Fixes #167

9 years agoIndent before inequality operator at bol
Dmitry Gutov [Wed, 5 Nov 2014 08:41:53 +0000 (10:41 +0200)]
Indent before inequality operator at bol

Fixes #174

9 years agoMerge pull request #173 from lelit/master
Dmitry Gutov [Sat, 1 Nov 2014 20:05:25 +0000 (23:05 +0300)]
Merge pull request #173 from lelit/master

Add imenu support for the Sencha framework

9 years agoAdd imenu support for the Sencha framework
Lele Gaifax [Sat, 1 Nov 2014 19:34:15 +0000 (20:34 +0100)]
Add imenu support for the Sencha framework

This implements issue #172.

9 years agojs2-parse-primary-expr: Make some vars "more" local
Dmitry Gutov [Sat, 1 Nov 2014 11:55:51 +0000 (14:55 +0300)]
js2-parse-primary-expr: Make some vars "more" local

9 years agoFix #171
Dmitry Gutov [Sat, 1 Nov 2014 11:47:01 +0000 (14:47 +0300)]
Fix #171

* js2-mode.el (js2-parse-primary-expr): Use
`js2-current-token-end' to retrieve the end of the current token.
This works better if parsing errored on EOF.
(js2-read-regexp): Don't try to set `syntax-table' property (it
didn't work anyway, `syntax-class' is bogus).

9 years agojs2-mode-find-enclosing-node: Make docstring and impl consistent with name
Leo Liu [Fri, 31 Oct 2014 01:07:16 +0000 (04:07 +0300)]
js2-mode-find-enclosing-node: Make docstring and impl consistent with name

Closes #170

9 years agojs2-imenu-extras.el: Use Unix-style EOL
Stefan Monnier [Sat, 18 Oct 2014 19:05:22 +0000 (02:05 +0700)]
js2-imenu-extras.el: Use Unix-style EOL

9 years agoFontify negation operator
Dmitry Gutov [Sat, 18 Oct 2014 18:35:40 +0000 (01:35 +0700)]
Fontify negation operator

Closes #168

9 years agojs2-parse-let: Simplify
Dmitry Gutov [Mon, 8 Sep 2014 19:42:33 +0000 (23:42 +0400)]
js2-parse-let: Simplify

9 years agoFix parsing of let expressions
kaki [Mon, 8 Sep 2014 14:27:45 +0000 (23:27 +0900)]
Fix parsing of let expressions

9 years agoAllow 'in' operator inside 'for' init when unambiguous
Dmitry Gutov [Mon, 4 Aug 2014 03:31:02 +0000 (07:31 +0400)]
Allow 'in' operator inside 'for' init when unambiguous

Fixes #155

9 years agoIgnore integer overflow
Dmitry Gutov [Mon, 4 Aug 2014 01:25:51 +0000 (05:25 +0400)]
Ignore integer overflow

Fixes #154

9 years agoSmall tweak
Dmitry Gutov [Wed, 16 Jul 2014 01:17:39 +0000 (04:17 +0300)]
Small tweak

9 years agoAdd js2-language-version checks
Dmitry Gutov [Wed, 16 Jul 2014 01:17:29 +0000 (04:17 +0300)]
Add js2-language-version checks

9 years agoSupport ES6 number literals
Dmitry Gutov [Wed, 16 Jul 2014 01:13:17 +0000 (04:13 +0300)]
Support ES6 number literals

Closes #151

9 years agojs2-get-token-internal-1: add a FIXME
Dmitry Gutov [Wed, 9 Jul 2014 23:26:57 +0000 (02:26 +0300)]
js2-get-token-internal-1: add a FIXME

9 years agojs2-read-unicode-escape: use a stricter regexp
Dmitry Gutov [Wed, 9 Jul 2014 17:08:11 +0000 (20:08 +0300)]
js2-read-unicode-escape: use a stricter regexp

9 years agoBetter docstrings
Dmitry Gutov [Wed, 9 Jul 2014 16:45:34 +0000 (19:45 +0300)]
Better docstrings

9 years agoMerge pull request #149 from lewang/dont-parse-killed-buffer
Dmitry Gutov [Thu, 10 Jul 2014 15:00:22 +0000 (18:00 +0300)]
Merge pull request #149 from lewang/dont-parse-killed-buffer

Check if buffer is alive before reparsing

9 years agoCheck if buffer is alive before reparsing.
Le Wang [Thu, 10 Jul 2014 14:43:16 +0000 (10:43 -0400)]
Check if buffer is alive before reparsing.

9 years agoSupport Unicode Identifiers
Gerard Paapu [Wed, 9 Jul 2014 13:09:25 +0000 (16:09 +0300)]
Support Unicode Identifiers

(tiny change)

Closes #148

9 years agoAdd Contributing section
Dmitry Gutov [Wed, 9 Jul 2014 03:53:35 +0000 (06:53 +0300)]
Add Contributing section

9 years agoSupport ES6 generator comprehensions
Dmitry Gutov [Wed, 9 Jul 2014 03:29:15 +0000 (06:29 +0300)]
Support ES6 generator comprehensions

Fixes #145

9 years agoSupport ES6 array comprehensions
Dmitry Gutov [Tue, 8 Jul 2014 20:13:51 +0000 (23:13 +0300)]
Support ES6 array comprehensions

9 years agoAdd `.' to electric-indent-chars for method continuations
Dmitry Gutov [Wed, 2 Jul 2014 15:10:32 +0000 (18:10 +0300)]
Add `.' to electric-indent-chars for method continuations

#146

9 years agoSupport yield*
Dmitry Gutov [Wed, 4 Jun 2014 01:18:31 +0000 (04:18 +0300)]
Support yield*

#139

9 years agojs2-parse-array-literal: improve trailing comma warning
Dmitry Gutov [Wed, 21 May 2014 01:02:22 +0000 (04:02 +0300)]
js2-parse-array-literal: improve trailing comma warning

* Only warn when language version is < 1.7.
* Handle nil elements.

Fixes #142

9 years agoRename mention of espresso-mode to js-mode
Dmitry Gutov [Wed, 21 May 2014 00:55:14 +0000 (03:55 +0300)]
Rename mention of espresso-mode to js-mode

10 years agoFix parsing of function statements in blocks
Dmitry Gutov [Sun, 6 Apr 2014 03:55:21 +0000 (06:55 +0300)]
Fix parsing of function statements in blocks

10 years agoCut down on reserved words; improve error reporting
Dmitry Gutov [Sun, 6 Apr 2014 03:26:54 +0000 (06:26 +0300)]
Cut down on reserved words; improve error reporting

Closes #100

10 years agoMerge pull request #138 from martinp/fix-electric-indent
Dmitry Gutov [Wed, 26 Mar 2014 11:20:29 +0000 (13:20 +0200)]
Merge pull request #138 from martinp/fix-electric-indent

Fix electric-indent-mode

10 years agoFix electric-indent-mode
Martin Polden [Wed, 26 Mar 2014 09:58:06 +0000 (10:58 +0100)]
Fix electric-indent-mode

Make electric-indent-mode work as intended by setting
electric-indent-chars correctly.

10 years agoTry to improve formatting
Dmitry Gutov [Sun, 9 Mar 2014 07:07:27 +0000 (09:07 +0200)]
Try to improve formatting

10 years agoReference #72 in the README
Dmitry Gutov [Sun, 9 Mar 2014 07:05:25 +0000 (09:05 +0200)]
Reference #72 in the README

10 years agoMerge pull request #133 from johnmastro/imenu-react
Dmitry Gutov [Tue, 21 Jan 2014 04:03:46 +0000 (20:03 -0800)]
Merge pull request #133 from johnmastro/imenu-react

Add support for React classes in js2-imenu-extras

10 years agoAdd support for React classes in js2-imenu-extras
John Mastro [Sun, 19 Jan 2014 20:29:17 +0000 (12:29 -0800)]
Add support for React classes in js2-imenu-extras

Reuse the recorder function already present for Backbone extends. Rename
that function to js2-imenu-record-backbone-or-react and define
js2-imenu-record-backbone-extend and js2-imenu-record-react-class as
aliases of it.

10 years agoAdd .gitignore
Dmitry Gutov [Tue, 14 Jan 2014 02:03:39 +0000 (04:03 +0200)]
Add .gitignore

10 years agoUpdate copyright years, bump the version
Dmitry Gutov [Tue, 14 Jan 2014 01:54:14 +0000 (03:54 +0200)]
Update copyright years, bump the version

10 years agoAlso highlight function names after new operator
Dmitry Gutov [Tue, 14 Jan 2014 01:52:27 +0000 (03:52 +0200)]
Also highlight function names after new operator

+ Only highlight name tokens, disregarding function objects accessed
via array-get, etc.

#128

10 years agoFontify function calls
Dmitry Gutov [Sat, 11 Jan 2014 23:45:38 +0000 (03:45 +0400)]
Fontify function calls

Closes #128

10 years agoFix #127
Dmitry Gutov [Sun, 22 Dec 2013 03:08:13 +0000 (05:08 +0200)]
Fix #127

10 years agoRename the new functions and rewrite the comments
Dmitry Gutov [Thu, 19 Dec 2013 14:58:38 +0000 (16:58 +0200)]
Rename the new functions and rewrite the comments

10 years agoimenu hint for orphan function
Chen Bin [Wed, 18 Dec 2013 10:04:50 +0000 (21:04 +1100)]
imenu hint for orphan function

10 years agoNew option: js2-imenu-split-string-identifiers
Dmitry Gutov [Mon, 18 Nov 2013 23:16:20 +0000 (01:16 +0200)]
New option: js2-imenu-split-string-identifiers

#123

10 years agojs2-re-search-forward-inner: Handle the case when string ends right after match
Dmitry Gutov [Mon, 18 Nov 2013 16:42:15 +0000 (18:42 +0200)]
js2-re-search-forward-inner: Handle the case when string ends right after match

Follow-up to #123

10 years agoSupport Enyo in IMenu
Dmitry Gutov [Mon, 18 Nov 2013 10:30:51 +0000 (12:30 +0200)]
Support Enyo in IMenu

Closes #123

10 years ago* js2-mode/tests: Add copyright headers
Stefan Monnier [Fri, 8 Nov 2013 00:24:27 +0000 (02:24 +0200)]
* js2-mode/tests: Add copyright headers

10 years agoBump the version
Dmitry Gutov [Wed, 6 Nov 2013 01:33:50 +0000 (03:33 +0200)]
Bump the version

10 years agoSupport Harmony spread operator, in arrays and calls
Dmitry Gutov [Wed, 6 Nov 2013 01:27:02 +0000 (03:27 +0200)]
Support Harmony spread operator, in arrays and calls

Closes #121

10 years agoSupport Harmony generators (closes #119)
Dmitry Gutov [Sun, 3 Nov 2013 03:09:51 +0000 (07:09 +0400)]
Support Harmony generators (closes #119)

10 years agoFix parsing labeled statements (and #120)
Dmitry Gutov [Fri, 18 Oct 2013 04:58:30 +0000 (08:58 +0400)]
Fix parsing labeled statements (and #120)

+ change labeled-stmt printer not to indent statements additionally

10 years agoFix #116
Dmitry Gutov [Sun, 13 Oct 2013 03:09:10 +0000 (06:09 +0300)]
Fix #116

10 years agoAdd small clarification
Dmitry Gutov [Sun, 13 Oct 2013 02:53:34 +0000 (05:53 +0300)]
Add small clarification

10 years agoInclude function's AST node in parent scope's symbol table entry
Dmitry Gutov [Sun, 13 Oct 2013 02:46:53 +0000 (05:46 +0300)]
Include function's AST node in parent scope's symbol table entry

Reported by Sergey Mogzovoy

10 years ago(Hopefully) fix #117 and capitaomorte/autopair#21
Dmitry Gutov [Sun, 13 Oct 2013 01:21:51 +0000 (04:21 +0300)]
(Hopefully) fix #117 and capitaomorte/autopair#21

10 years agopn was indeed unused
Dmitry Gutov [Tue, 8 Oct 2013 12:47:25 +0000 (15:47 +0300)]
pn was indeed unused

10 years agoMerge branch 'arrow-functions'
Dmitry Gutov [Tue, 8 Oct 2013 12:46:16 +0000 (15:46 +0300)]
Merge branch 'arrow-functions'

Conflicts:
js2-mode.el

10 years agoCheck in .dir-locals.el
Dmitry Gutov [Tue, 8 Oct 2013 01:50:48 +0000 (04:50 +0300)]
Check in .dir-locals.el