From 6c46878882f83cb469e879ad70eeec47e190b771 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Tue, 8 Dec 2015 18:19:02 -0500 Subject: [PATCH] Fix #587; set `this-command' on fallback. `this-original-command' is supposed to be for the command that we're *not* executing because of key remapping, therefore it doesn't make sense to set it to the command we're about to execute. * yasnippet.el (yas--fallback): Set `this-command'. --- yasnippet.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yasnippet.el b/yasnippet.el index 803be0b..9389719 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -2233,7 +2233,7 @@ Common gateway for `yas-expand-from-trigger-key' and (beyond-yasnippet (yas--keybinding-beyond-yasnippet))) (yas--message 4 "Falling back to %s" beyond-yasnippet) (assert (or (null beyond-yasnippet) (commandp beyond-yasnippet))) - (setq this-original-command beyond-yasnippet) + (setq this-command beyond-yasnippet) (when beyond-yasnippet (call-interactively beyond-yasnippet)))) ((and (listp yas-fallback-behavior)