comparison src/keyboard.c @ 83409:be1f74bffc1d

Fix "first non-ASCII character on new tty frames" problem. * src/keyboard.c (kbd_buffer_store_event_hold): Simplify condition. (read_key_sequence): Reinitialize fkey and keytran at each replay. * src/coding.c (Fkeyboard_coding_system): Update doc. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-449

83408:39bb10ce301a

     around any call to sit_for or kbd_buffer_get_event;
     it *must not* be in effect when we call redisplay.  */

  if (_setjmp (local_getcjmp))
    {
      /* We must have saved the outer value of getcjmp here,
	 so restore it now.  */
      restore_getcjmp (save_jump);
      XSETINT (c, quit_char);
      internal_last_event_frame = selected_frame;

	       | hyper_modifier | super_modifier));

      if (c == quit_char)
	{
#ifdef MULTI_KBOARD
	  KBOARD *kb;
	  struct input_event *sp;

	  if (single_kboard
	      && (kb = FRAME_KBOARD (XFRAME (event->frame_or_window)),
		  kb != current_kboard))
	    {
	      kb->kbd_queue
		= Fcons (make_lispy_switch_frame (event->frame_or_window),
			 Fcons (make_number (c), Qnil));
	      kb->kbd_queue_has_data = 1;

  raw_keybuf_count = 0;

  last_nonmenu_event = Qnil;

  delayed_switch_frame = Qnil;
  fkey.map = fkey.parent = current_kboard->Vlocal_function_key_map;
  keytran.map = keytran.parent = current_kboard->Vlocal_key_translation_map;
  /* If there is no translation-map, turn off scanning.  */
  fkey.start = fkey.end = KEYMAPP (fkey.map) ? 0 : bufsize + 1;
  keytran.start = keytran.end = KEYMAPP (keytran.map) ? 0 : bufsize + 1;

  if (INTERACTIVE)
    {
      if (!NILP (prompt))
	echo_prompt (prompt);
      else if (cursor_in_echo_area

  /* We jump here when the key sequence has been thoroughly changed, and
     we need to rescan it starting from the beginning.  When we jump here,
     keybuf[0..mock_input] holds the sequence we should reread.  */
 replay_sequence:

  starting_buffer = current_buffer;
  first_unbound = bufsize + 1;

  /* Build our list of keymaps.

83409:be1f74bffc1d

     around any call to sit_for or kbd_buffer_get_event;
     it *must not* be in effect when we call redisplay.  */

  if (_setjmp (local_getcjmp))
    {
      /* Handle quits while reading the keyboard.  */
      /* We must have saved the outer value of getcjmp here,
	 so restore it now.  */
      restore_getcjmp (save_jump);
      XSETINT (c, quit_char);
      internal_last_event_frame = selected_frame;

	       | hyper_modifier | super_modifier));

      if (c == quit_char)
	{
#ifdef MULTI_KBOARD
	  KBOARD *kb = FRAME_KBOARD (XFRAME (event->frame_or_window));
	  struct input_event *sp;

	  if (single_kboard && kb != current_kboard)
	    {
	      kb->kbd_queue
		= Fcons (make_lispy_switch_frame (event->frame_or_window),
			 Fcons (make_number (c), Qnil));
	      kb->kbd_queue_has_data = 1;

  raw_keybuf_count = 0;

  last_nonmenu_event = Qnil;

  delayed_switch_frame = Qnil;
  
  if (INTERACTIVE)
    {
      if (!NILP (prompt))
	echo_prompt (prompt);
      else if (cursor_in_echo_area

  /* We jump here when the key sequence has been thoroughly changed, and
     we need to rescan it starting from the beginning.  When we jump here,
     keybuf[0..mock_input] holds the sequence we should reread.  */
 replay_sequence:

  /* We may switch keyboards between rescans, so we need to
     reinitialize fkey and keytran before each replay.  */
  fkey.map = fkey.parent = current_kboard->Vlocal_function_key_map;
  keytran.map = keytran.parent = current_kboard->Vlocal_key_translation_map;
  /* If there is no translation map, turn off scanning.  */
  fkey.start = fkey.end = KEYMAPP (fkey.map) ? 0 : bufsize + 1;
  keytran.start = keytran.end = KEYMAPP (keytran.map) ? 0 : bufsize + 1;

  starting_buffer = current_buffer;
  first_unbound = bufsize + 1;

  /* Build our list of keymaps.