aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2005-04-24 12:07:15 +0000
committerEli Zaretskii2005-04-24 12:07:15 +0000
commit1441edfef957d4644a87ea503e64cf9cc431955e (patch)
tree7ce6ebb086bec43c4b83e67652ba4e472da5c956
parent7fce7dfe69a1afbb663b5cde14dd34918f027090 (diff)
downloademacs-1441edfef957d4644a87ea503e64cf9cc431955e.tar.gz
emacs-1441edfef957d4644a87ea503e64cf9cc431955e.zip
(mode-require-final-newline): Doc fix.
(backup-buffer-copy): Fix last change.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/files.el5
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 390b3d680f1..be485c306d1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-04-24 Eli Zaretskii <eliz@gnu.org>
2
3 * files.el (mode-require-final-newline): Doc fix.
4 (backup-buffer-copy): Fix last change.
5
12005-04-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 62005-04-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 7
3 * term/mac-win.el: Require select. Set selection-coding-system to 8 * term/mac-win.el: Require select. Set selection-coding-system to
diff --git a/lisp/files.el b/lisp/files.el
index 1186a5fb8b4..d14bddc769f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -302,7 +302,7 @@ A value of `visit-save' means do it at both of those times.
302Any other non-nil value means ask user whether to add a newline, when saving. 302Any other non-nil value means ask user whether to add a newline, when saving.
303nil means do not add newlines when saving. 303nil means do not add newlines when saving.
304 304
305If you set this to nil, you must careful to manually add a final newline 305If you set this to nil, you be must careful to manually add a final newline
306whenever you save a file that really needs one." 306whenever you save a file that really needs one."
307 :type '(choice (const :tag "When visiting" visit) 307 :type '(choice (const :tag "When visiting" visit)
308 (const :tag "When saving" t) 308 (const :tag "When saving" t)
@@ -2766,7 +2766,8 @@ BACKUPNAME is the backup file name, which is the old file renamed."
2766 ;; the file was somehow created by someone else between 2766 ;; the file was somehow created by someone else between
2767 ;; `make-temp-name' and `write-region', let's try again. 2767 ;; `make-temp-name' and `write-region', let's try again.
2768 nil) 2768 nil)
2769 (copy-file from-name to-name t t 'excl)) 2769; (copy-file from-name to-name t t 'excl))
2770 (copy-file from-name to-name t t))
2770 ;; Reset the umask. 2771 ;; Reset the umask.
2771 (set-default-file-modes umask))) 2772 (set-default-file-modes umask)))
2772 (and modes 2773 (and modes