From: Martin Rudalics <rudalics@gmx.at>
Date: Mon, 10 Mar 2014 18:53:39 +0000 (+0100)
Subject: Revert last change to w32_read_socket.
X-Git-Tag: emacs-24.3.90~223
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f38145ba81691d60f3a8e3198e4754359c8b8a55;p=emacs.git

Revert last change to w32_read_socket.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 62ad09eb4c2..14c917a4e61 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,11 +4,6 @@
 	with a slash: this fails the subsequent call to stat_worker on
 	Windows 9X.  Reported by oslsachem <oslsachem@gmail.com>.
 
-2014-03-10  Martin Rudalics  <rudalics@gmx.at>
-
-	* w32term.c (w32_read_socket): In SIZE_RESTORED case
-	unconditionally set visibility of frame to 1.
-
 2014-03-09  Martin Rudalics  <rudalics@gmx.at>
 
 	* 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,
 		  {
 		    bool iconified = FRAME_ICONIFIED_P (f);
 
-		    SET_FRAME_VISIBLE (f, 1);
+		    if (iconified)
+		      SET_FRAME_VISIBLE (f, 1);
 		    SET_FRAME_ICONIFIED (f, 0);
 
 		    /* wait_reading_process_output will notice this