[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master bcffaeb 067/187: * helm-async.el (dired-create-file): Reve
From: |
Michael Albinus |
Subject: |
[elpa] master bcffaeb 067/187: * helm-async.el (dired-create-file): Revert changes in fb8f10b. |
Date: |
Wed, 30 Dec 2015 11:49:44 +0000 |
branch: master
commit bcffaebca57102d40c9bec728da724c8e0510218
Author: Thierry Volpiatto <address@hidden>
Commit: Thierry Volpiatto <address@hidden>
* 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))
- [elpa] master ef0e45c 055/187: add async-pkg.el, (continued)
- [elpa] master ef0e45c 055/187: add async-pkg.el, Michael Albinus, 2015/12/30
- [elpa] master dc69911 059/187: Merge branch 'master' of github.com:jwiegley/emacs-async, Michael Albinus, 2015/12/30
- [elpa] master c9a0724 061/187: Update copyrights., Michael Albinus, 2015/12/30
- [elpa] master cf12552 062/187: * helm-async.el: Fix mode-line updating for emacs-24.3.50., Michael Albinus, 2015/12/30
- [elpa] master 3ac941a 042/187: Move async.el testing code into its own module, Michael Albinus, 2015/12/30
- [elpa] master 9585ae1 058/187: * helm-async.el (helm-async-env-variables-regexp): Fix for copying from android devices., Michael Albinus, 2015/12/30
- [elpa] master 3544948 064/187: * helm-async.el (dired-create-files): No need to backquote callback., Michael Albinus, 2015/12/30
- [elpa] master 8d38306 063/187: * helm-async.el: Untabify and reindent., Michael Albinus, 2015/12/30
- [elpa] master c029934 066/187: * helm-async.el: Add comments about incompatibility with dired-async.el and async-file.el., Michael Albinus, 2015/12/30
- [elpa] master fb8f10b 065/187: * helm-async.el (dired-create-files): Handle `dired-recursive-copies' when async too., Michael Albinus, 2015/12/30
- [elpa] master bcffaeb 067/187: * helm-async.el (dired-create-file): Revert changes in fb8f10b.,
Michael Albinus <=
- [elpa] master 8e05e02 070/187: Prevent accidental creation of lexical closures., Michael Albinus, 2015/12/30
- [elpa] master 9c02acd 069/187: Add test for #17., Michael Albinus, 2015/12/30
- [elpa] master 5ef546a 071/187: Have test file add its own directory to load path, Michael Albinus, 2015/12/30
- [elpa] master 242ae73 068/187: * helm-async.el: Fix error handling., Michael Albinus, 2015/12/30
- [elpa] master 93b05a9 073/187: More robust evaluation and closure-protection of start-func, Michael Albinus, 2015/12/30
- [elpa] master ba705c6 076/187: Add test for handling different ways of passing a function, Michael Albinus, 2015/12/30
- [elpa] master b6d990d 075/187: Add lexbind test, Michael Albinus, 2015/12/30
- [elpa] master f6d7a74 074/187: Merge pull request #18 from DarwinAwardWinner/lexbind-fix, Michael Albinus, 2015/12/30
- [elpa] master 9b5bb5c 072/187: Add more comprehensive testing for anti-closure feature, Michael Albinus, 2015/12/30
- [elpa] master 204750d 081/187: Revert "* helm-async.el: Fix error handling.", Michael Albinus, 2015/12/30