Commit 48e64ea6 authored by Ken Brown's avatar Ken Brown
Browse files

* src/w32term.c (x_delete_display): Don't free dpyinfo->w32_id_name (see bug#17510).

parent 858e55f4
2014-05-26 Ken Brown <kbrown@cornell.edu>
* w32term.c (x_delete_display): Don't free dpyinfo->w32_id_name,
even if !CYGWIN (see bug#17510).
2014-05-26 Jan Djärv <jan.h.d@swipnet.se> 2014-05-26 Jan Djärv <jan.h.d@swipnet.se>
* nsfns.m (Fns_do_applescript): Surround NSApp run * nsfns.m (Fns_do_applescript): Surround NSApp run
......
...@@ -6419,12 +6419,6 @@ x_delete_display (struct w32_display_info *dpyinfo) ...@@ -6419,12 +6419,6 @@ x_delete_display (struct w32_display_info *dpyinfo)
if (dpyinfo->palette) if (dpyinfo->palette)
DeleteObject (dpyinfo->palette); DeleteObject (dpyinfo->palette);
} }
/* Avoid freeing dpyinfo->w32_id_name more than once if emacs is
running as a daemon; see bug#17510. */
#ifndef CYGWIN
xfree (dpyinfo->w32_id_name);
#endif
w32_reset_fringes (); w32_reset_fringes ();
} }
......
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