From 7981f8d63b133d596c0bd83d0e33534bef36a3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Wed, 15 Aug 2012 15:09:59 +0100 Subject: [PATCH] Closes #281: jit-load in reverse order to maintain coherence with `yas-snippet-dirs` --- yasnippet-tests.el | 6 ++++-- yasnippet.el | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/yasnippet-tests.el b/yasnippet-tests.el index ad125da..9af244b 100644 --- a/yasnippet-tests.el +++ b/yasnippet-tests.el @@ -247,11 +247,13 @@ TODO: correct this bug!" '((".emacs.d/snippets" ("c-mode" (".yas-parents" . "cc-mode") - ("printf" . "printf($1);")) + ("printf" . "printf($1);")) ;; notice the overriding for issue #281 ("emacs-lisp-mode" ("ert-deftest" . "(ert-deftest ${1:name} () $0)")) ("lisp-interaction-mode" (".yas-parents" . "emacs-lisp-mode"))) ("library/snippets" - ("c-mode" (".yas-parents" . "c++-mode")) + ("c-mode" + (".yas-parents" . "c++-mode") + ("printf" . "printf")) ("cc-mode" ("def" . "# define")) ("emacs-lisp-mode" ("dolist" . "(dolist)")) ("lisp-interaction-mode" ("sc" . "brother from another mother")))) diff --git a/yasnippet.el b/yasnippet.el index db004d0..ab84696 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -1812,6 +1812,7 @@ loading." (when yas-minor-mode (dolist (mode (yas--modes-to-activate)) (let ((forms (gethash mode yas--scheduled-jit-loads))) + ;; must reverse to maintain coherence with `yas-snippet-dirs' (dolist (form forms) (yas--message 3 "Loading for `%s', just-in-time: %s!" mode form) (eval form))