diff options
| author | benj <benj@rse8.com> | 2018-03-16 12:39:17 -0700 |
|---|---|---|
| committer | benj <benj@rse8.com> | 2018-03-16 12:39:17 -0700 |
| commit | 67b696a4d68d98fff8158edf9c11b5d5d24d3fa7 (patch) | |
| tree | 8512e9b385ed17883fd8ee8842549bb0d3d7ec31 /settings/setup-yasnippet.el | |
| parent | 5dd18d1598b22000b60a329c6b1cc18896c5ced6 (diff) | |
| parent | c38ef385a9af288cf2d2ff0f306b6b2176fcf47d (diff) | |
| download | emacs-67b696a4d68d98fff8158edf9c11b5d5d24d3fa7.tar emacs-67b696a4d68d98fff8158edf9c11b5d5d24d3fa7.tar.gz emacs-67b696a4d68d98fff8158edf9c11b5d5d24d3fa7.tar.bz2 emacs-67b696a4d68d98fff8158edf9c11b5d5d24d3fa7.tar.lz emacs-67b696a4d68d98fff8158edf9c11b5d5d24d3fa7.tar.xz emacs-67b696a4d68d98fff8158edf9c11b5d5d24d3fa7.tar.zst emacs-67b696a4d68d98fff8158edf9c11b5d5d24d3fa7.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat (limited to '')
| -rw-r--r-- | settings/setup-yasnippet.el | 8 |
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))) |