From: João Tãvora <joaotavora@gmail.com>
Date: Fri, 20 Nov 2020 10:02:52 +0000 (+0000)
Subject: Revert unintended part of last change to jsonrpc-request
X-Git-Tag: emacs-28.0.90~5093
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7791c7e57b4b9ea895598cdb3f779c2173dccd9;p=emacs.git

Revert unintended part of last change to jsonrpc-request

While playing around with the timing in this function, I left
this change that could freeze the function on some platforms.

* lisp/jsonrpc.el (jsonrpc-request): Use accept-process-output.
(Version): Bump to 1.0.14
---

diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index d28cf7a91fa..0b3394080cc 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -4,7 +4,7 @@
 
 ;; Author: João Távora <joaotavora@gmail.com>
 ;; Keywords: processes, languages, extensions
-;; Version: 1.0.13
+;; Version: 1.0.14
 ;; Package-Requires: ((emacs "25.2"))
 
 ;; This is a GNU ELPA :core package.  Avoid functionality that is not
@@ -308,7 +308,7 @@ ignored."
                            (let ((inhibit-quit t)) (while (sit-for 30)))
                          (setq cancelled t))
                        `(cancelled ,cancel-on-input-retval))
-                      (t (while t (sit-for 30)))))
+                      (t (while t (accept-process-output nil 30)))))
             ;; In normal operation, cancellation is handled by the
             ;; timeout function and response filter, but we still have
             ;; to protect against user-quit (C-g) or the