aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32term.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index af8cd0e492b..c383aeaa0a0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-03-10 Martin Rudalics <rudalics@gmx.at>
2
3 * w32term.c (w32_read_socket): In SIZE_RESTORED case
4 unconditionally set visibility of frame to 1.
5
12014-03-09 Martin Rudalics <rudalics@gmx.at> 62014-03-09 Martin Rudalics <rudalics@gmx.at>
2 7
3 * xdisp.c (Fwindow_text_pixel_size): Adjust doc-string. 8 * xdisp.c (Fwindow_text_pixel_size): Adjust doc-string.
diff --git a/src/w32term.c b/src/w32term.c
index b77d01796d7..6ff9178bda7 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4684,8 +4684,7 @@ w32_read_socket (struct terminal *terminal,
4684 { 4684 {
4685 bool iconified = FRAME_ICONIFIED_P (f); 4685 bool iconified = FRAME_ICONIFIED_P (f);
4686 4686
4687 if (iconified) 4687 SET_FRAME_VISIBLE (f, 1);
4688 SET_FRAME_VISIBLE (f, 1);
4689 SET_FRAME_ICONIFIED (f, 0); 4688 SET_FRAME_ICONIFIED (f, 0);
4690 4689
4691 /* wait_reading_process_output will notice this 4690 /* wait_reading_process_output will notice this