aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/url
diff options
context:
space:
mode:
authorEli Zaretskii2019-03-13 18:53:08 +0200
committerEli Zaretskii2019-03-13 18:53:08 +0200
commit9486d87cfe7a68d43a44eecd660d2fbe8f0fcb73 (patch)
treef5e108292d9d8304eeb0047e71eb2d0333d32086 /lisp/url
parent8b3008261d4c3f7ed7508c0f7205d9fc3640df46 (diff)
downloademacs-9486d87cfe7a68d43a44eecd660d2fbe8f0fcb73.tar.gz
emacs-9486d87cfe7a68d43a44eecd660d2fbe8f0fcb73.zip
Avoid gratuitous errors in 'url-retrieve-synchronously'
* lisp/url/url-http.el (url-http-debug): * lisp/url/url-util.el (url-debug): Don't signal an error if quit-flag is non-nil, but not t. This could happen because some unrelated code is running inside while-no-input. (Bug#34763)
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/url-http.el2
-rw-r--r--lisp/url/url-util.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 76faac13808..651a2cc94c6 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -150,7 +150,7 @@ request.")
150;; These routines will allow us to implement persistent HTTP 150;; These routines will allow us to implement persistent HTTP
151;; connections. 151;; connections.
152(defsubst url-http-debug (&rest args) 152(defsubst url-http-debug (&rest args)
153 (if quit-flag 153 (if (eq quit-flag t)
154 (let ((proc (get-buffer-process (current-buffer)))) 154 (let ((proc (get-buffer-process (current-buffer))))
155 ;; The user hit C-g, honor it! Some things can get in an 155 ;; The user hit C-g, honor it! Some things can get in an
156 ;; incredibly tight loop (chunked encoding) 156 ;; incredibly tight loop (chunked encoding)
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index cb80ec6cefb..72ff4f171cd 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -61,7 +61,7 @@ If a list, it is a list of the types of messages to be logged."
61 61
62;;;###autoload 62;;;###autoload
63(defun url-debug (tag &rest args) 63(defun url-debug (tag &rest args)
64 (if quit-flag 64 (if (eq quit-flag t)
65 (error "Interrupted!")) 65 (error "Interrupted!"))
66 (if (or (eq url-debug t) 66 (if (or (eq url-debug t)
67 (numberp url-debug) 67 (numberp url-debug)