comparison src/keyboard.c @ 10827:4dfd3634b155

(unlock_display): New function. (cmd_error, command_loop_1): Call it when appropriate. (read_char): If no current display, don't try to echo.

10826:bd0ab0601489

  command_loop_level--;
  update_mode_lines = 1;
  return Qnil;
}

Lisp_Object
cmd_error (data)
     Lisp_Object data;
{
  Vstandard_output = Qt;

  Vquit_flag = Qnil;

  Vinhibit_quit = Qnil;
#ifdef MULTI_PERDISPLAY
  current_perdisplay = 0;
  display_locked = 0;
#endif

  return make_number (0);
}

  int no_redisplay;
  int no_direct;
  int prev_modiff;
  struct buffer *prev_buffer;
#ifdef MULTI_PERDISPLAY
  PERDISPLAY *outer_perdisplay = current_perdisplay;
#endif

  Vdeactivate_mark = Qnil;
  waiting_for_input = 0;
  if (current_perdisplay)

      if (defining_kbd_macro && NILP (current_perdisplay->Vprefix_arg))
	finalize_kbd_macro_chars ();

#ifdef MULTI_PERDISPLAY
      current_perdisplay = outer_perdisplay;
      display_locked = (current_perdisplay != 0);
#endif
    }
}

/* If we get an error while running the hook, cause the hook variable

	Vquit_flag = Qnil;

      goto non_reread;
    }

  /* Message turns off echoing unless more keystrokes turn it on again. */
  if (echo_area_glyphs && *echo_area_glyphs
      && echo_area_glyphs != current_perdisplay->echobuf)
    cancel_echoing ();
  else
    /* If already echoing, continue.  */
    echo_dash ();

  /* Try reading a character via menu prompting in the minibuf.
     Try this before the sit-for, because the sit-for
     would do the wrong thing if we are supposed to do
     menu prompting. If EVENT_HAS_PARAMETERS then we are reading

	}
    }

  /* If in middle of key sequence and minibuffer not active,
     start echoing if enough time elapses.  */
  if (minibuf_level == 0 && !current_perdisplay->immediate_echo
      && this_command_key_count > 0
      && ! noninteractive
      && echo_keystrokes > 0
      && (echo_area_glyphs == 0 || *echo_area_glyphs == 0))
    {

10827:4dfd3634b155

  command_loop_level--;
  update_mode_lines = 1;
  return Qnil;
}

#ifdef MULTI_PERDISPLAY
static void
unlock_display ()
{
  if (CONSP (Vunread_command_events))
    current_perdisplay->kbd_queue
      = nconc2 (Vunread_command_events, current_perdisplay->kbd_queue);
  Vunread_command_events = Qnil;
  current_perdisplay = 0;
  display_locked = 0;
}
#endif

Lisp_Object
cmd_error (data)
     Lisp_Object data;
{
  Vstandard_output = Qt;

  Vquit_flag = Qnil;

  Vinhibit_quit = Qnil;
#ifdef MULTI_PERDISPLAY
  unlock_display ();
#endif

  return make_number (0);
}

  int no_redisplay;
  int no_direct;
  int prev_modiff;
  struct buffer *prev_buffer;
#ifdef MULTI_PERDISPLAY
  int was_locked = display_locked;
#endif

  Vdeactivate_mark = Qnil;
  waiting_for_input = 0;
  if (current_perdisplay)

      if (defining_kbd_macro && NILP (current_perdisplay->Vprefix_arg))
	finalize_kbd_macro_chars ();

#ifdef MULTI_PERDISPLAY
      if (!was_locked)
	unlock_display ();
#endif
    }
}

/* If we get an error while running the hook, cause the hook variable

	Vquit_flag = Qnil;

      goto non_reread;
    }

  if (current_perdisplay)
    {
      /* Message turns off echoing unless more keystrokes turn it on again. */
      if (echo_area_glyphs && *echo_area_glyphs
	  && echo_area_glyphs != current_perdisplay->echobuf)
	cancel_echoing ();
      else
	/* If already echoing, continue.  */
	echo_dash ();
    }

  /* Try reading a character via menu prompting in the minibuf.
     Try this before the sit-for, because the sit-for
     would do the wrong thing if we are supposed to do
     menu prompting. If EVENT_HAS_PARAMETERS then we are reading

	}
    }

  /* If in middle of key sequence and minibuffer not active,
     start echoing if enough time elapses.  */
  if (current_perdisplay
      && minibuf_level == 0
      && !current_perdisplay->immediate_echo
      && this_command_key_count > 0
      && ! noninteractive
      && echo_keystrokes > 0
      && (echo_area_glyphs == 0 || *echo_area_glyphs == 0))
    {