From: Ken Brown <kbrown@cornell.edu>
Date: Mon, 26 May 2014 12:31:46 +0000 (-0400)
Subject: * src/w32term.c (x_delete_display): Don't free dpyinfo->w32_id_name (see bug#17510).
X-Git-Tag: emacs-25.0.90~2612^2~709^2~881
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=48e64ea69f8a50121884f2e957af808a5a8f7534;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index fd840e0c07b..ff471ae90f9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
diff --git a/src/w32term.c b/src/w32term.c
index 8ca023a86cb..59e9b0ad8a1 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -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 ();
 }