[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117158: * src/w32term.c (x_delete_display): Don't f
From: |
Ken Brown |
Subject: |
[Emacs-diffs] trunk r117158: * src/w32term.c (x_delete_display): Don't free dpyinfo->w32_id_name (see bug#17510). |
Date: |
Mon, 26 May 2014 12:32:15 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117158
revision-id: address@hidden
parent: address@hidden
committer: Ken Brown <address@hidden>
branch nick: trunk
timestamp: Mon 2014-05-26 08:31:46 -0400
message:
* src/w32term.c (x_delete_display): Don't free dpyinfo->w32_id_name (see
bug#17510).
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/w32term.c w32term.c-20091113204419-o5vbwnq5f7feedwu-950
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-05-26 11:26:24 +0000
+++ b/src/ChangeLog 2014-05-26 12:31:46 +0000
@@ -1,3 +1,8 @@
+2014-05-26 Ken Brown <address@hidden>
+
+ * w32term.c (x_delete_display): Don't free dpyinfo->w32_id_name,
+ even if !CYGWIN (see bug#17510).
+
2014-05-26 Jan Djärv <address@hidden>
* nsfns.m (Fns_do_applescript): Surround NSApp run
=== modified file 'src/w32term.c'
--- a/src/w32term.c 2014-05-26 02:28:09 +0000
+++ b/src/w32term.c 2014-05-26 12:31:46 +0000
@@ -6419,12 +6419,6 @@
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 ();
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117158: * src/w32term.c (x_delete_display): Don't free dpyinfo->w32_id_name (see bug#17510).,
Ken Brown <=