diff options
| author | Ken Brown | 2014-05-26 08:31:46 -0400 |
|---|---|---|
| committer | Ken Brown | 2014-05-26 08:31:46 -0400 |
| commit | 48e64ea69f8a50121884f2e957af808a5a8f7534 (patch) | |
| tree | bde40210a141826c14ca9b4f7f91ece16336ef7d /src/w32term.c | |
| parent | 858e55f412a35ca8e2c0b68eef61c6c864e5ce24 (diff) | |
| download | emacs-48e64ea69f8a50121884f2e957af808a5a8f7534.tar.gz emacs-48e64ea69f8a50121884f2e957af808a5a8f7534.zip | |
* src/w32term.c (x_delete_display): Don't free dpyinfo->w32_id_name (see bug#17510).
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 6 |
1 files changed, 0 insertions, 6 deletions
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) | |||
| 6419 | if (dpyinfo->palette) | 6419 | if (dpyinfo->palette) |
| 6420 | DeleteObject (dpyinfo->palette); | 6420 | DeleteObject (dpyinfo->palette); |
| 6421 | } | 6421 | } |
| 6422 | /* Avoid freeing dpyinfo->w32_id_name more than once if emacs is | ||
| 6423 | running as a daemon; see bug#17510. */ | ||
| 6424 | #ifndef CYGWIN | ||
| 6425 | xfree (dpyinfo->w32_id_name); | ||
| 6426 | #endif | ||
| 6427 | |||
| 6428 | w32_reset_fringes (); | 6422 | w32_reset_fringes (); |
| 6429 | } | 6423 | } |
| 6430 | 6424 | ||