[Emacs-diffs] Changes to emacs/lisp/files.el

[Eli Zaretskii]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.757 emacs/lisp/files.el:1.758
*** emacs/lisp/files.el:1.757   Sat Apr 23 16:53:21 2005
--- emacs/lisp/files.el Sun Apr 24 12:06:25 2005
***************
*** 302,308 ****
  Any other non-nil value means ask user whether to add a newline, when saving.
  nil means do not add newlines when saving.
  
! If you set this to nil, you must careful to manually add a final newline
  whenever you save a file that really needs one."
    :type '(choice (const :tag "When visiting" visit)
                 (const :tag "When saving" t)
--- 302,308 ----
  Any other non-nil value means ask user whether to add a newline, when saving.
  nil means do not add newlines when saving.
  
! If you set this to nil, you be must careful to manually add a final newline
  whenever you save a file that really needs one."
    :type '(choice (const :tag "When visiting" visit)
                 (const :tag "When saving" t)
***************
*** 2766,2772 ****
            ;; the file was somehow created by someone else between
            ;; `make-temp-name' and `write-region', let's try again.
            nil)
!         (copy-file from-name to-name t t 'excl))
        ;; Reset the umask.
        (set-default-file-modes umask)))
    (and modes
--- 2766,2773 ----
            ;; the file was somehow created by someone else between
            ;; `make-temp-name' and `write-region', let's try again.
            nil)
! ;       (copy-file from-name to-name t t 'excl))
!         (copy-file from-name to-name t t))
        ;; Reset the umask.
        (set-default-file-modes umask)))
    (and modes