[Emacs-diffs] Changes to emacs/lisp/url/url.el,v

[Magnus Henoch]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Magnus Henoch <legoscia>        06/11/08 00:12:52

Index: url.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url.el,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- url.el      27 Oct 2006 14:46:59 -0000      1.23
+++ url.el      8 Nov 2006 00:12:52 -0000       1.24
@@ -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)