[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 5bdc97d: Be consistent in spelling 'ok-if-already-e
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 5bdc97d: Be consistent in spelling 'ok-if-already-exists'. |
Date: |
Sun, 13 Aug 2017 14:55:18 -0400 (EDT) |
branch: master
commit 5bdc97d55df30f6af107ddd136901983a7e2706a
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Be consistent in spelling 'ok-if-already-exists'.
---
doc/lispref/files.texi | 4 ++--
lisp/net/ange-ftp.el | 10 +++++-----
lisp/org/org-mobile.el | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index d3f40a7..25f32c2 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
same effect as renaming, aside from momentary intermediate states.
@end deffn
address@hidden Command copy-file oldname newname &optional ok-if-exists time
preserve-uid-gid preserve-extended-attributes
address@hidden 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
address@hidden Command make-symbolic-link filename newname &optional
ok-if-exists
address@hidden 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
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index cb8086b..a484207 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -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))
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index 12e6c84..9fee09f 100644
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 5bdc97d: Be consistent in spelling 'ok-if-already-exists'.,
Paul Eggert <=