comparison src/keyboard.c @ 73318:e876a1f62fec

* dispnew.c (sit_for): Sit forever if TIMEOUT is t. * keyboard.c (command_loop_1): Handle non-number values of `minibuffer-message-timeout'. (Fexecute_extended_command): Fix typo. * minibuf.c (temp_echo_area_glyphs): Sit for `minibuffer-message-timeout' seconds.

73317:a8f3a59e04e0

      /* If minibuffer on and echo area in use,
	 wait a short time and redraw minibuffer.  */

      if (minibuf_level
	  && !NILP (echo_area_buffer[0])
	  && EQ (minibuf_window, echo_area_window)
	  && NUMBERP (Vminibuffer_message_timeout))
	{
	  /* Bind inhibit-quit to t so that C-g gets read in
	     rather than quitting back to the minibuffer.  */
	  int count = SPECPDL_INDEX ();
	  specbind (Qinhibit_quit, Qt);

	  sit_for (Vminibuffer_message_timeout, 0, 2);

	  /* Clear the echo area.  */
	  message2 (0, 0, 0);
	  safe_run_hooks (Qecho_area_clear_hook);

      /* If this command displayed something in the echo area;
	 wait a few seconds, then display our suggestion message.  */
      if (NILP (echo_area_buffer[0]))
	waited = sit_for (make_number (0), 0, 2);
      else if (NUMBERP (Vsuggest_key_bindings))
	waited = sit_for (Vminibuffer_message_timeout, 0, 2);
      else
	waited = sit_for (make_number (2), 0, 2);

      if (!NILP (waited) && ! CONSP (Vunread_command_events))
	{

73318:e876a1f62fec

      /* If minibuffer on and echo area in use,
	 wait a short time and redraw minibuffer.  */

      if (minibuf_level
	  && !NILP (echo_area_buffer[0])
	  && EQ (minibuf_window, echo_area_window))
	{
	  /* Bind inhibit-quit to t so that C-g gets read in
	     rather than quitting back to the minibuffer.  */
	  int count = SPECPDL_INDEX ();
	  specbind (Qinhibit_quit, Qt);

	  if (NUMBERP (Vminibuffer_message_timeout))
	    sit_for (Vminibuffer_message_timeout, 0, 2);
	  else
	    sit_for (Qt, 0, 2);

	  /* Clear the echo area.  */
	  message2 (0, 0, 0);
	  safe_run_hooks (Qecho_area_clear_hook);

      /* If this command displayed something in the echo area;
	 wait a few seconds, then display our suggestion message.  */
      if (NILP (echo_area_buffer[0]))
	waited = sit_for (make_number (0), 0, 2);
      else if (NUMBERP (Vsuggest_key_bindings))
	waited = sit_for (Vsuggest_key_bindings, 0, 2);
      else
	waited = sit_for (make_number (2), 0, 2);

      if (!NILP (waited) && ! CONSP (Vunread_command_events))
	{