Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-937

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index e8ae7233c20..d5dd002cf7a 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -2,11 +2,15 @@
 
         * url-mailto.el (mail-send-and-exit):
         * url-http.el (url-dav-file-attributes):
-        * url-file.el (ange-ftp-set-passwd, ange-ftp-copy-file-internal):
+        * url-file.el (ange-ftp-set-passwd, ange-ftp-copy-file-internal)
         (url-generate-unique-filename): Declare as functions.
 
         * url-privacy.el (url-device-type): Define unconditionally.
 
+2007-11-15  Richard Stallman  <rms@gnu.org>
+
+        * url.el (url-retrieve-synchronously): Call delete-process.
+
 2007-10-31  Juanma Barranquero  <lekktu@gmail.com>
 
         * url-vars.el (url-vars-unload-hook): Remove function and variable.
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 3b292b4452d..c375a75e06f 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -241,7 +241,9 @@ no further processing).  URL is either a string or a parsed URL."
                 ;; XXX: The callback must always be called.  Any
                 ;; exception is a bug that should be fixed, not worked
                 ;; around.
-                (setq retrieval-done t))
+                (progn ;; Call delete-process so we run any sentinel now.
+                  (delete-process proc)
+                  (setq retrieval-done t)))
             ;; We used to use `sit-for' here, but in some cases it wouldn't
             ;; work because apparently pending keyboard input would always
             ;; interrupt it before it got a chance to handle process input.