Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
cb5ca9c5
Commit
cb5ca9c5
authored
Jun 15, 2009
by
YAMAMOTO Mitsuharu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(x_delete_terminal): Put previous change in #if 0 and
add comment explaining why.
parent
7841339b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
1 deletion
+18
-1
src/ChangeLog
src/ChangeLog
+5
-0
src/xterm.c
src/xterm.c
+13
-1
No files found.
src/ChangeLog
View file @
cb5ca9c5
2009-06-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* xterm.c (x_delete_terminal): Put previous change in #if 0 and
add comment explaining why.
2009-06-14 Sidney Markowitz <sidney@sidney.com>
* nsmenu.m (EmacsTooltip: setText): set height of tooltip.
...
...
src/xterm.c
View file @
cb5ca9c5
...
...
@@ -10747,7 +10747,18 @@ x_delete_terminal (struct terminal *terminal)
/* Whether or not XCloseDisplay destroys the associated resource
database depends on the version of libX11. To avoid both
crash and memory leak, we dissociate the database from the
display and then destroy dpyinfo->xrdb ourselves. */
display and then destroy dpyinfo->xrdb ourselves.
Unfortunately, the above strategy does not work in some
situations due to a bug in newer versions of libX11: because
XrmSetDatabase doesn't clear the flag XlibDisplayDfltRMDB if
dpy->db is NULL, XCloseDisplay destroys the associated
database whereas it has not been created by XGetDefault
(Bug#21974 in freedesktop.org Bugzilla). As a workaround, we
don't destroy the database here in order to avoid the crash
in the above situations for now, though that may cause memory
leaks in other situations. */
#if 0
#ifdef HAVE_XRMSETDATABASE
XrmSetDatabase (dpyinfo->display, NULL);
#else
...
...
@@ -10757,6 +10768,7 @@ x_delete_terminal (struct terminal *terminal)
some older versions of libX11 crash if we call it after
closing all the displays. */
XrmDestroyDatabase (dpyinfo->xrdb);
#endif
#ifdef USE_GTK
xg_display_close (dpyinfo->display);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment