From 9956af722f9ac924ad9d638472dddf71622227fb Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 10 Aug 2014 19:40:44 -0400 Subject: [PATCH] Fix yasnippet keymaps --- init/init-snippets.el | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/init/init-snippets.el b/init/init-snippets.el index 931fbc445..45da9a893 100644 --- a/init/init-snippets.el +++ b/init/init-snippets.el @@ -7,16 +7,18 @@ ;; BEFORE we include yasnippet. (defvar yas-minor-mode-map (let ((map (make-sparse-keymap))) - (evil-define-key 'insert map [(tab)] 'yas-expand) - (evil-define-key 'insert map (kbd "TAB") 'yas-expand) - (evil-define-key 'insert map "\C-c&\C-s" 'yas-insert-snippet) - (evil-define-key 'insert map "\C-c&\C-n" 'yas-new-snippet) - (evil-define-key 'insert map "\C-c&\C-v" 'yas-visit-snippet-file) + (imap map [(tab)] 'yas-expand) + (imap map (kbd "TAB") 'yas-expand) map))) :config (progn ;; Only load personal snippets (setq yas-snippet-dirs `(,my/snippets-dir)) + (setq yas-prompt-functions '(yas-ido-prompt yas-no-prompt)) + + (imap yas-minor-mode-map (kbd "C-c C-s") 'yas-insert-snippet) + (define-key yas-minor-mode-map (kbd "C-c C-n") 'yas-new-snippet) + (define-key yas-minor-mode-map (kbd "C-c C-v") 'yas-visit-snippet-file) (yas-reload-all)) :init