projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
XEmacs 21.2.13
[chise/xemacs-chise.git.1]
/
src
/
frame-x.c
diff --git
a/src/frame-x.c
b/src/frame-x.c
index
a5d62c6
..
40a75f7
100644
(file)
--- a/
src/frame-x.c
+++ b/
src/frame-x.c
@@
-2623,6
+2623,8
@@
x_focus_on_frame (struct frame *f)
static void
x_delete_frame (struct frame *f)
{
static void
x_delete_frame (struct frame *f)
{
+ Display *dpy;
+
#ifndef HAVE_SESSION
if (FRAME_X_TOP_LEVEL_FRAME_P (f))
x_wm_maybe_move_wm_command (f);
#ifndef HAVE_SESSION
if (FRAME_X_TOP_LEVEL_FRAME_P (f))
x_wm_maybe_move_wm_command (f);
@@
-2633,6
+2635,7
@@
x_delete_frame (struct frame *f)
#endif /* HAVE_CDE */
assert (FRAME_X_SHELL_WIDGET (f) != 0);
#endif /* HAVE_CDE */
assert (FRAME_X_SHELL_WIDGET (f) != 0);
+ dpy = XtDisplay (FRAME_X_SHELL_WIDGET (f));
#ifdef EXTERNAL_WIDGET
expect_x_error (XtDisplay (FRAME_X_SHELL_WIDGET (f)));
#ifdef EXTERNAL_WIDGET
expect_x_error (XtDisplay (FRAME_X_SHELL_WIDGET (f)));
@@
-2647,7
+2650,7
@@
x_delete_frame (struct frame *f)
XtDestroyWidget (FRAME_X_SHELL_WIDGET (f));
/* make sure the windows are really gone! */
/* ### Is this REALLY necessary? */
XtDestroyWidget (FRAME_X_SHELL_WIDGET (f));
/* make sure the windows are really gone! */
/* ### Is this REALLY necessary? */
- XFlush (XtDisplay (FRAME_X_SHELL_WIDGET (f)));
+ XFlush (dpy);
#endif /* EXTERNAL_WIDGET */
FRAME_X_SHELL_WIDGET (f) = 0;
#endif /* EXTERNAL_WIDGET */
FRAME_X_SHELL_WIDGET (f) = 0;