From 0cb6acb7af0f72b8d2d302318eef513742e7b6ec Mon Sep 17 00:00:00 2001 From: Tu Do Date: Thu, 21 May 2015 16:57:04 +0700 Subject: [PATCH] [Fix #1553] Make sure yasnippet is actually loaded By checking if the yas-minor-mode is enabled. If so, load yasnippet. We must do so because some package might load yasnippet and make yas-minor-mode definition available, thus prevent Spacemacs to load yasnippet properly. By checking yas-global-mode variable, we can assure that yas-global-mode is enabled properly. Also exclude yasnippet from eshell. --- contrib/auto-completion/packages.el | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/contrib/auto-completion/packages.el b/contrib/auto-completion/packages.el index ea7fd6e84..868067c65 100644 --- a/contrib/auto-completion/packages.el +++ b/contrib/auto-completion/packages.el @@ -194,21 +194,20 @@ (setq yas-minor-mode-map (make-sparse-keymap)) (defun spacemacs/load-yasnippet () - (if (not (boundp 'yas-minor-mode)) - (progn - (yas-global-mode 1) - (let ((private-yas-dir (concat - configuration-layer-private-directory - "snippets/"))) - (setq yas-snippet-dirs - (append (list private-yas-dir) - (when (boundp 'yas-snippet-dirs) - yas-snippet-dirs))) - (setq yas-wrap-around-region t))))) + (unless yas-global-mode + (progn + (yas-global-mode 1) + (let ((private-yas-dir (concat + configuration-layer-private-directory + "snippets/"))) + (setq yas-snippet-dirs + (append (list private-yas-dir) + (when (boundp 'yas-snippet-dirs) + yas-snippet-dirs))) + (setq yas-wrap-around-region t))))) (add-to-hooks 'spacemacs/load-yasnippet '(prog-mode-hook markdown-mode-hook org-mode-hook)) - (spacemacs|add-toggle yasnippet :status yas-minor-mode :on (yas-minor-mode) @@ -221,7 +220,8 @@ (setq yas-dont-activate t)) (add-to-hooks 'spacemacs/force-yasnippet-off '(term-mode-hook - shell-mode-hook))) + shell-mode-hook + eshell-mode-hook))) :config (progn (spacemacs|diminish yas-minor-mode " ⓨ" " y"))))