* 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 fd840e0c07bbdcd6942b1f73a14fa8d00764a70f..ff471ae90f94dccc69edd1abbee9ce3a25d94d69 100644 (file)
--- 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 8ca023a86cb31bc18888c469028b80a8aa8e94a0..59e9b0ad8a193ba41fec8ad57bc7c89247b3ccb1 100644 (file)
--- 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 ();
 }