branch: master
commit bcffaebca57102d40c9bec728da724c8e0510218
Author: Thierry Volpiatto <[email protected]>
Commit: Thierry Volpiatto <[email protected]>
* helm-async.el (dired-create-file): Revert changes in fb8f10b.
---
helm-async.el | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/helm-async.el b/helm-async.el
index 8254e20..dc001a8 100644
--- a/helm-async.el
+++ b/helm-async.el
@@ -196,8 +196,6 @@ old file was marked."
(if (not to)
(setq skipped (cons (dired-make-relative from) skipped))
(let* ((overwrite (file-exists-p to))
- (attrs (file-attributes from))
- (from-dir-p (eq (car attrs) t))
(dired-overwrite-confirmed ; for dired-handle-overwrite
(and overwrite
(let ((help-form '(format "\
@@ -228,7 +226,7 @@ ESC or `q' to not overwrite any of the remaining files,
;; need such a construction of the target directory,
;; so modify the destination TO to "~/test/" instead of
"~/test/foo/".
(let ((destname (file-name-directory to)))
- (when (and from-dir-p
+ (when (and (file-directory-p from)
(file-directory-p to)
(eq file-creator 'dired-copy-file))
(setq to destname))
@@ -239,12 +237,7 @@ ESC or `q' to not overwrite any of the remaining files,
(file-in-directory-p destname from)
(error "Cannot copy `%s' into its subdirectory `%s'"
from to)))
- (if (and helm-async-be-async
- (or (not from-dir-p)
- (and from-dir-p
- (or (eq dired-recursive-copies 'always)
- (yes-or-no-p
- (format "Recursive copies of %s? "
from))))))
+ (if helm-async-be-async
(if overwrite
(or (and dired-overwrite-confirmed
(push (cons from to) async-fn-list))
