summaryrefslogtreecommitdiff
path: root/settings/setup-yasnippet.el
diff options
context:
space:
mode:
authorbenj <benj@rse8.com>2017-06-06 11:03:26 -0700
committerbenj <benj@rse8.com>2017-06-06 11:03:26 -0700
commit6a0fbbd87a717788991cd61af1cbd73881819b6d (patch)
tree272283e43e233b85d34ba72a2fea2f25f5e7a404 /settings/setup-yasnippet.el
parent84fc1dbdb9ca9b83df05d135a5edcff25ffa5db3 (diff)
parent53853e36fa71b0c2d79d3593ebddd70b9be3b26b (diff)
downloademacs-6a0fbbd87a717788991cd61af1cbd73881819b6d.tar
emacs-6a0fbbd87a717788991cd61af1cbd73881819b6d.tar.gz
emacs-6a0fbbd87a717788991cd61af1cbd73881819b6d.tar.bz2
emacs-6a0fbbd87a717788991cd61af1cbd73881819b6d.tar.lz
emacs-6a0fbbd87a717788991cd61af1cbd73881819b6d.tar.xz
emacs-6a0fbbd87a717788991cd61af1cbd73881819b6d.tar.zst
emacs-6a0fbbd87a717788991cd61af1cbd73881819b6d.zip
Merge branch 'master' of https://github.com/benjbellon/emacs.d
Diffstat (limited to '')
-rw-r--r--settings/setup-yasnippet.el6
1 files changed, 6 insertions, 0 deletions
diff --git a/settings/setup-yasnippet.el b/settings/setup-yasnippet.el
index fd27543..4145574 100644
--- a/settings/setup-yasnippet.el
+++ b/settings/setup-yasnippet.el
@@ -3,7 +3,13 @@
(setq yas-snippet-dirs '("~/.emacs.d/snippets"))
(yas-global-mode 1)
+(define-key yas-minor-mode-map [(tab)] nil)
+(define-key yas-minor-mode-map (kbd "TAB") nil)
+
;; Jump to end of snippet definition
(define-key yas-keymap (kbd "<return>") 'yas-exit-all-snippets)
+(add-hook 'term-mode-hook (lambda()
+ (setq yas-dont-activate t)))
+
(provide 'setup-yasnippet)