ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Kyle Meyer 2017-08-14 22:04:35 -04:00
parent b900a85fe9 731f59f965
commit 4890801242
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org-mobile.el
View File

@ -467,7 +467,7 @@ agenda view showing the flagged items."
(make-directory target-dir 'parents)) (make-directory target-dir 'parents))
(if org-mobile-use-encryption (if org-mobile-use-encryption
(org-mobile-encrypt-and-move file target-path) (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 (setq check (shell-command-to-string
(concat (shell-quote-argument org-mobile-checksum-binary) (concat (shell-quote-argument org-mobile-checksum-binary)
" " " "
@ -687,7 +687,7 @@ encryption program does not understand them."
(let ((encfile (concat infile "_enc"))) (let ((encfile (concat infile "_enc")))
(org-mobile-encrypt-file infile encfile) (org-mobile-encrypt-file infile encfile)
(when outfile (when outfile
(copy-file encfile outfile 'ok-if-exists) (copy-file encfile outfile 'ok-if-already-exists)
(delete-file encfile)))) (delete-file encfile))))
(defun org-mobile-encrypt-file (infile outfile) (defun org-mobile-encrypt-file (infile outfile)