comparison src/callint.c @ 7912:f87185e63bbc

(Fcall_interactively): Ignore `-' in string. (Fcall_interactively): Don't call minibuffer-window-active-p; determine directly whether a minibuf window is active.

7911:185c1f12db67

  for (next_event = 0; next_event < this_command_key_count; next_event++)
    if (EVENT_HAS_PARAMETERS
	(XVECTOR (this_command_keys)->contents[next_event]))
      break;
  
  /* Handle special starting chars `*' and `@'.  */
  while (1)
    {
      if (*string == '*')
	{
	  string++;
	  if (!NILP (current_buffer->read_only))
	    Fbarf_if_buffer_read_only ();
	}
      else if (*string == '@')
	{
	  Lisp_Object event;

	  event = XVECTOR (this_command_keys)->contents[next_event];

	      && XTYPE (event = XCONS (event)->cdr) == Lisp_Cons
	      && XTYPE (event = XCONS (event)->car) == Lisp_Cons
	      && XTYPE (event = XCONS (event)->car) == Lisp_Window)
	    {
	      if (MINI_WINDOW_P (XWINDOW (event))
		  && NILP (call1 (intern ("minibuffer-window-active-p"),
				  event)))
		error ("Attempt to select inactive minibuffer window");
	      Fselect_window (event);
	    }
	  string++;
	}

7912:f87185e63bbc

  for (next_event = 0; next_event < this_command_key_count; next_event++)
    if (EVENT_HAS_PARAMETERS
	(XVECTOR (this_command_keys)->contents[next_event]))
      break;
  
  /* Handle special starting chars `*' and `@'.  Also `-'.  */
  while (1)
    {
      if (*string == '*')
	{
	  string++;
	  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;

	  event = XVECTOR (this_command_keys)->contents[next_event];

	      && XTYPE (event = XCONS (event)->cdr) == Lisp_Cons
	      && XTYPE (event = XCONS (event)->car) == Lisp_Cons
	      && XTYPE (event = XCONS (event)->car) == Lisp_Window)
	    {
	      if (MINI_WINDOW_P (XWINDOW (event))
		  && ! (minibuf_level > 0 && EQ (event, minibuf_window)))
		error ("Attempt to select inactive minibuffer window");
	      Fselect_window (event);
	    }
	  string++;
	}