branch: master
commit 6c46878882f83cb469e879ad70eeec47e190b771
Author: Noam Postavsky <[email protected]>
Commit: Noam Postavsky <[email protected]>

    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 files changed, 1 insertions(+), 1 deletions(-)

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)

Reply via email to