Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

1 files changed, 7 insertions, 0 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index e8d0747210a..7f12449a39c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11838,6 +11838,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.