summaryrefslogtreecommitdiff
path: root/settings/setup-yasnippet.el
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--settings/setup-yasnippet.el8
1 files changed, 3 insertions, 5 deletions
diff --git a/settings/setup-yasnippet.el b/settings/setup-yasnippet.el
index 4145574..5441327 100644
--- a/settings/setup-yasnippet.el
+++ b/settings/setup-yasnippet.el
@@ -1,13 +1,11 @@
(require 'yasnippet)
(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)
+(yas-global-mode 1)
;; Jump to end of snippet definition
-(define-key yas-keymap (kbd "<return>") 'yas-exit-all-snippets)
+(define-key yas-keymap (kbd "<return>") 'yas-next-field)
+(define-key yas-keymap (kbd "C-x RET TAB") 'yas-exit-all-snippets)
(add-hook 'term-mode-hook (lambda()
(setq yas-dont-activate t)))