(url-retrieve-synchronously): Allow quitting when inhibit-quit is t.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 678e7e5a8db16e063d97f280dca9231d21f413cf..2f03b9e9d67d39177ad6182e16429f2633483bc1 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-08  Magnus Henoch  <mange@freemail.hu>
+
+       * url.el (url-retrieve-synchronously): Allow quitting when
+       inhibit-quit is t.
+
 2006-11-03  Shun-ichi GOTO  <gotoh@taiyo.co.jp> (tiny change)
 
        * url-http.el (url-http-handle-authentication): If there are

diff --git a/lisp/url/url.el b/lisp/url/url.el
index 6e4dfa089e7983853ae2f21d64a87642ea3522b3..a95c7e39c02611f0664475d3030465f1852cad85 100644 (file)
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -246,10 +246,16 @@ no further processing).  URL is either a string or a parsed URL."
             ;; 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)