[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 46/46: Merge commit '2c744815cf9e4653625dd25f2e7f8b59c152782d' fr
|
From: |
Dmitry Gutov |
|
Subject: |
[elpa] 46/46: Merge commit '2c744815cf9e4653625dd25f2e7f8b59c152782d' from js2-mode |
|
Date: |
Sat, 15 Nov 2014 20:58:14 +0000 |
dgutov pushed a commit to branch master
in repository elpa.
commit 4e4c53b640bb2f6b5d9ab2f00857221dcce325b8
Merge: 46fb875 2c74481
Author: Dmitry Gutov <address@hidden>
Date: Sat Nov 15 22:53:53 2014 +0200
Merge commit '2c744815cf9e4653625dd25f2e7f8b59c152782d' from js2-mode
Conflicts:
packages/js2-mode/js2-imenu-extras.el
packages/js2-mode/LICENSE | 674 +++++++++++++++++++++++++++++
packages/js2-mode/README.md | 22 +-
packages/js2-mode/js2-imenu-extras.el | 116 ++++--
packages/js2-mode/js2-mode.el | 752 +++++++++++++++++++--------------
packages/js2-mode/tests/parser.el | 81 ++++-
5 files changed, 1294 insertions(+), 351 deletions(-)
diff --cc packages/js2-mode/LICENSE
index 0000000,94a9ed0..94a9ed0
mode 000000,100644..100644
--- a/packages/js2-mode/LICENSE
+++ b/packages/js2-mode/LICENSE
- [elpa] 34/46: Add imenu support for the Sencha framework, (continued)
- [elpa] 34/46: Add imenu support for the Sencha framework, Dmitry Gutov, 2014/11/15
- [elpa] 36/46: Indent before inequality operator at bol, Dmitry Gutov, 2014/11/15
- [elpa] 38/46: Indent after `+=', Dmitry Gutov, 2014/11/15
- [elpa] 37/46: Support object destructuring inside arrow function args, Dmitry Gutov, 2014/11/15
- [elpa] 30/46: js2-imenu-extras.el: Use Unix-style EOL, Dmitry Gutov, 2014/11/15
- [elpa] 42/46: js2-imenu-walk-ast: Look up js2-imenu-show-module-pattern in v-i-n case, too, Dmitry Gutov, 2014/11/15
- [elpa] 40/46: Support orphan functions on the right side of assignments, Dmitry Gutov, 2014/11/15
- [elpa] 35/46: Merge pull request #173 from lelit/master, Dmitry Gutov, 2014/11/15
- [elpa] 43/46: Fix toggling single-line comments, Dmitry Gutov, 2014/11/15
- [elpa] 41/46: js2-imenu-record-module-pattern: Support `js2-var-init-node', Dmitry Gutov, 2014/11/15
- [elpa] 46/46: Merge commit '2c744815cf9e4653625dd25f2e7f8b59c152782d' from js2-mode,
Dmitry Gutov <=
- [elpa] 45/46: Bump the version, Dmitry Gutov, 2014/11/15
- [elpa] 44/46: Merge pull request #180 from simenheg/master, Dmitry Gutov, 2014/11/15
- [elpa] 39/46: Check in LICENSE, Dmitry Gutov, 2014/11/15