From 177e2b610a4aea9f59def7b1b7c625ad3e21d9ad Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 25 Nov 2015 23:32:18 -0500 Subject: [PATCH] org: clean up yas fix --- modules/module-org.el | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/module-org.el b/modules/module-org.el index ab69f4186..dee36a569 100644 --- a/modules/module-org.el +++ b/modules/module-org.el @@ -329,14 +329,13 @@ will function properly." ;; fix some org-mode + yasnippet conflicts: (defun yas/org-very-safe-expand () - (let ((yas/fallback-behavior 'return-nil)) (yas/expand))) + (let ((yas-fallback-behavior 'return-nil)) (yas-expand))) - (add-hook 'org-mode-hook - (lambda () - (make-variable-buffer-local 'yas/trigger-key) - (setq yas/trigger-key [tab]) - (add-to-list 'org-tab-first-hook 'yas/org-very-safe-expand) - (define-key yas/keymap [tab] 'yas-next-field))) + (add-hook! org-mode + (make-variable-buffer-local 'yas-trigger-key) + (setq yas/trigger-key [tab]) + (add-to-list 'org-tab-first-hook 'yas/org-very-safe-expand) + (define-key yas/keymap [tab] 'yas-next-field)) ;;; Evil integration (progn