[elpa] master e7c9e93 2/2: Merge commit 'bd11e73689b7fabb82ea8223762039ced33c6199'

[Thierry Volpiatto]

branch: master
commit e7c9e935d1d175deba28d2af7a0cba6f22a68ba1
Merge: 7baf92f bd11e73
Author: Thierry Volpiatto <address@hidden>
Commit: Thierry Volpiatto <address@hidden>

    Merge commit 'bd11e73689b7fabb82ea8223762039ced33c6199'
---
 packages/async/async.el | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/async/async.el b/packages/async/async.el
index 99162cb..99c5b79 100644
--- a/packages/async/async.el
+++ b/packages/async/async.el
@@ -169,24 +169,32 @@ as follows:
         (prin1 (list 'async-signal err)))))))
 
 (defun async-ready (future)
-  "Query a FUTURE to see if the ready is ready -- i.e., if no blocking
+  "Query a FUTURE to see if it is ready.
+
+I.e., if no blocking
 would result from a call to `async-get' on that FUTURE."
   (and (memq (process-status future) '(exit signal))
-       (with-current-buffer (process-buffer future)
-         async-callback-value-set)))
+       (let ((buf (process-buffer future)))
+         (if (buffer-live-p buf)
+             (with-current-buffer buf
+               async-callback-value-set)
+             t))))
 
 (defun async-wait (future)
   "Wait for FUTURE to become ready."
   (while (not (async-ready future))
-    (sit-for 0.05)))
+    (sleep-for 0.05)))
 
 (defun async-get (future)
-  "Get the value from an asynchronously function when it is ready.
+  "Get the value from process FUTURE when it is ready.
 FUTURE is returned by `async-start' or `async-start-process' when
 its FINISH-FUNC is nil."
-  (async-wait future)
-  (with-current-buffer (process-buffer future)
-    (async-handle-result #'identity async-callback-value (current-buffer))))
+  (and future (async-wait future))
+  (let ((buf (process-buffer future)))
+    (when (buffer-live-p buf)
+      (with-current-buffer buf
+        (async-handle-result
+         #'identity async-callback-value (current-buffer))))))
 
 (defun async-message-p (value)
   "Return true of VALUE is an async.el message packet."