diff options
author | Kyle Meyer <kyle@kyleam.com> | 2017-08-14 22:04:35 -0400 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2017-08-14 22:04:35 -0400 |
commit | 489080124210a78d6622c79ede5c003e07c2ccb8 (patch) | |
tree | 0f225281ffdd659b320e834d944d23dac765d156 | |
parent | b900a85fe92d4373c4ebc9f40732cfc92dbea62b (diff) | |
parent | 731f59f96530d107db7bd1b5ac35c5accf255e4a (diff) | |
download | org-mode-489080124210a78d6622c79ede5c003e07c2ccb8.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-mobile.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el index c5b9e10..192ccad 100644 --- a/lisp/org-mobile.el +++ b/lisp/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) |