summaryrefslogtreecommitdiff
path: root/lisp/net/ange-ftp.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/net/ange-ftp.el')
-rw-r--r--lisp/net/ange-ftp.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 239da7829df..07c3daf7d7e 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1533,12 +1533,11 @@ then kill the related FTP process."
(defun ange-ftp-barf-if-not-directory (directory)
(or (file-directory-p directory)
- (signal 'file-error
- (list "Opening directory"
- (if (file-exists-p directory)
- "Not a directory"
- "No such file or directory")
- directory))))
+ (let ((exists (file-exists-p directory)))
+ (signal (if exists 'file-error 'file-missing)
+ (list "Opening directory"
+ (if exists "Not a directory" "No such file or directory")
+ directory)))))
;;;; ------------------------------------------------------------
;;;; FTP process filter support.
@@ -3352,9 +3351,10 @@ system TYPE.")
(setq buffer-file-name filename)))
(setq last-coding-system-used coding-system-used)
(list filename size))
- (signal 'file-error
+ (signal 'file-missing
(list
"Opening input file"
+ "No such file or directory"
filename))))
(ange-ftp-real-insert-file-contents filename visit beg end replace))))
@@ -3663,7 +3663,7 @@ so return the size on the remote host exactly. See RFC 3659."
newname (expand-file-name newname))
(or (file-exists-p filename)
- (signal 'file-error
+ (signal 'file-missing
(list "Copy file" "No such file or directory" filename)))
;; canonicalize newname if a directory.