TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[Fix #1553] Make sure yasnippet is actually loaded

Browse source 
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:
Tu Do 2015-05-21 16:57:04 +07:00 committed by syl20bnr
parent 3f8c0a253d
commit 0cb6acb7af
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
contrib/auto-completion/packages.el
View file

@ -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"))))