[elpa] externals/yasnippet 5af84cdb94 2/2: Merge pull request #1184 from martenlienen/local-condition-closure

[ELPA Syncer]

branch: externals/yasnippet
commit 5af84cdb94fb2f45933c13b5aed378425b487564
Merge: 1d0966ae34 9228fd983b
Author: monnier <monnier@iro.umontreal.ca>
Commit: GitHub <noreply@github.com>

    Merge pull request #1184 from martenlienen/local-condition-closure
    
    Allow closures in yas-buffer-local-condition
---
 yasnippet.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 54616d4895..d6e5d69a50 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1366,10 +1366,10 @@ conditions to filter out potential expansions."
       'always
     (let ((local-condition
            (or (cond
-                ((consp yas-buffer-local-condition)
-                 (yas--funcall-condition #'eval yas-buffer-local-condition t))
                 ((functionp yas-buffer-local-condition)
-                 (yas--funcall-condition yas-buffer-local-condition)))
+                 (yas--funcall-condition yas-buffer-local-condition))
+                ((consp yas-buffer-local-condition)
+                 (yas--funcall-condition #'eval yas-buffer-local-condition t)))
                yas-buffer-local-condition)))
       (when local-condition
         (if (eq local-condition t)