branch: elpa/magit
commit 66e3ddffe4b205d102ff5bebc04fc08fc0d17f58
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-git-mergetool: Fix suffix invocation edge-case
Iff the user invoked the self-suffix with a prefix argument (which is
not a reasonable thing to do in this case), then the command was again
invoked as a menu. We tried to protect against that user error, but
failed to do so, because we checked the value of the wrong variable.
---
lisp/magit-extras.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index 5cc64a386b5..5e399440fe3 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -64,7 +64,7 @@ alternative commands."
["Actions"
(" m" "Invoke mergetool" magit-git-mergetool)]
(interactive
- (if (and (not (eq transient-current-prefix 'magit-git-mergetool))
+ (if (and (not (eq transient-current-command 'magit-git-mergetool))
current-prefix-arg)
(list nil nil t)
(list (magit-read-unmerged-file "Resolve")
