; Revert "Ensure undo-boundary after insert-file-contents."

[gnu-emacs] / src / w32.c

diff --git a/src/w32.c b/src/w32.c
index 067bb3d7cad555f1f8a1bd781dcdb9149d316ffc..c26f14593f1e0adf1170869253540cc5fac021c0 100644 (file)
--- a/src/w32.c
+++ b/src/w32.c
@@ -6,8 +6,8 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -8369,7 +8369,17 @@ sys_read (int fd, char * buffer, unsigned int count)
 
            case STATUS_READ_READY:
            case STATUS_READ_IN_PROGRESS:
-             DebPrint (("sys_read called when read is in progress\n"));
+#if 0
+             /* This happens all the time during GnuTLS handshake
+                with the remote, evidently because GnuTLS waits for
+                the read to complete by retrying the read operation
+                upon EAGAIN.  So I'm disabling the DebPrint to avoid
+                wasting cycles on something that is not a real
+                problem.  Enable if you need to debug something that
+                bumps into this.  */
+             DebPrint (("sys_read called when read is in progress %d\n",
+                        current_status));
+#endif
              errno = EWOULDBLOCK;
              return -1;