# HG changeset patch # User Magnus Henoch # Date 1162944772 0 # Node ID 22da3e31207f6e8b0cff9862b3e88d333bd64838 # Parent ceca912e44795969e692d161a71fe23f56808553 (url-retrieve-synchronously): Allow quitting when inhibit-quit is t. diff -r ceca912e4479 -r 22da3e31207f lisp/url/url.el --- a/lisp/url/url.el Tue Nov 07 17:39:15 2006 +0000 +++ b/lisp/url/url.el Wed Nov 08 00:12:52 2006 +0000 @@ -246,10 +246,16 @@ ;; interrupt it before it got a chance to handle process input. ;; `sleep-for' was tried but it lead to other forms of ;; hanging. --Stef - (unless (or (accept-process-output proc) (null proc)) + (unless (or (with-local-quit + (accept-process-output proc)) + (null proc)) ;; accept-process-output returned nil, maybe because the process - ;; exited (and may have been replaced with another). - (setq proc (get-buffer-process asynch-buffer)))))) + ;; exited (and may have been replaced with another). If we got + ;; a quit, just stop. + (when quit-flag + (delete-process proc)) + (setq proc (and (not quit-flag) + (get-buffer-process asynch-buffer))))))) asynch-buffer))) (defun url-mm-callback (&rest ignored)