From 1a6798b117d163ba51cfc890eb5aa0af65532168 Mon Sep 17 00:00:00 2001 From: Jeffrey Horn Date: Tue, 11 Jan 2011 01:02:25 -0500 Subject: [PATCH] Update conflict documentation This patch updates the conflict documentation regarding yasnippet to use Eric Schulte's fix. --- doc/org.texi | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index e83909d..b0667e4 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -13423,7 +13423,7 @@ to have other replacement keys, look at the variable @item @file{yasnippet.el} @cindex @file{yasnippet.el} -The way Org-mode binds the TAB key (binding to @code{[tab]} instead of +The way Org mode binds the TAB key (binding to @code{[tab]} instead of @code{"\t"}) overrules YASnippet's access to this key. The following code fixed this problem: @@ -13434,6 +13434,25 @@ fixed this problem: (define-key yas/keymap [tab] 'yas/next-field-group))) @end lisp +The latest version of yasnippets doesn't play well with Org mode. If the +above code does not fix the conflict, start by defining the following +function: +@lisp +(defun yas/org-very-safe-expand () + (let ((yas/fallback-behavior 'return-nil)) (yas/expand))) +@end lisp + +Then, tell Org mode what to do with the new function: +@lisp +(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) + )) +@end lisp + @item @file{windmove.el} by Hovav Shacham @cindex @file{windmove.el} This package also uses the @kbd{S-} keys, so everything written -- 1.7.2