From 42bb2790f0d45bd45f8b2973d6ba7d68a21a75e5 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 15 Jun 1994 18:17:55 +0000 Subject: [PATCH] (Fcall_interactively): Ignore `-' in string. (Fcall_interactively): Don't call minibuffer-window-active-p; determine directly whether a minibuf window is active. --- src/callint.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/callint.c b/src/callint.c index 1a79cb06ec1..0f996e1b5f2 100644 --- a/src/callint.c +++ b/src/callint.c @@ -311,7 +311,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.") (XVECTOR (this_command_keys)->contents[next_event])) break; - /* Handle special starting chars `*' and `@'. */ + /* Handle special starting chars `*' and `@'. Also `-'. */ while (1) { if (*string == '*') @@ -320,6 +320,9 @@ Otherwise, this is done only if an arg is read using the minibuffer.") if (!NILP (current_buffer->read_only)) Fbarf_if_buffer_read_only (); } + /* Ignore this for semi-compatibility with Lucid. */ + else if (*string == '-') + string++; else if (*string == '@') { Lisp_Object event; @@ -331,8 +334,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.") && XTYPE (event = XCONS (event)->car) == Lisp_Window) { if (MINI_WINDOW_P (XWINDOW (event)) - && NILP (call1 (intern ("minibuffer-window-active-p"), - event))) + && ! (minibuf_level > 0 && EQ (event, minibuf_window))) error ("Attempt to select inactive minibuffer window"); Fselect_window (event); } -- 2.39.5