From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Eric Schulte" <schulte.eric@gmail.com>
Subject: Re: [PATCH] Fix typos in yasnippet conflict entry
Date: Fri, 14 Jan 2011 06:30:00 -0700
Message-ID: <87zkr37gfn.fsf@gmail.com>
References: <1294994007-7384-1-git-send-email-jrhorn424@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=34428 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PdjsJ-0007Pa-Va
	for emacs-orgmode@gnu.org; Fri, 14 Jan 2011 08:39:32 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <schulte.eric@gmail.com>) id 1PdjsI-0000GC-St
	for emacs-orgmode@gnu.org; Fri, 14 Jan 2011 08:39:31 -0500
Received: from mail-pz0-f41.google.com ([209.85.210.41]:50699)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <schulte.eric@gmail.com>) id 1PdjsI-0000G5-Np
	for emacs-orgmode@gnu.org; Fri, 14 Jan 2011 08:39:30 -0500
Received: by pzk27 with SMTP id 27so482013pzk.0
	for <emacs-orgmode@gnu.org>; Fri, 14 Jan 2011 05:39:29 -0800 (PST)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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: Jeffrey Horn <jrhorn424@gmail.com>
Cc: emacs-orgmode@gnu.org

Thanks for the patch.  It has been applied.

Jeffrey Horn <jrhorn424@gmail.com> writes:

> 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 ()