[Emacs-diffs] emacs/src ChangeLog term.c

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/11/25 17:53:56

Modified files:
        src            : ChangeLog term.c 

Log message:
        (delete_tty): Remove check for last terminal (bug#4970).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7896&r2=1.7897
http://cvs.savannah.gnu.org/viewcvs/emacs/src/term.c?cvsroot=emacs&r1=1.249&r2=1.250

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7896
retrieving revision 1.7897
diff -u -b -r1.7896 -r1.7897
--- ChangeLog   25 Nov 2009 16:19:51 -0000      1.7896
+++ ChangeLog   25 Nov 2009 17:53:54 -0000      1.7897
@@ -1,5 +1,7 @@
 2009-11-25  Jan Djärv  <address@hidden>
 
+       * term.c (delete_tty): Remove check for last terminal (bug#4970).
+
        * xsettings.c: Revert changes from 2009-11-23. Just use Xft
        defaults (bug #5025).
 

Index: term.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/term.c,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -b -r1.249 -r1.250
--- term.c      19 Oct 2009 04:27:18 -0000      1.249
+++ term.c      25 Nov 2009 17:53:55 -0000      1.250
@@ -3951,8 +3951,6 @@
 delete_tty (struct terminal *terminal)
 {
   struct tty_display_info *tty;
-  Lisp_Object tail, frame;
-  int last_terminal;
 
   /* Protect against recursive calls.  delete_frame in
      delete_terminal calls us back when it deletes our last frame.  */
@@ -3964,19 +3962,6 @@
 
   tty = terminal->display_info.tty;
 
-  last_terminal = 1;
-  FOR_EACH_FRAME (tail, frame)
-    {
-      struct frame *f = XFRAME (frame);
-      if (FRAME_LIVE_P (f) && (!FRAME_TERMCAP_P (f) || FRAME_TTY (f) != tty))
-        {
-          last_terminal = 0;
-          break;
-        }
-    }
-  if (last_terminal)
-      error ("Attempt to delete the sole terminal device with live frames");
-
   if (tty == tty_list)
     tty_list = tty->next;
   else