summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-08-13 11:54:46 -0700
committerKyle Meyer <kyle@kyleam.com>2017-08-14 22:03:29 -0400
commit731f59f96530d107db7bd1b5ac35c5accf255e4a (patch)
tree88e8d5449f0dfe418a9f7f89b7b75d69b67988aa
parentf3abb514a3d343add93fd370b5a9894a95a3d3e8 (diff)
downloadorg-mode-731f59f96530d107db7bd1b5ac35c5accf255e4a.tar.gz
Backport commit 5bdc97d55 from Emacs
Be consistent in spelling 'ok-if-already-exists'. 5bdc97d55df30f6af107ddd136901983a7e2706a Paul Eggert Sun Aug 13 11:55:12 2017 -0700
-rw-r--r--lisp/org-mobile.el4
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)