diff options
| author | Michael Albinus | 2011-12-23 15:31:35 +0100 |
|---|---|---|
| committer | Michael Albinus | 2011-12-23 15:31:35 +0100 |
| commit | bffcee0ae34feab9b8b6f7d769f1107418eab724 (patch) | |
| tree | 5c22dcfac6e3f7904f3bd04ce57279cb639ac58a | |
| parent | 9022ae07ee78e37adae69b7b55cabc926a7459f7 (diff) | |
| download | emacs-bffcee0ae34feab9b8b6f7d769f1107418eab724.tar.gz emacs-bffcee0ae34feab9b8b6f7d769f1107418eab724.zip | |
* net/ange-ftp.el (ange-ftp-copy-file-internal): Check for
existence of source file. (Bug#10325)
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/ange-ftp.el | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f1a3a452367..4f7d61b9cb1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-12-23 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/ange-ftp.el (ange-ftp-copy-file-internal): Check for | ||
| 4 | existence of source file. (Bug#10325) | ||
| 5 | |||
| 1 | 2011-12-23 Alan Mackenzie <acm@muc.de> | 6 | 2011-12-23 Alan Mackenzie <acm@muc.de> |
| 2 | 7 | ||
| 3 | Fix unstable fontification inside templates. | 8 | Fix unstable fontification inside templates. |
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 06d200c4e3e..b7fdd9a9bd8 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el | |||
| @@ -3637,6 +3637,10 @@ so return the size on the remote host exactly. See RFC 3659." | |||
| 3637 | (setq filename (expand-file-name filename) | 3637 | (setq filename (expand-file-name filename) |
| 3638 | newname (expand-file-name newname)) | 3638 | newname (expand-file-name newname)) |
| 3639 | 3639 | ||
| 3640 | (or (file-exists-p filename) | ||
| 3641 | (signal 'file-error | ||
| 3642 | (list "Copy file" "no such file or directory" filename))) | ||
| 3643 | |||
| 3640 | ;; canonicalize newname if a directory. | 3644 | ;; canonicalize newname if a directory. |
| 3641 | (if (file-directory-p newname) | 3645 | (if (file-directory-p newname) |
| 3642 | (setq newname (expand-file-name (file-name-nondirectory filename) newname))) | 3646 | (setq newname (expand-file-name (file-name-nondirectory filename) newname))) |