aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1998-10-10 15:07:08 +0000
committerRichard M. Stallman1998-10-10 15:07:08 +0000
commit0ec56a80564f2053e28e0da56e60ea50f50e5241 (patch)
tree9ee9b73fb6b01e7bf3f8b6cd12b39f7e4b5a3b7f /src
parent3f8ab7bddcdfc06efaa4640047377eb783766ad8 (diff)
downloademacs-0ec56a80564f2053e28e0da56e60ea50f50e5241.tar.gz
emacs-0ec56a80564f2053e28e0da56e60ea50f50e5241.zip
(check_x_display_info): Don't use selected_frame if it is dead.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 48bda27702a..f6395dc0fb4 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -264,7 +264,8 @@ check_x_display_info (frame)
264{ 264{
265 if (NILP (frame)) 265 if (NILP (frame))
266 { 266 {
267 if (FRAME_X_P (selected_frame)) 267 if (FRAME_X_P (selected_frame)
268 && FRAME_LIVE_P (selected_frame))
268 return FRAME_X_DISPLAY_INFO (selected_frame); 269 return FRAME_X_DISPLAY_INFO (selected_frame);
269 else if (x_display_list != 0) 270 else if (x_display_list != 0)
270 return x_display_list; 271 return x_display_list;