Merge branch 'master' of github.com:hlissner/emacs.d
* 'master' of github.com:hlissner/emacs.d: org: clean up yas fix
This commit is contained in:
commit
d5b0ffd822
|
@ -331,14 +331,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
|
||||
|
|
Loading…
Reference in New Issue
Block a user