[PATCH] Fix conflict doc

[PATCH] Fix conflict doc

[Jeff Horn]

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

(Eric, mind glancing at the patch?)

In regard to the following message:

    http://article.gmane.org/gmane.emacs.orgmode/35931

This patch incorporates Eric Schulte's method of making org-mode work
with yasnippet into the documentation.

-- 
Jeffrey Horn
http://www.failuretorefrain.com/jeff/

[-- Attachment #2: fix-conflict-doc.patch --]
[-- Type: application/octet-stream, Size: 1817 bytes --]

From 1a6798b117d163ba51cfc890eb5aa0af65532168 Mon Sep 17 00:00:00 2001
From: Jeffrey Horn <jrhorn424@gmail.com>
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-<cursor>} keys, so everything written
-- 
1.7.2


[-- Attachment #3: Type: text/plain, Size: 201 bytes --]

_______________________________________________
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode

Re: [PATCH] Fix conflict doc

[Jeff Horn]

Hmm.. This wasn't picked up by patchwork. Please ignore. I'll try
sending using =git send-email= instead.

On Tue, Jan 11, 2011 at 1:19 AM, Jeff Horn <jrhorn424@gmail.com> wrote:
> (Eric, mind glancing at the patch?)
>
> In regard to the following message:
>
>    http://article.gmane.org/gmane.emacs.orgmode/35931
>
> This patch incorporates Eric Schulte's method of making org-mode work
> with yasnippet into the documentation.
>
> --
> Jeffrey Horn
> http://www.failuretorefrain.com/jeff/
>



-- 
Jeffrey Horn
http://www.failuretorefrain.com/jeff/

Re: Re: [PATCH] Fix conflict doc

[Nick Dokos]

Jeff Horn <jrhorn424@gmail.com> wrote:

> Hmm.. This wasn't picked up by patchwork. Please ignore. I'll try
> sending using =git send-email= instead.
> 

That's because the attachment was not typed correctly: it should
probably be text/plain instead of application/octet-stream (a useless,
zero-information default).

I've ranted about this before, but in all fairness, this is not
necessarily the sender's fault: there seem to be brain-dead mail clients
out there (Thunderbird seems to be one), which don't give you the choice
of how to type your attachment - in T'bird's case, it is done in the
interest of user-friendliness (don't get me going on that).  OTOH, if
your mailer *does* give you the option, you have nobody to blame but
yourself :-)

See e.g http://thread.gmane.org/gmane.emacs.orgmode/27001/focus=27200

I thought there was a mention of this in

 http://orgmode.org/worg/org-contribute.html

but I cannot find it now.

HTH,
Nick

> On Tue, Jan 11, 2011 at 1:19 AM, Jeff Horn <jrhorn424@gmail.com> wrote:
> > (Eric, mind glancing at the patch?)
> >
> > In regard to the following message:
> >
> >    http://article.gmane.org/gmane.emacs.orgmode/35931
> >
> > This patch incorporates Eric Schulte's method of making org-mode work
> > with yasnippet into the documentation.
> >
> > --
> > Jeffrey Horn
> > http://www.failuretorefrain.com/jeff/
> >
> 
> 
> 
> -- 
> Jeffrey Horn
> http://www.failuretorefrain.com/jeff/
> 
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
> 

Re: [PATCH] Fix conflict doc

[Eric Schulte]

Hi Jeff,

Thanks for putting this patch together, I've just checked it out and it
looks great.  It is now applied to the repository.

Also, thanks for submitting a documentation patch, the manual is an
incredible resource, and constant attention like this issue pointed out
by Puneeth and yourself are required to maintain it's usefulness.

If you think you may be submitting more patches in the future you may
want to consider going through the FSF assignment process [1].  The
process takes a while so it's best to have it completed before you have
a patch waiting in the wings.  Normally I wouldn't have been able to
apply this patch without you going through the process because it is
over 10 lines long, but since much of the patch consists of code
originally written by myself, I think it is ok this time.

Thanks for the contribution! -- Eric

Jeff Horn <jrhorn424@gmail.com> writes:

> (Eric, mind glancing at the patch?)
>
> In regard to the following message:
>
>     http://article.gmane.org/gmane.emacs.orgmode/35931
>
> This patch incorporates Eric Schulte's method of making org-mode work
> with yasnippet into the documentation.

Footnotes: 
[1]  http://orgmode.org/worg/org-contribute.html