From 4130a3a6ae474a4f030d3546de6e43d606e63846 Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Mon, 24 Jan 2022 19:48:40 +0200
Subject: [PATCH] Fix ESC so it cancels the movement prefix commands

My changes to turn the movement and prefix commands into
extended commands broke this.
---
 src/cmd.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/cmd.c b/src/cmd.c
index 4eef6a2f7..74d1180f1 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -3784,6 +3784,11 @@ got_prefix_input:
     if (*cmd == g.Cmd.spkeys[NHKF_ESC]) {
         g.context.move = FALSE;
         iflags.menu_requested = FALSE;
+        g.context.run = 0;
+        g.context.nopick = g.context.forcefight = FALSE;
+        g.context.mv = FALSE;
+        g.multi = 0;
+        g.domove_attempting = 0;
         return;
     }