diff options
| author | Chong Yidong | 2006-05-26 15:21:21 +0000 |
|---|---|---|
| committer | Chong Yidong | 2006-05-26 15:21:21 +0000 |
| commit | 920e95c0c35e32c0e497403d83bc91b70373f996 (patch) | |
| tree | 2d918424b7c072441bbb6ede03c845d58106cd0b | |
| parent | 795c20df7a0e555ff9df8280c101636e88fb6c8c (diff) | |
| download | emacs-920e95c0c35e32c0e497403d83bc91b70373f996.tar.gz emacs-920e95c0c35e32c0e497403d83bc91b70373f996.zip | |
* files.el (backup-buffer-copy): Remove deleted MUSTBENEW argument
to copy-file.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7ebc95ccfd6..94cffb889dd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-05-26 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * files.el (backup-buffer-copy): Remove deleted MUSTBENEW argument | ||
| 4 | to copy-file. | ||
| 5 | |||
| 1 | 2006-05-26 Reiner Steib <Reiner.Steib@gmx.de> | 6 | 2006-05-26 Reiner Steib <Reiner.Steib@gmx.de> |
| 2 | 7 | ||
| 3 | * simple.el (toggle-truncate-lines): Make arg optional for | 8 | * simple.el (toggle-truncate-lines): Make arg optional for |
diff --git a/lisp/files.el b/lisp/files.el index 2eaeae5ac86..8ecd57a4d24 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -2994,7 +2994,7 @@ BACKUPNAME is the backup file name, which is the old file renamed." | |||
| 2994 | (condition-case nil | 2994 | (condition-case nil |
| 2995 | (delete-file to-name) | 2995 | (delete-file to-name) |
| 2996 | (file-error nil)) | 2996 | (file-error nil)) |
| 2997 | (copy-file from-name to-name t t 'excl) | 2997 | (copy-file from-name to-name nil t) |
| 2998 | nil) | 2998 | nil) |
| 2999 | (file-already-exists t)) | 2999 | (file-already-exists t)) |
| 3000 | ;; The file was somehow created by someone else between | 3000 | ;; The file was somehow created by someone else between |