From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeffrey Horn Subject: [PATCH] Fix typos in yasnippet conflict entry Date: Fri, 14 Jan 2011 03:33:27 -0500 Message-ID: <1294994007-7384-1-git-send-email-jrhorn424@gmail.com> Return-path: Received: from [140.186.70.92] (port=45747 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pdf6K-0005cq-2O for emacs-orgmode@gnu.org; Fri, 14 Jan 2011 03:33:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pdf6I-0003C2-Kq for emacs-orgmode@gnu.org; Fri, 14 Jan 2011 03:33:39 -0500 Received: from mail-qy0-f169.google.com ([209.85.216.169]:60914) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pdf6I-0003Bs-Hm for emacs-orgmode@gnu.org; Fri, 14 Jan 2011 03:33:38 -0500 Received: by qyk7 with SMTP id 7so5910949qyk.0 for ; Fri, 14 Jan 2011 00:33:38 -0800 (PST) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Cc: Jeffrey Horn Changed "yasnippets" to "yasnippet" and added extra whitespace around functions to be consistent with the rest of the section. --- doc/org.texi | 4 +++- 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 () -- 1.7.3.5