2 files changed, 12 insertions, 0 deletions

diff --git a/src/callint.c b/src/callint.c
index f80436f3d91..a221705f676 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -283,6 +283,11 @@ invoke it (via an `interactive' spec that contains, for instance, an
   Lisp_Object save_real_this_command = Vreal_this_command;
   Lisp_Object save_last_command = KVAR (current_kboard, Vlast_command);
 
+  /* Bound recursively so that code can check the current command from
+     code running from minibuffer hooks (and the like), without being
+     overwritten by subsequent minibuffer calls.  */
+  specbind (Qcurrent_minibuffer_command, Vreal_this_command);
+
   if (NILP (keys))
     keys = this_command_keys, key_count = this_command_key_count;
   else
diff --git a/src/keyboard.c b/src/keyboard.c
index dbca5be91e4..54232aaea1e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11830,6 +11830,13 @@ will be in `last-command' during the following command.  */);
                doc: /* This is like `this-command', except that commands should never modify it.  */);
   Vreal_this_command = Qnil;
 
+  DEFSYM (Qcurrent_minibuffer_command, "current-minibuffer-command");
+  DEFVAR_LISP ("current-minibuffer-command", Vcurrent_minibuffer_command,
+               doc: /* This is like `this-command', but bound recursively.
+Code running from (for instance) a minibuffer hook can check this variable
+to see what command invoked the current minibuffer.  */);
+  Vcurrent_minibuffer_command = Qnil;
+
   DEFVAR_LISP ("this-command-keys-shift-translated",
                Vthis_command_keys_shift_translated,
                doc: /* Non-nil if the key sequence activating this command was shift-translated.