gitback/doomemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:hlissner/emacs.d

Browse Source 
* 'master' of github.com:hlissner/emacs.d:
  org: clean up yas fix
This commit is contained in:
Henrik Lissner 2015-11-25 23:36:31 -05:00
commit d5b0ffd822
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/module-org.el
View File

@ -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)
(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)))
(define-key yas/keymap [tab] 'yas-next-field))
;;; Evil integration
(progn