From: Gerd Moellmann Date: Mon, 15 Jan 2001 15:29:54 +0000 (+0000) Subject: (x_connection_closed) [USE_X_TOOLKIT]: If X-Git-Tag: emacs-pretest-21.0.96~287 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ae24cb3befd9649b4ef8e8ad56db90408284f556;p=emacs.git (x_connection_closed) [USE_X_TOOLKIT]: If x_display_info_for_display returns null, don't try to close the display; we didn't open it. --- diff --git a/src/ChangeLog b/src/ChangeLog index 1bea2b42391..38a5dafd89d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2001-01-15 Gerd Moellmann + * xterm.c (x_connection_closed) [USE_X_TOOLKIT]: If + x_display_info_for_display returns null, don't try to close + the display; we didn't open it. + * dispnew.c (save_or_restore_current_matrices): Function removed. (save_current_matrix, restore_current_matrix): New functions. (adjust_frame_glyphs_for_frame_redisplay): Use them to save and @@ -13,7 +17,7 @@ * xdisp.c (insert_left_trunc_glyphs): Overwrite padding glyphs by truncation glyphs. (display_line): Optimize for wide characters. - (display_string): Don't try to display a multi-column charaters + (display_string): Don't try to display a multi-column characters partially. On ttys, produce more than one truncation glyph for multi-column characters that don't fit on the line. diff --git a/src/xterm.c b/src/xterm.c index fadeae0e057..0cd68a7f9e3 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -11288,7 +11288,10 @@ x_connection_closed (dpy, error_message) in OpenWindows. I don't know how to cicumvent it here. */ #ifdef USE_X_TOOLKIT - XtCloseDisplay (dpy); + /* If DPYINFO is null, this means we didn't open the display + in the first place, so don't try to close it. */ + if (dpyinfo) + XtCloseDisplay (dpy); #endif /* Indicate that this display is dead. */