diff options
| author | Martin Rudalics | 2014-03-10 19:53:39 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2014-03-10 19:53:39 +0100 |
| commit | f38145ba81691d60f3a8e3198e4754359c8b8a55 (patch) | |
| tree | c79bd82160e934eed66b2743bbe53ac9b559b713 | |
| parent | 776aa432075b3a3d8588f9872a053845ecfaa4e9 (diff) | |
| download | emacs-f38145ba81691d60f3a8e3198e4754359c8b8a55.tar.gz emacs-f38145ba81691d60f3a8e3198e4754359c8b8a55.zip | |
Revert last change to w32_read_socket.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/w32term.c | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 62ad09eb4c2..14c917a4e61 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -4,11 +4,6 @@ | |||
| 4 | with a slash: this fails the subsequent call to stat_worker on | 4 | with a slash: this fails the subsequent call to stat_worker on |
| 5 | Windows 9X. Reported by oslsachem <oslsachem@gmail.com>. | 5 | Windows 9X. Reported by oslsachem <oslsachem@gmail.com>. |
| 6 | 6 | ||
| 7 | 2014-03-10 Martin Rudalics <rudalics@gmx.at> | ||
| 8 | |||
| 9 | * w32term.c (w32_read_socket): In SIZE_RESTORED case | ||
| 10 | unconditionally set visibility of frame to 1. | ||
| 11 | |||
| 12 | 2014-03-09 Martin Rudalics <rudalics@gmx.at> | 7 | 2014-03-09 Martin Rudalics <rudalics@gmx.at> |
| 13 | 8 | ||
| 14 | * xdisp.c (Fwindow_text_pixel_size): Adjust doc-string. | 9 | * xdisp.c (Fwindow_text_pixel_size): Adjust doc-string. |
diff --git a/src/w32term.c b/src/w32term.c index 6ff9178bda7..b77d01796d7 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -4684,7 +4684,8 @@ 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 | SET_FRAME_VISIBLE (f, 1); | 4687 | if (iconified) |
| 4688 | SET_FRAME_VISIBLE (f, 1); | ||
| 4688 | SET_FRAME_ICONIFIED (f, 0); | 4689 | SET_FRAME_ICONIFIED (f, 0); |
| 4689 | 4690 | ||
| 4690 | /* wait_reading_process_output will notice this | 4691 | /* wait_reading_process_output will notice this |