branch: master
commit c18672a227357a4fd26df99336b0a431d1f69ef5
Author: Joao Tavora <joaotav...@gmail.com>
Commit: Joao Tavora <joaotav...@gmail.com>

    Closes #447: only call command beyond yasnippet if it exists
---
 yasnippet.el |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 9990bc8..9348590 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -2276,7 +2276,8 @@ Common gateway for `yas-expand-from-trigger-key' and
            (yas--message 4 "Falling back to %s"  beyond-yasnippet)
            (assert (or (null beyond-yasnippet) (commandp beyond-yasnippet)))
            (setq this-original-command beyond-yasnippet)
-           (call-interactively beyond-yasnippet)))
+           (when beyond-yasnippet
+             (call-interactively beyond-yasnippet))))
         ((and (listp yas-fallback-behavior)
               (cdr yas-fallback-behavior)
               (eq 'apply (car yas-fallback-behavior)))

Reply via email to