comparison src/keyboard.c @ 83123:ad01ab3c6f4d

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-299 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-300 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-301 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-302 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-303 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-304 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-305 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-306 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-307 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-308 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-309 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-310 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-311 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-312 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-313 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-314 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-315 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-316 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-317 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-318 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-319 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-320 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-321 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-322 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-323 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-324 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-163

83122:d895a49cccb9

     ()
{
  int count = SPECPDL_INDEX ();
  Lisp_Object buffer;

  command_loop_level++;
  update_mode_lines = 1;

  if (command_loop_level
      && current_buffer != XBUFFER (XWINDOW (selected_window)->buffer))

{
#ifdef HAVE_X_WINDOWS
  if (display_hourglass_p)
    cancel_hourglass ();
#endif
  return Fthrow (Qtop_level, Qnil);
}

DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0, "",
       doc: /* Exit from the innermost recursive edit or minibuffer.  */)

#endif
#ifdef WINDOWSNT
      else if (event->kind == LANGUAGE_CHANGE_EVENT)
	{
	  /* Make an event (language-change (FRAME CHARSET LCID)).  */
	  obj = Fcons (event->modifiers, Qnil);
	  obj = Fcons (event->code, obj);
	  obj = Fcons (event->frame_or_window, obj);
	  obj = Fcons (Qlanguage_change, Fcons (obj, Qnil));
	  kbd_fetch_ptr = event + 1;
	}
#endif
      else if (event->kind == SAVE_SESSION_EVENT)

    struct input_event *event;
    for (event = kbd_fetch_ptr; event != kbd_store_ptr; event++)
      {
	if (event == kbd_buffer + KBD_BUFFER_SIZE)
	  event = kbd_buffer;
	mark_object (event->x);
	mark_object (event->y);
	mark_object (event->frame_or_window);
	mark_object (event->arg);
      }
  }
}

83123:ad01ab3c6f4d

     ()
{
  int count = SPECPDL_INDEX ();
  Lisp_Object buffer;

  /* If we enter while input is blocked, don't lock up here.
     This may happen through the debugger during redisplay.  */
  if (INPUT_BLOCKED_P)
    return Qnil;

  command_loop_level++;
  update_mode_lines = 1;

  if (command_loop_level
      && current_buffer != XBUFFER (XWINDOW (selected_window)->buffer))

{
#ifdef HAVE_X_WINDOWS
  if (display_hourglass_p)
    cancel_hourglass ();
#endif

  /* Unblock input if we enter with input blocked.  This may happen if
     redisplay traps e.g. during tool-bar update with input blocked.  */
  while (INPUT_BLOCKED_P)
    UNBLOCK_INPUT;

  return Fthrow (Qtop_level, Qnil);
}

DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0, "",
       doc: /* Exit from the innermost recursive edit or minibuffer.  */)

#endif
#ifdef WINDOWSNT
      else if (event->kind == LANGUAGE_CHANGE_EVENT)
	{
	  /* Make an event (language-change (FRAME CHARSET LCID)).  */
	  obj = Fcons (event->frame_or_window, Qnil);
	  obj = Fcons (Qlanguage_change, Fcons (obj, Qnil));
	  kbd_fetch_ptr = event + 1;
	}
#endif
      else if (event->kind == SAVE_SESSION_EVENT)

    struct input_event *event;
    for (event = kbd_fetch_ptr; event != kbd_store_ptr; event++)
      {
	if (event == kbd_buffer + KBD_BUFFER_SIZE)
	  event = kbd_buffer;
	if (event->kind != SELECTION_REQUEST_EVENT)
	  {
	    mark_object (event->x);
	    mark_object (event->y);
	  }
	mark_object (event->frame_or_window);
	mark_object (event->arg);
      }
  }
}