comparison src/keyboard.c @ 71761:1055c0769159

* puresize.h (BASE_PURESIZE): Increment to 1211000. * dispnew.c (Fredisplay): New function, equivalent to (sit-for 0). (Fsit_for): Function deleted. * keyboard.c (command_loop_1, Fexecute_extended_command): Call sit_for instead of Fsit_for. * minibuf.c (temp_echo_area_glyphs): Likewise.

71760:68765d892dce

	  && 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);

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

	  unbind_to (count, Qnil);

  if (!NILP (bindings)
      && ! (VECTORP (bindings) && EQ (Faref (bindings, make_number (0)),
				      Qmouse_movement)))
    {
      /* But first wait, and skip the message if there is input.  */
      int delay_time;
      if (!NILP (echo_area_buffer[0]))
	/* This command displayed something in the echo area;
	   so wait a few seconds, then display our suggestion message.  */
	delay_time = (NUMBERP (Vsuggest_key_bindings)
		      ? XINT (Vsuggest_key_bindings) : 2);
      else
	/* This command left the echo area empty,
	   so display our message immediately.  */
	delay_time = 0;

      if (!NILP (Fsit_for (make_number (delay_time), Qnil, Qnil))
	  && ! CONSP (Vunread_command_events))
	{
	  Lisp_Object binding;
	  char *newmessage;
	  int message_p = push_message ();
	  int count = SPECPDL_INDEX ();

		   SDATA (SYMBOL_NAME (function)),
		   SDATA (binding));
	  message2_nolog (newmessage,
			  strlen (newmessage),
			  STRING_MULTIBYTE (binding));
	  if (!NILP (Fsit_for ((NUMBERP (Vsuggest_key_bindings)
				? Vsuggest_key_bindings : make_number (2)),
			       Qnil, Qnil))
	      && message_p)
	    restore_message ();

	  unbind_to (count, Qnil);
	}
    }

71761:1055c0769159

	  && 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 ();
	  double duration = extract_float (Vminibuffer_message_timeout);
	  specbind (Qinhibit_quit, Qt);

	  sit_for ((int) duration, (duration - (int) duration) * 1000000,
		   0, Qt, Qt);
	  /* Clear the echo area.  */
	  message2 (0, 0, 0);
	  safe_run_hooks (Qecho_area_clear_hook);

	  unbind_to (count, Qnil);

  if (!NILP (bindings)
      && ! (VECTORP (bindings) && EQ (Faref (bindings, make_number (0)),
				      Qmouse_movement)))
    {
      /* But first wait, and skip the message if there is input.  */
      Lisp_Object waited;

      if (!NILP (echo_area_buffer[0]))
	{
	  /* This command displayed something in the echo area;
	     so wait a few seconds, then display our suggestion message.  */
	  if (NUMBERP (Vsuggest_key_bindings))
	    {
	      double duration = extract_float (Vminibuffer_message_timeout);
	      waited = sit_for ((int) duration,
				(duration - (int) duration) * 1000000,
				0, Qt, Qt);
	    }
	  else
	    waited = sit_for (2, 0, 0, Qt, Qt);
	}
      else
	waited = sit_for (0, 0, 0, Qt, Qt);

      if (!NILP (waited) && ! CONSP (Vunread_command_events))
	{
	  Lisp_Object binding;
	  char *newmessage;
	  int message_p = push_message ();
	  int count = SPECPDL_INDEX ();

		   SDATA (SYMBOL_NAME (function)),
		   SDATA (binding));
	  message2_nolog (newmessage,
			  strlen (newmessage),
			  STRING_MULTIBYTE (binding));
	  if (NUMBERP (Vsuggest_key_bindings))
	    {
	      double duration = extract_float (Vsuggest_key_bindings);
	      waited = sit_for ((int) duration,
				(duration - (int) duration) * 1000000,
				0, Qt, Qt);
	    }
	  else
	    waited = sit_for (2, 0, 0, Qt, Qt);

	  if (!NILP (waited) && message_p)
	    restore_message ();

	  unbind_to (count, Qnil);
	}
    }