aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2007-09-20 21:18:47 +0000
committerStefan Monnier2007-09-20 21:18:47 +0000
commit89acb56d9525ab215b9cdb2470e965119a17aba7 (patch)
tree90f54f54e3c2cba739a91446fa36e88b84395e4e /src
parentc35a54c70a1b11d15968b1d8af3b10281711e909 (diff)
downloademacs-89acb56d9525ab215b9cdb2470e965119a17aba7.tar.gz
emacs-89acb56d9525ab215b9cdb2470e965119a17aba7.zip
(x_delete_terminal): Use terminal->name as liveness status.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c8
-rw-r--r--src/xterm.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 14e5b058e32..764cbbafa77 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3108,8 +3108,8 @@ This function is an internal primitive--use `make-frame' instead. */)
3108 kb = &the_only_kboard; 3108 kb = &the_only_kboard;
3109#endif 3109#endif
3110 3110
3111 if (dpyinfo->terminal->deleted) 3111 if (!dpyinfo->terminal->name)
3112 error ("Terminal is being deleted, can't create new frames on it"); 3112 error ("Terminal is not live, can't create new frames on it");
3113 3113
3114 name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING); 3114 name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING);
3115 if (!STRINGP (name) 3115 if (!STRINGP (name)
@@ -4703,8 +4703,8 @@ x_create_tip_frame (dpyinfo, parms, text)
4703 4703
4704 check_x (); 4704 check_x ();
4705 4705
4706 if (dpyinfo->terminal->deleted) 4706 if (!dpyinfo->terminal->name)
4707 error ("Terminal is being deleted, can't create new frames on it"); 4707 error ("Terminal is not live, can't create new frames on it");
4708 4708
4709 parms = Fcopy_alist (parms); 4709 parms = Fcopy_alist (parms);
4710 4710
diff --git a/src/xterm.c b/src/xterm.c
index 68f5b266810..dc69af88a12 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -11311,7 +11311,7 @@ x_delete_terminal (struct terminal *terminal)
11311 11311
11312 /* Protect against recursive calls. Fdelete_frame in 11312 /* Protect against recursive calls. Fdelete_frame in
11313 delete_terminal calls us back when it deletes our last frame. */ 11313 delete_terminal calls us back when it deletes our last frame. */
11314 if (terminal->deleted) 11314 if (!terminal->name)
11315 return; 11315 return;
11316 11316
11317 BLOCK_INPUT; 11317 BLOCK_INPUT;