[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master ca7df5b 16/31: Merge branch 'master' of github.com:mooz/js
From: |
Dmitry Gutov |
Subject: |
[elpa] master ca7df5b 16/31: Merge branch 'master' of github.com:mooz/js2-mode |
Date: |
Fri, 21 Jul 2017 09:04:56 -0400 (EDT) |
branch: master
commit ca7df5bf9d0a76b77edfb6d6fe11e83965aa2cb3
Merge: 97d27d6 659f683
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Merge branch 'master' of github.com:mooz/js2-mode
---
js2-mode.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/js2-mode.el b/js2-mode.el
index f4db9ff..15be4b3 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -1113,7 +1113,7 @@ information."
(defvar js2-mode-map
(let ((map (make-sparse-keymap)))
- (define-key map (kbd "M-j") #'js2-line-break)
+ (define-key map [remap indent-new-comment-line] #'js2-line-break)
(define-key map (kbd "C-c C-e") #'js2-mode-hide-element)
(define-key map (kbd "C-c C-s") #'js2-mode-show-element)
(define-key map (kbd "C-c C-a") #'js2-mode-show-all)
- [elpa] master bb6c388 06/31: ES6 yield is followed by AssignmentExpression, (continued)
- [elpa] master bb6c388 06/31: ES6 yield is followed by AssignmentExpression, Dmitry Gutov, 2017/07/21
- [elpa] master 32f9782 12/31: Remove js2-mark-safe-local, it's unused now, Dmitry Gutov, 2017/07/21
- [elpa] master 71416f6 08/31: Merge pull request #366 from XeCycle/drop-yield-paren, Dmitry Gutov, 2017/07/21
- [elpa] master 4787b5f 09/31: Merge pull request #363 from XeCycle/class-public-field, Dmitry Gutov, 2017/07/21
- [elpa] master cb8607c 25/31: Add failing test for issue #420, Dmitry Gutov, 2017/07/21
- [elpa] master 908395e 11/31: Allow trailing comma in param list (#410), Dmitry Gutov, 2017/07/21
- [elpa] master 659f683 14/31: Merge pull request #421 from raxod502/feat/C-M-j, Dmitry Gutov, 2017/07/21
- [elpa] master 8a5f492 20/31: Merge pull request #425 from shicks/jsdoc, Dmitry Gutov, 2017/07/21
- [elpa] master d3b31ba 10/31: js2-node-qname-component: Nandle computed properties, Dmitry Gutov, 2017/07/21
- [elpa] master 4a87822 13/31: Map C-M-j to js2-line-break, Dmitry Gutov, 2017/07/21
- [elpa] master ca7df5b 16/31: Merge branch 'master' of github.com:mooz/js2-mode,
Dmitry Gutov <=
- [elpa] master b3f74f0 19/31: Fix jsdoc highlighting for tags w/ optional braces, Dmitry Gutov, 2017/07/21
- [elpa] master 9ce2542 07/31: Add support for ES7 class public fields, Dmitry Gutov, 2017/07/21
- [elpa] master 7349309 21/31: Add tests for `/*jslint*/` declarations, Dmitry Gutov, 2017/07/21
- [elpa] master b176925 24/31: Update NEWS.md, Dmitry Gutov, 2017/07/21
- [elpa] master 92a8857 23/31: Support async arrow function without parentheses, Dmitry Gutov, 2017/07/21
- [elpa] master 890cf81 27/31: Merge pull request #434 from lelit/issue420, Dmitry Gutov, 2017/07/21
- [elpa] master 558f53f 22/31: Merge pull request #358 from JulianKniephoff/master, Dmitry Gutov, 2017/07/21
- [elpa] master cb57d9b 30/31: Bump the version, Dmitry Gutov, 2017/07/21
- [elpa] master a604872 26/31: Recognize initialized variable in destructuring object assignment, Dmitry Gutov, 2017/07/21
- [elpa] master f1badee 18/31: Replace (equal nil ...) with (null ...), Dmitry Gutov, 2017/07/21