[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.
This commit is contained in:
parent
3f8c0a253d
commit
0cb6acb7af
|
@ -194,7 +194,7 @@
|
|||
(setq yas-minor-mode-map (make-sparse-keymap))
|
||||
|
||||
(defun spacemacs/load-yasnippet ()
|
||||
(if (not (boundp 'yas-minor-mode))
|
||||
(unless yas-global-mode
|
||||
(progn
|
||||
(yas-global-mode 1)
|
||||
(let ((private-yas-dir (concat
|
||||
|
@ -208,7 +208,6 @@
|
|||
(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"))))
|
||||
|
|
Loading…
Reference in a new issue