From be338e9ee41ba1958d43716144b937f4b898e084 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Thu, 18 Dec 2014 21:39:41 -0500 Subject: [PATCH] Refactoring of some javascript layer package initialisation --- contrib/lang/javascript/packages.el | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/contrib/lang/javascript/packages.el b/contrib/lang/javascript/packages.el index 953ca0a4a..f0801bd36 100644 --- a/contrib/lang/javascript/packages.el +++ b/contrib/lang/javascript/packages.el @@ -51,7 +51,12 @@ which require an initialization must be listed explicitly in the list.") (defun javascript/init-js2-refactor () (use-package js2-refactor :defer t - :init (eval-after-load 'js2-mode '(require 'js2-refactor)) + :init + (progn + (defun javascript/load-js2-refactor () + "Lazy load js2-refactor" + (require 'js2-refactor)) + (add-hook 'js2-mode-hook 'javascript/load-js2-refactor)) :config (progn ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mr" "refactor") @@ -116,7 +121,7 @@ which require an initialization must be listed explicitly in the list.") (defun javascript/init-tern () (use-package tern :defer t - :init (add-hook 'js2-mode-hook (lambda () (tern-mode t))) + :init (add-hook 'js2-mode-hook 'tern-mode) :config (progn (evil-leader/set-key-for-mode 'js2-mode "mc" 'tern-rename-variable) @@ -129,4 +134,4 @@ which require an initialization must be listed explicitly in the list.") (defun javascript/init-tern-auto-complete () (use-package tern-auto-complete :defer t - :init (eval-after-load 'tern '(tern-ac-setup)))) + :init (add-hook 'tern-mode-hook 'tern-ac-setup)))