* [PATCH] Fix typos in yasnippet conflict entry
@ 2011-01-14 8:33 Jeffrey Horn
2011-01-14 13:30 ` Eric Schulte
0 siblings, 1 reply; 2+ messages in thread
From: Jeffrey Horn @ 2011-01-14 8:33 UTC (permalink / raw)
To: emacs-orgmode; +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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix typos in yasnippet conflict entry
2011-01-14 8:33 [PATCH] Fix typos in yasnippet conflict entry Jeffrey Horn
@ 2011-01-14 13:30 ` Eric Schulte
0 siblings, 0 replies; 2+ messages in thread
From: Eric Schulte @ 2011-01-14 13:30 UTC (permalink / raw)
To: Jeffrey Horn; +Cc: emacs-orgmode
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 ()
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-14 13:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-14 8:33 [PATCH] Fix typos in yasnippet conflict entry Jeffrey Horn
2011-01-14 13:30 ` Eric Schulte
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).