[Emacs-diffs] Changes to emacs/src/fileio.c

[Eli Zaretskii]

Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.537 emacs/src/fileio.c:1.538
*** emacs/src/fileio.c:1.537    Sat Apr 23 16:19:37 2005
--- emacs/src/fileio.c  Sun Apr 24 09:18:15 2005
***************
*** 2400,2413 ****
  
  Fourth arg KEEP-TIME non-nil means give the output file the same
  last-modified time as the old one.  (This works on only some systems.)
- The optional fifth arg MUSTBENEW, if non-nil, insists on a check
-   for an existing file with the same name.  If MUSTBENEW is `excl',
-   that means to get an error if the file already exists; never overwrite.
-   If MUSTBENEW is neither nil nor `excl', that means ask for
-   confirmation before overwriting, but do go ahead and overwrite the file
-   if the user confirms.
  
! A prefix arg makes KEEP-TIME non-nil.  */)
    (file, newname, ok_if_already_exists, keep_time, mustbenew)
       Lisp_Object file, newname, ok_if_already_exists, keep_time, mustbenew;
  {
--- 2400,2414 ----
  
  Fourth arg KEEP-TIME non-nil means give the output file the same
  last-modified time as the old one.  (This works on only some systems.)
  
! A prefix arg makes KEEP-TIME non-nil.
! 
! The optional fifth arg MUSTBENEW, if non-nil, insists on a check
! for an existing file with the same name.  If MUSTBENEW is `excl',
! that means to get an error if the file already exists; never overwrite.
! If MUSTBENEW is neither nil nor `excl', that means ask for
! confirmation before overwriting, but do go ahead and overwrite the file
! if the user confirms.  */)
    (file, newname, ok_if_already_exists, keep_time, mustbenew)
       Lisp_Object file, newname, ok_if_already_exists, keep_time, mustbenew;
  {
***************
*** 2529,2536 ****
  #ifdef MSDOS
    /* System's default file type was set to binary by _fmode in emacs.c.  */
    ofd = emacs_open (SDATA (encoded_newname),
!                   O_WRONLY | O_CREAT | buffer_file_type
!                   | (EQ (mustbenew, Qexcl) ? O_EXCL : O_TRUNC),
                    S_IREAD | S_IWRITE);
  #else  /* not MSDOS */
    ofd = emacs_open (SDATA (encoded_newname),
--- 2530,2537 ----
  #ifdef MSDOS
    /* System's default file type was set to binary by _fmode in emacs.c.  */
    ofd = emacs_open (SDATA (encoded_newname),
!                   O_WRONLY | O_TRUNC | O_CREAT
!                   | (EQ (mustbenew, Qexcl) ? O_EXCL : 0),
                    S_IREAD | S_IWRITE);
  #else  /* not MSDOS */
    ofd = emacs_open (SDATA (encoded_newname),