diff options
| author | Jan Djärv | 2009-11-25 17:53:54 +0000 |
|---|---|---|
| committer | Jan Djärv | 2009-11-25 17:53:54 +0000 |
| commit | a1fadc6fdff31d8ceb9036333a12f494d10d7a53 (patch) | |
| tree | 63db6d7b7c16a294d8b11566e63e0389f2efdc8e | |
| parent | a601d3134020e10162d4b8c9af0039478ed532ea (diff) | |
| download | emacs-a1fadc6fdff31d8ceb9036333a12f494d10d7a53.tar.gz emacs-a1fadc6fdff31d8ceb9036333a12f494d10d7a53.zip | |
(delete_tty): Remove check for last terminal (bug#4970).
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/term.c | 15 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 36032bd01df..e0bb722d851 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2009-11-25 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2009-11-25 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * term.c (delete_tty): Remove check for last terminal (bug#4970). | ||
| 4 | |||
| 3 | * xsettings.c: Revert changes from 2009-11-23. Just use Xft | 5 | * xsettings.c: Revert changes from 2009-11-23. Just use Xft |
| 4 | defaults (bug #5025). | 6 | defaults (bug #5025). |
| 5 | 7 | ||
diff --git a/src/term.c b/src/term.c index d860a932357..fda06d6b2ed 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -3951,8 +3951,6 @@ static void | |||
| 3951 | delete_tty (struct terminal *terminal) | 3951 | delete_tty (struct terminal *terminal) |
| 3952 | { | 3952 | { |
| 3953 | struct tty_display_info *tty; | 3953 | struct tty_display_info *tty; |
| 3954 | Lisp_Object tail, frame; | ||
| 3955 | int last_terminal; | ||
| 3956 | 3954 | ||
| 3957 | /* Protect against recursive calls. delete_frame in | 3955 | /* Protect against recursive calls. delete_frame in |
| 3958 | delete_terminal calls us back when it deletes our last frame. */ | 3956 | delete_terminal calls us back when it deletes our last frame. */ |
| @@ -3964,19 +3962,6 @@ delete_tty (struct terminal *terminal) | |||
| 3964 | 3962 | ||
| 3965 | tty = terminal->display_info.tty; | 3963 | tty = terminal->display_info.tty; |
| 3966 | 3964 | ||
| 3967 | last_terminal = 1; | ||
| 3968 | FOR_EACH_FRAME (tail, frame) | ||
| 3969 | { | ||
| 3970 | struct frame *f = XFRAME (frame); | ||
| 3971 | if (FRAME_LIVE_P (f) && (!FRAME_TERMCAP_P (f) || FRAME_TTY (f) != tty)) | ||
| 3972 | { | ||
| 3973 | last_terminal = 0; | ||
| 3974 | break; | ||
| 3975 | } | ||
| 3976 | } | ||
| 3977 | if (last_terminal) | ||
| 3978 | error ("Attempt to delete the sole terminal device with live frames"); | ||
| 3979 | |||
| 3980 | if (tty == tty_list) | 3965 | if (tty == tty_list) |
| 3981 | tty_list = tty->next; | 3966 | tty_list = tty->next; |
| 3982 | else | 3967 | else |