Revert "An '--expect' key should execute actions bound to the key"

To be backward compatible.

Close #3829

1 files changed, 8 insertions, 12 deletions

diff --git a/src/terminal.go b/src/terminal.go
index 0e945fad..ff6295f1 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -3608,6 +3608,14 @@ func (t *Terminal) Loop() error {
 		}
 
 		t.mutex.Lock()
+		for key, ret := range t.expect {
+			if keyMatch(key, event) {
+				t.pressed = ret
+				t.reqBox.Set(reqClose, nil)
+				t.mutex.Unlock()
+				return nil
+			}
+		}
 		previousInput := t.input
 		previousCx := t.cx
 		t.lastKey = event.KeyName()
@@ -4460,18 +4468,6 @@ func (t *Terminal) Loop() error {
 			return true
 		}
 
-		for key, ret := range t.expect {
-			if keyMatch(key, event) {
-				t.pressed = ret
-				if actions, found := t.keymap[key]; found {
-					doActions(actions)
-				}
-				t.reqBox.Set(reqClose, nil)
-				t.mutex.Unlock()
-				return nil
-			}
-		}
-
 		if t.jumping == jumpDisabled || len(actions) > 0 {
 			// Break out of jump mode if any action is submitted to the server
 			if t.jumping != jumpDisabled {