branch: master commit c68646a163f3d47eec1e71af3f42ec01f14174ef Author: Dmitry Gutov <dgu...@yandex.ru> Commit: Dmitry Gutov <dgu...@yandex.ru>
Never enable js2-minor-mode in js2-mode #249 --- js2-mode.el | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/js2-mode.el b/js2-mode.el index 332e8f8..78768da 100644 --- a/js2-mode.el +++ b/js2-mode.el @@ -11129,9 +11129,11 @@ such as `js-mode', while retaining the asynchronous error/warning highlighting features of `js2-mode'." :group 'js2-mode :lighter " js-lint" - (if js2-minor-mode - (js2-minor-mode-enter) - (js2-minor-mode-exit))) + (if (derived-mode-p 'js2-mode) + (setq js2-minor-mode nil) + (if js2-minor-mode + (js2-minor-mode-enter) + (js2-minor-mode-exit)))) (defun js2-minor-mode-enter () "Initialization for `js2-minor-mode'." @@ -11278,7 +11280,6 @@ Selecting an error will jump it to the corresponding source-buffer error. ;;;###autoload (define-derived-mode js2-mode js-mode "Javascript-IDE" "Major mode for editing JavaScript code." - ;; Used by comment-region; don't change it. (set (make-local-variable 'max-lisp-eval-depth) (max max-lisp-eval-depth 3000)) (set (make-local-variable 'indent-line-function) #'js2-indent-line)