branch: master
commit fba2cb921827fa491868addb591f2f9c7b7152ee
Merge: 3cc71f3 d9d68f7
Author: Thierry Volpiatto <[email protected]>
Commit: Thierry Volpiatto <[email protected]>
Merge branch 'master' of github.com:jwiegley/emacs-async
---
async.el | 5 +++--
dired-async.el | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/async.el b/async.el
index 15966d2..87fec2f 100644
--- a/async.el
+++ b/async.el
@@ -262,8 +262,9 @@ returns nil. It can still be useful, however, as an
argument to
`(let* ((sexp ,start-func)
(,procvar
(async-start-process
- "emacs" (expand-file-name invocation-name
- invocation-directory)
+ "emacs" (file-truename
+ (expand-file-name invocation-name
+ invocation-directory))
,finish-func
"-Q" "-l" ,(funcall (symbol-function 'find-library-name)
"async")
diff --git a/dired-async.el b/dired-async.el
index 4e96ca9..9c2d10c 100644
--- a/dired-async.el
+++ b/dired-async.el
@@ -145,7 +145,7 @@ error occurs at any point, the rest of the queue is
flushed.")
(yes-or-no-p (format "Recursive copies of %s? " from))))
;; This is a directory.
(dired-async-wrap-call from callback
- (async-copy-file from to ok-flag preserve-time
+ (async-copy-file from to ok-flag preserve-time nil nil
:callback callback))
;; Not a directory.
(or top (dired-handle-overwrite to))
@@ -154,7 +154,7 @@ error occurs at any point, the rest of the queue is
flushed.")
;; It is a symlink
(make-symbolic-link (car attrs) to ok-flag)
(dired-async-wrap-call from callback
- (async-copy-file from to ok-flag preserve-time
+ (async-copy-file from to ok-flag preserve-time nil nil
:callback callback)))
(file-date-error
(push (dired-make-relative from)
