Commit ae24cb3b authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(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.
parent bccee4f2
2001-01-15 Gerd Moellmann <gerd@gnu.org>
* 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.
......
......@@ -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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment