Merge from origin/emacs-25

ea26c8a * lisp/net/browse-url.el (browse-url-default-browser): Lower
        priority of non-free Chrome.
0fac75f Improve the custom type of some user options.
2df0e04 Highlight CSS variables with variable name face
3cf5e81 * lisp/gnus/gnus-kill.el (gnus-winconf-kill-file): Not
        user-serviceable.
2a5233c Mark some user options that can get evalled as risky.
39b166f Disable DebPrint in sys_read on MS-Windows
9fd0189 ;Fix ChangeLog entry
4bb7233 Fix typos in Introduction to Emacs Lisp manual

1 files changed, 11 insertions, 1 deletions

diff --git a/src/w32.c b/src/w32.c
index 067bb3d7cad..fbcfb970337 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -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;