diff options
| author | Richard M. Stallman | 2007-11-15 11:52:42 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2007-11-15 11:52:42 +0000 |
| commit | 9ffb952120776aec512cabc9bb5af660f016bcac (patch) | |
| tree | 15d6213def89abfbf8f4cc46623e2c1a65e3d78f | |
| parent | bb189688f6f92a8a6c2c8cb9c94faec486206e74 (diff) | |
| download | emacs-9ffb952120776aec512cabc9bb5af660f016bcac.tar.gz emacs-9ffb952120776aec512cabc9bb5af660f016bcac.zip | |
(url-retrieve-synchronously): Call delete-process.
| -rw-r--r-- | lisp/url/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/url/url.el | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 146d224435b..7402de41aab 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-11-15 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * url.el (url-retrieve-synchronously): Call delete-process. | ||
| 4 | |||
| 1 | 2007-10-13 Richard Stallman <rms@gnu.org> | 5 | 2007-10-13 Richard Stallman <rms@gnu.org> |
| 2 | 6 | ||
| 3 | * url-util.el (url-basepath): Function deleted. | 7 | * url-util.el (url-basepath): Function deleted. |
diff --git a/lisp/url/url.el b/lisp/url/url.el index 1af016ff0ba..98dc939af99 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el | |||
| @@ -240,7 +240,9 @@ no further processing). URL is either a string or a parsed URL." | |||
| 240 | ;; XXX: The callback must always be called. Any | 240 | ;; XXX: The callback must always be called. Any |
| 241 | ;; exception is a bug that should be fixed, not worked | 241 | ;; exception is a bug that should be fixed, not worked |
| 242 | ;; around. | 242 | ;; around. |
| 243 | (setq retrieval-done t)) | 243 | (progn ;; Call delete-process so we run any sentinel now. |
| 244 | (delete-process proc) | ||
| 245 | (setq retrieval-done t))) | ||
| 244 | ;; We used to use `sit-for' here, but in some cases it wouldn't | 246 | ;; We used to use `sit-for' here, but in some cases it wouldn't |
| 245 | ;; work because apparently pending keyboard input would always | 247 | ;; work because apparently pending keyboard input would always |
| 246 | ;; interrupt it before it got a chance to handle process input. | 248 | ;; interrupt it before it got a chance to handle process input. |