From 7ab75027cce0bd9dee632f9438ca0c8933f76c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Sun, 26 Feb 2012 20:46:25 +0000 Subject: [PATCH 1/4] Removed reference to deprecated yasnippet-bundle in README.mdown --- README.mdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.mdown b/README.mdown index aac1726..a46fbe3 100644 --- a/README.mdown +++ b/README.mdown @@ -29,7 +29,7 @@ Add the following in your `.emacs` file: (add-to-list 'load-path "~/.emacs.d/plugins/yasnippet") - (require 'yasnippet) ;; not yasnippet-bundle + (require 'yasnippet) (yas/global-mode 1) Add your own snippets to `~/.emacs.d/snippets` by placing files there or invoking `yas/new-snippet`. From 893a9b3594a44d5d0ab7de8ed80334258bbb80c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Mon, 27 Feb 2012 02:34:02 +0000 Subject: [PATCH 2/4] Load correct .yas-setup and .yas-compiled-snippets file when loading a snippet dir --- yasnippet.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yasnippet.el b/yasnippet.el index d1af979..5056372 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -1606,9 +1606,9 @@ TEMPLATES is a list of `yas/template'." (unless (file-exists-p (concat directory "/" ".yas-skip")) ;; Load .yas-setup.el files wherever we find them ;; - (load ".yas-setup" 'noerror) + (load (expand-file-name ".yas-setup" directory) 'noerror) (if (and (not no-compiled-snippets) - (load ".yas-compiled-snippets" 'noerror)) + (load (expand-file-name ".yas-compiled-snippets" directory) 'noerror)) (message "Loading much faster .yas-compiled-snippets from %s" directory) (let* ((major-mode-and-parents (if mode-sym (cons mode-sym parents) From 95195d132456ed7b7d912465a15a253d08295b56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Mon, 27 Feb 2012 02:34:29 +0000 Subject: [PATCH 3/4] Fix typo that resulted on error --- yasnippet.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yasnippet.el b/yasnippet.el index 5056372..44154c1 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -2277,7 +2277,7 @@ where snippets of table might exist." ;; create the .yas-parents file here... candidate))))) -(defun yas/new-snippet (&optional NO-TEMPLATE) +(defun yas/new-snippet (&optional no-template) "Pops a new buffer for writing a snippet. Expands a snippet-writing snippet, unless the optional prefix arg From 8a40e08f3102907b4bad5832a0c7dc24f5cd31ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Mon, 27 Feb 2012 02:54:13 +0000 Subject: [PATCH 4/4] ignore compiled snippets files --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6cc2365..877fa4e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ doc/gh-pages doc/*.html pkg/ extras/imported/** -!extras/imported/*/.yas_setup.el +!extras/imported/*/.yas-setup.el +.yas-compiled-snippets.el *.elc