瀏覽代碼

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.
Eric Schulte 14 年之前
父節點
當前提交
6b5953818b
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      doc/org.texi

+ 3 - 1
doc/org.texi

@@ -13465,15 +13465,17 @@ fixed this problem:
             (define-key yas/keymap [tab] 'yas/next-field-group)))
             (define-key yas/keymap [tab] 'yas/next-field-group)))
 @end lisp
 @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
 above code does not fix the conflict, start by defining the following
 function:
 function:
+
 @lisp
 @lisp
 (defun yas/org-very-safe-expand ()
 (defun yas/org-very-safe-expand ()
        (let ((yas/fallback-behavior 'return-nil)) (yas/expand)))
        (let ((yas/fallback-behavior 'return-nil)) (yas/expand)))
 @end lisp
 @end lisp
 
 
 Then, tell Org mode what to do with the new function:
 Then, tell Org mode what to do with the new function:
+
 @lisp
 @lisp
 (add-hook 'org-mode-hook
 (add-hook 'org-mode-hook
           (lambda ()
           (lambda ()