procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Be consistent in spelling 'ok-if-already-exists'.

Browse source
This commit is contained in:
Paul Eggert 2017-08-13 11:54:46 -07:00
parent 8de2edd9ef
commit 5bdc97d55d
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/lispref/files.texi
View file

@ -1652,7 +1652,7 @@ with @code{add-name-to-file} and then deleting @var{filename} has the
same effect as renaming, aside from momentary intermediate states.
@end deffn
@deffn Command copy-file oldname newname &optional ok-if-exists time preserve-uid-gid preserve-extended-attributes
@deffn Command copy-file oldname newname &optional ok-if-already-exists time preserve-uid-gid preserve-extended-attributes
This command copies the file @var{oldname} to @var{newname}. An
error is signaled if @var{oldname} does not exist. If @var{newname}
names a directory, it copies @var{oldname} into that directory,
@ -1684,7 +1684,7 @@ default file permissions (see @code{set-default-file-modes} below), if
SELinux context are not copied over in either case.
@end deffn
@deffn Command make-symbolic-link filename newname &optional ok-if-exists
@deffn Command make-symbolic-link filename newname &optional ok-if-already-exists
@pindex ln
@kindex file-already-exists
This command makes a symbolic link to @var{filename}, named

10
lisp/net/ange-ftp.el
View file

@ -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))

4
lisp/org/org-mobile.el
View file

@ -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)