summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2011-01-14 06:30:36 -0700
committerEric Schulte <schulte.eric@gmail.com>2011-01-14 06:30:36 -0700
commit6b5953818b9159d99018efb0ad99828541964db8 (patch)
treefb38d4c58cd29067115aeddff216545ead6ad0b8
parent163cd58ffd6461c98a96b1b63a3cf082b2825a52 (diff)
downloadorg-mode-6b5953818b9159d99018efb0ad99828541964db8.tar.gz
doc: fixes to "yasnippet" sub-section in Conflicts
* doc/org.texi (Conflicts): Changed "yasnippets" to "yasnippet" and added extra whitespace around functions to be consistent with the rest of the section.
-rw-r--r--doc/org.texi4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/org.texi b/doc/org.texi
index 4d696ae..a30d5b6 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -13465,15 +13465,17 @@ 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
+The latest version of yasnippet 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 ()