1 files changed, 4 insertions, 0 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 31137ffc679..bf083c23d66 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1234,6 +1234,10 @@ command_loop ()
     while (1)
       {
         internal_catch (Qtop_level, top_level_1, Qnil);
+        /* Reset single_kboard in case top-level set it while
+           evaluating an -f option, or we are stuck there for some
+           other reason. */
+        any_kboard_state ();
         internal_catch (Qtop_level, command_loop_2, Qnil);
         executing_macro = Qnil;