procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ken Brown 2014-05-26 08:31:46 -04:00
parent 858e55f412
commit 48e64ea69f
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
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>
* nsfns.m (Fns_do_applescript): Surround NSApp run

6
src/w32term.c
View file

@ -6419,12 +6419,6 @@ x_delete_display (struct w32_display_info *dpyinfo)
if (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 ();
}