]> code.delx.au - gnu-emacs-elpa/commitdiff
Fix #587; set `this-command' on fallback.
authorNoam Postavsky <npostavs@users.sourceforge.net>
Tue, 8 Dec 2015 23:19:02 +0000 (18:19 -0500)
committerNoam Postavsky <npostavs@users.sourceforge.net>
Tue, 8 Dec 2015 23:19:02 +0000 (18:19 -0500)
`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

index 803be0ba50e23b91171297c5486eacb5c687272c..9389719eda59771aaeb13c2419a5d2b07a3abc06 100644 (file)
@@ -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)