Closes #447: only call command beyond yasnippet if it exists

This commit is contained in:
Joao Tavora 2013-12-24 09:43:56 +00:00
parent 0567c931f4
commit c18672a227

View File

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