From 7e3ce48d3c12b8013b0837dc28c5b5ea40808272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Mon, 26 Mar 2012 01:27:16 +0100 Subject: [PATCH 1/3] Fix #207 --- README.mdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.mdown b/README.mdown index a46fbe3..f785efa 100644 --- a/README.mdown +++ b/README.mdown @@ -13,7 +13,7 @@ SQL, LaTeX, HTML, CSS and more. The snippet syntax is inspired from [textmate-snippets]: http://manual.macromates.com/en/snippets [import-docs]: http://yasnippet.googlecode.com/svn/trunk/doc/snippet-development.html#importing-textmate-snippets -[youtube-demo]: http://www.youtube.com/watch?v=76Ygeg9miao +[youtube-demo]: http://www.youtube.com/watch?v=ZCGmZK4V7Sg [high-res-demo]: http://yasnippet.googlecode.com/files/yas_demo.avi # Installation From 69a10619556a6caf6cb17265f6c9e595e63d3519 Mon Sep 17 00:00:00 2001 From: immerrr Date: Thu, 19 Apr 2012 23:29:37 +0400 Subject: [PATCH 2/3] yas/ido-prompt: play nice with autoloading of ido-completing-read --- yasnippet.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yasnippet.el b/yasnippet.el index f0aaaeb..e9c0dfd 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -1551,7 +1551,7 @@ TEMPLATES is a list of `yas/template'." (keyboard-quit)))) (defun yas/ido-prompt (prompt choices &optional display-fn) - (when (featurep 'ido) + (when (fboundp 'ido-completing-read) (yas/completing-prompt prompt choices display-fn #'ido-completing-read))) (eval-when-compile (require 'dropdown-list nil t)) From 61ccd9b4abef4ea574b259a8199329020b090c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Mon, 26 Mar 2012 03:48:31 +0100 Subject: [PATCH 3/3] Should really exit all snippets --- yasnippet.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yasnippet.el b/yasnippet.el index e9c0dfd..c7a37bd 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -2940,7 +2940,7 @@ Also create some protection overlays" (mapc #'(lambda (snippet) (yas/exit-snippet snippet) (yas/check-commit-snippet)) - (yas/snippets-at-point))) + (yas/snippets-at-point 'all-snippets))) ;;; Some low level snippet-routines