comparison src/term.c @ 83522:a5d712e6585a

Fix crashes in `delete-terminal' caused by recursive calls or X displays with live frames. * src/termhooks.h (terminal) <deleted>: New member. * src/term.c (delete_tty): Use it. (deleting_tty): Remove old variable. * src/terminal.c (delete_terminal): Use terminal->deleted. * src/xterm.c (x_delete_terminal): Use terminal->deleted. Delete all frames on the display explicitly. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-562

83521:40a5d8a15056

  exit (1);
}



static int deleting_tty = 0;


/* Delete the given tty terminal, closing all frames on it. */

static void
delete_tty (struct terminal *terminal)
{
  struct tty_display_info *tty;
  Lisp_Object tail, frame;
  char *tty_name;
  int last_terminal;
  
  if (deleting_tty)
    /* We get a recursive call when we delete the last frame on this
       terminal. */
    return;

  if (terminal->type != output_termcap)
    abort ();

      p->next = tty->next;
      tty->next = 0;
    }

  deleting_tty = 1;

  FOR_EACH_FRAME (tail, frame)
    {
      struct frame *f = XFRAME (frame);
      if (FRAME_TERMCAP_P (f) && FRAME_LIVE_P (f) && FRAME_TTY (f) == tty)

83522:a5d712e6585a

  exit (1);
}



/* Delete the given tty terminal, closing all frames on it. */

static void
delete_tty (struct terminal *terminal)
{
  struct tty_display_info *tty;
  Lisp_Object tail, frame;
  char *tty_name;
  int last_terminal;
  
  /* Protect against recursive calls.  Fdelete_frame calls us back
     when we delete our last frame.  */
  if (terminal->deleted)
    return;

  if (terminal->type != output_termcap)
    abort ();

      p->next = tty->next;
      tty->next = 0;
    }

  /* We must not throw any errors below this line.  */
  terminal->deleted = 1;

  FOR_EACH_FRAME (tail, frame)
    {
      struct frame *f = XFRAME (frame);
      if (FRAME_TERMCAP_P (f) && FRAME_LIVE_P (f) && FRAME_TTY (f) == tty)