aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2017-08-13 11:54:46 -0700
committerPaul Eggert2017-08-13 11:55:12 -0700
commit5bdc97d55df30f6af107ddd136901983a7e2706a (patch)
treea85ddaf50d63b53e77cd98a527b84a4038fdace4
parent8de2edd9ef8b4776fd7226de285c1d135b3e6938 (diff)
downloademacs-5bdc97d55df30f6af107ddd136901983a7e2706a.tar.gz
emacs-5bdc97d55df30f6af107ddd136901983a7e2706a.zip
Be consistent in spelling 'ok-if-already-exists'.
-rw-r--r--doc/lispref/files.texi4
-rw-r--r--lisp/net/ange-ftp.el10
-rw-r--r--lisp/org/org-mobile.el4
3 files changed, 9 insertions, 9 deletions
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index d3f40a7c0c0..25f32c231ca 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1652,7 +1652,7 @@ with @code{add-name-to-file} and then deleting @var{filename} has the
1652same effect as renaming, aside from momentary intermediate states. 1652same effect as renaming, aside from momentary intermediate states.
1653@end deffn 1653@end deffn
1654 1654
1655@deffn Command copy-file oldname newname &optional ok-if-exists time preserve-uid-gid preserve-extended-attributes 1655@deffn Command copy-file oldname newname &optional ok-if-already-exists time preserve-uid-gid preserve-extended-attributes
1656This command copies the file @var{oldname} to @var{newname}. An 1656This command copies the file @var{oldname} to @var{newname}. An
1657error is signaled if @var{oldname} does not exist. If @var{newname} 1657error is signaled if @var{oldname} does not exist. If @var{newname}
1658names a directory, it copies @var{oldname} into that directory, 1658names a directory, it copies @var{oldname} into that directory,
@@ -1684,7 +1684,7 @@ default file permissions (see @code{set-default-file-modes} below), if
1684SELinux context are not copied over in either case. 1684SELinux context are not copied over in either case.
1685@end deffn 1685@end deffn
1686 1686
1687@deffn Command make-symbolic-link filename newname &optional ok-if-exists 1687@deffn Command make-symbolic-link filename newname &optional ok-if-already-exists
1688@pindex ln 1688@pindex ln
1689@kindex file-already-exists 1689@kindex file-already-exists
1690This command makes a symbolic link to @var{filename}, named 1690This command makes a symbolic link to @var{filename}, named
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.,
3846 (unless okay-p (error "%s: %s" 'ange-ftp-copy-files-async line)) 3846 (unless okay-p (error "%s: %s" 'ange-ftp-copy-files-async line))
3847 (if files 3847 (if files
3848 (let* ((ff (car files)) 3848 (let* ((ff (car files))
3849 (from-file (nth 0 ff)) 3849 (from-file (nth 0 ff))
3850 (to-file (nth 1 ff)) 3850 (to-file (nth 1 ff))
3851 (ok-if-exists (nth 2 ff)) 3851 (ok-if-already-exists (nth 2 ff))
3852 (keep-date (nth 3 ff))) 3852 (keep-date (nth 3 ff)))
3853 (ange-ftp-copy-file-internal 3853 (ange-ftp-copy-file-internal
3854 from-file to-file ok-if-exists keep-date 3854 from-file to-file ok-if-already-exists keep-date
3855 (and verbose-p (format "%s --> %s" from-file to-file)) 3855 (and verbose-p (format "%s --> %s" from-file to-file))
3856 (list 'ange-ftp-copy-files-async verbose-p (cdr files)) 3856 (list 'ange-ftp-copy-files-async verbose-p (cdr files))
3857 t)) 3857 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."
467 (make-directory target-dir 'parents)) 467 (make-directory target-dir 'parents))
468 (if org-mobile-use-encryption 468 (if org-mobile-use-encryption
469 (org-mobile-encrypt-and-move file target-path) 469 (org-mobile-encrypt-and-move file target-path)
470 (copy-file file target-path 'ok-if-exists)) 470 (copy-file file target-path 'ok-if-already-exists))
471 (setq check (shell-command-to-string 471 (setq check (shell-command-to-string
472 (concat (shell-quote-argument org-mobile-checksum-binary) 472 (concat (shell-quote-argument org-mobile-checksum-binary)
473 " " 473 " "
@@ -687,7 +687,7 @@ encryption program does not understand them."
687 (let ((encfile (concat infile "_enc"))) 687 (let ((encfile (concat infile "_enc")))
688 (org-mobile-encrypt-file infile encfile) 688 (org-mobile-encrypt-file infile encfile)
689 (when outfile 689 (when outfile
690 (copy-file encfile outfile 'ok-if-exists) 690 (copy-file encfile outfile 'ok-if-already-exists)
691 (delete-file encfile)))) 691 (delete-file encfile))))
692 692
693(defun org-mobile-encrypt-file (infile outfile) 693(defun org-mobile-encrypt-file (infile outfile)