diff options
| author | Dmitry Gutov | 2019-04-13 03:36:45 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2019-04-13 03:36:45 +0300 |
| commit | 8635e011edd1c50678074a49cbbf857b35823e9d (patch) | |
| tree | 8447057f1593ce8b855b9fbeb4a46f4b7dd2a1a1 | |
| parent | b41c1ca10fab4ed94e59aea8ad5eae334c2452bd (diff) | |
| download | emacs-8635e011edd1c50678074a49cbbf857b35823e9d.tar.gz emacs-8635e011edd1c50678074a49cbbf857b35823e9d.zip | |
Don't signal error from url debug functions
* lisp/url/url-http.el (url-http-debug): Don't signal error.
* lisp/url/url-util.el (url-debug): Same (bug#34763).
| -rw-r--r-- | lisp/url/url-http.el | 9 | ||||
| -rw-r--r-- | lisp/url/url-util.el | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index cf1952066a5..662b6664b13 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el | |||
| @@ -150,15 +150,6 @@ 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 (eq quit-flag t) | ||
| 154 | (let ((proc (get-buffer-process (current-buffer)))) | ||
| 155 | ;; The user hit C-g, honor it! Some things can get in an | ||
| 156 | ;; incredibly tight loop (chunked encoding) | ||
| 157 | (if proc | ||
| 158 | (progn | ||
| 159 | (set-process-sentinel proc nil) | ||
| 160 | (set-process-filter proc nil))) | ||
| 161 | (error "Transfer interrupted!"))) | ||
| 162 | (apply 'url-debug 'http args)) | 153 | (apply 'url-debug 'http args)) |
| 163 | 154 | ||
| 164 | (defun url-http-mark-connection-as-busy (host port proc) | 155 | (defun url-http-mark-connection-as-busy (host port proc) |
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el index 72ff4f171cd..5b8350642ff 100644 --- a/lisp/url/url-util.el +++ b/lisp/url/url-util.el | |||
| @@ -61,8 +61,6 @@ 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 (eq quit-flag t) | ||
| 65 | (error "Interrupted!")) | ||
| 66 | (if (or (eq url-debug t) | 64 | (if (or (eq url-debug t) |
| 67 | (numberp url-debug) | 65 | (numberp url-debug) |
| 68 | (and (listp url-debug) (memq tag url-debug))) | 66 | (and (listp url-debug) (memq tag url-debug))) |