]> git.eshelyaron.com Git - emacs.git/commitdiff
Revert last change to w32_read_socket.
authorMartin Rudalics <rudalics@gmx.at>
Mon, 10 Mar 2014 18:53:39 +0000 (19:53 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Mon, 10 Mar 2014 18:53:39 +0000 (19:53 +0100)
src/ChangeLog
src/w32term.c

index 62ad09eb4c22df9a89faf3f6b533bc36ae616b19..14c917a4e61957a874da56332a12042580a44fab 100644 (file)
@@ -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.
index 6ff9178bda79b5e38e8d48cae6600c11d20eaa12..b77d01796d7d3636c2d474380e4c42520c231f4a 100644 (file)
@@ -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