[Emacs-diffs] /srv/bzr/emacs/trunk r107336: Make url-queue not kill a random buffer on error

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 107336
committer: Lars Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2012-02-19 09:49:09 +0100
message:
  Make url-queue not kill a random buffer on error
  
  * url-queue.el (url-queue-callback-function): Remove the job from
  the queue so that we don't kill the current buffer, which will
  then make the callback function kill a random buffer.
modified:
  lisp/url/ChangeLog
  lisp/url/url-queue.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2012-02-14 18:43:21 +0000
+++ b/lisp/url/ChangeLog        2012-02-19 08:49:09 +0000
@@ -1,3 +1,9 @@
+2012-02-19  Lars Ingebrigtsen  <address@hidden>
+
+       * url-queue.el (url-queue-callback-function): Remove the job from
+       the queue so that we don't kill the current buffer, which will
+       then make the callback function kill a random buffer.
+
 2012-02-14  Lars Ingebrigtsen  <address@hidden>
 
        * url-queue.el (url-queue-kill-job): Refactored out code.

=== modified file 'lisp/url/url-queue.el'
--- a/lisp/url/url-queue.el     2012-02-14 18:43:21 +0000
+++ b/lisp/url/url-queue.el     2012-02-19 08:49:09 +0000
@@ -108,6 +108,7 @@
       (url-queue-start-retrieve waiting))))
 
 (defun url-queue-callback-function (status job)
+  (setq url-queue (delq job url-queue))
   (when (and (eq (car status) :error)
             (eq (cadr (cadr status)) 'connection-failed))
     ;; If we get a connection error, then flush all other jobs from
@@ -116,7 +117,6 @@
     ;; synchronously and totally halts Emacs.
     (url-queue-remove-jobs-from-host
      (plist-get (nthcdr 3 (cadr status)) :host)))
-  (setq url-queue (delq job url-queue))
   (url-queue-run-queue)
   (apply (url-queue-callback job) (cons status (url-queue-cbargs job))))