diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
| commit | 18cd1f1a08833b0baad21c1d7b13a6845d95cf57 (patch) | |
| tree | 03f33df7513d15bd5de0348aec35ef82bd061508 /lisp/files.el | |
| parent | 74863e7a78b1c8da1094a8250660a009c3b23015 (diff) | |
| parent | fdc9061358d3654e14bfc1419632e1d6c6c5c13e (diff) | |
| download | emacs-18cd1f1a08833b0baad21c1d7b13a6845d95cf57.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/files.el b/lisp/files.el index 6d03ad24dbe..6b0bd26efe8 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -3204,13 +3204,13 @@ BACKUPNAME is the backup file name, which is the old file renamed." (set-default-file-modes ?\700) (when (condition-case nil ;; Try to overwrite old backup first. - (copy-file from-name to-name t t) + (copy-file from-name to-name t t t) (error t)) (while (condition-case nil (progn (when (file-exists-p to-name) (delete-file to-name)) - (copy-file from-name to-name nil t) + (copy-file from-name to-name nil t t) nil) (file-already-exists t)) ;; The file was somehow created by someone else between @@ -5286,9 +5286,8 @@ message to that effect instead of signaling an error." (defvar kill-emacs-query-functions nil "Functions to call with no arguments to query about killing Emacs. If any of these functions returns nil, killing Emacs is cancelled. -`save-buffers-kill-emacs' (\\[save-buffers-kill-emacs]) calls these functions, -but `kill-emacs', the low level primitive, does not. -See also `kill-emacs-hook'.") +`save-buffers-kill-emacs' calls these functions, but `kill-emacs', +the low level primitive, does not. See also `kill-emacs-hook'.") (defcustom confirm-kill-emacs nil "How to ask for confirmation when leaving Emacs. |