Mercurial > emacs
comparison lisp/net/tramp-smb.el @ 100931:3b92ee10ce02
* net/tramp-smb.el (tramp-smb-handle-copy-file)
(tramp-smb-handle-rename-file): Delete temporary file in case of
quit.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Tue, 06 Jan 2009 07:52:01 +0000 |
| parents | 7bf074994867 |
| children | 74d482177a44 |
comparison
equal
deleted
inserted
replaced
| 100930:7d332b05e8ac | 100931:3b92ee10ce02 |
|---|---|
| 216 | 216 |
| 217 (if tmpfile | 217 (if tmpfile |
| 218 ;; Remote filename. | 218 ;; Remote filename. |
| 219 (condition-case err | 219 (condition-case err |
| 220 (rename-file tmpfile newname ok-if-already-exists) | 220 (rename-file tmpfile newname ok-if-already-exists) |
| 221 (error (delete-file tmpfile) | 221 ((error quit) |
| 222 (signal (car err) (cdr err)))) | 222 (delete-file tmpfile) |
| 223 (signal (car err) (cdr err)))) | |
| 223 | 224 |
| 224 ;; Remote newname. | 225 ;; Remote newname. |
| 225 (when (file-directory-p newname) | 226 (when (file-directory-p newname) |
| 226 (setq newname (expand-file-name | 227 (setq newname (expand-file-name |
| 227 (file-name-nondirectory filename) newname))) | 228 (file-name-nondirectory filename) newname))) |
| 552 | 553 |
| 553 (if tmpfile | 554 (if tmpfile |
| 554 ;; Remote filename. | 555 ;; Remote filename. |
| 555 (condition-case err | 556 (condition-case err |
| 556 (rename-file tmpfile newname ok-if-already-exists) | 557 (rename-file tmpfile newname ok-if-already-exists) |
| 557 (error (delete-file tmpfile) | 558 ((error quit) |
| 558 (signal (car err) (cdr err)))) | 559 (delete-file tmpfile) |
| 560 (signal (car err) (cdr err)))) | |
| 559 | 561 |
| 560 ;; Remote newname. | 562 ;; Remote newname. |
| 561 (when (file-directory-p newname) | 563 (when (file-directory-p newname) |
| 562 (setq newname (expand-file-name | 564 (setq newname (expand-file-name |
| 563 (file-name-nondirectory filename) newname))) | 565 (file-name-nondirectory filename) newname))) |