diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/ange-ftp.el | 10 | ||||
| -rw-r--r-- | lisp/org/org-mobile.el | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index cb8086bdb38..a4842077ad6 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -3846,12 +3846,12 @@ E.g., (unless okay-p (error "%s: %s" 'ange-ftp-copy-files-async line)) (if files (let* ((ff (car files)) - (from-file (nth 0 ff)) - (to-file (nth 1 ff)) - (ok-if-exists (nth 2 ff)) - (keep-date (nth 3 ff))) + (from-file (nth 0 ff)) + (to-file (nth 1 ff)) + (ok-if-already-exists (nth 2 ff)) + (keep-date (nth 3 ff))) (ange-ftp-copy-file-internal - from-file to-file ok-if-exists keep-date + from-file to-file ok-if-already-exists keep-date (and verbose-p (format "%s --> %s" from-file to-file)) (list 'ange-ftp-copy-files-async verbose-p (cdr files)) t)) diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el index 12e6c84b3ce..9fee09f38e4 100644 --- a/lisp/org/org-mobile.el +++ b/lisp/org/org-mobile.el @@ -467,7 +467,7 @@ agenda view showing the flagged items." (make-directory target-dir 'parents)) (if org-mobile-use-encryption (org-mobile-encrypt-and-move file target-path) - (copy-file file target-path 'ok-if-exists)) + (copy-file file target-path 'ok-if-already-exists)) (setq check (shell-command-to-string (concat (shell-quote-argument org-mobile-checksum-binary) " " @@ -687,7 +687,7 @@ encryption program does not understand them." (let ((encfile (concat infile "_enc"))) (org-mobile-encrypt-file infile encfile) (when outfile - (copy-file encfile outfile 'ok-if-exists) + (copy-file encfile outfile 'ok-if-already-exists) (delete-file encfile)))) (defun org-mobile-encrypt-file (infile outfile) |