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

[Kim F . Storm]

Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.518 emacs/src/fileio.c:1.519
*** emacs/src/fileio.c:1.518    Thu Nov  4 15:19:49 2004
--- emacs/src/fileio.c  Fri Nov  5 12:32:41 2004
***************
*** 3366,3372 ****
  }
  
  DEFUN ("file-modes", Ffile_modes, Sfile_modes, 1, 1, 0,
!        doc: /* Return mode bits of file named FILENAME, as an integer.  */)
       (filename)
       Lisp_Object filename;
  {
--- 3366,3373 ----
  }
  
  DEFUN ("file-modes", Ffile_modes, Sfile_modes, 1, 1, 0,
!        doc: /* Return mode bits of file named FILENAME, as an integer.
! Return nil, if file does not exist or is not accessible.  */)
       (filename)
       Lisp_Object filename;
  {
***************
*** 5712,5728 ****
  auto_save_1 ()
  {
    struct stat st;
  
    /* Get visited file's mode to become the auto save file's mode.  */
!   if (! NILP (current_buffer->filename)
!       && stat (SDATA (current_buffer->filename), &st) >= 0)
!     /* But make sure we can overwrite it later!  */
!     auto_save_mode_bits = st.st_mode | 0600;
!   else if (! NILP (current_buffer->filename))
!     /* Remote files don't cooperate with stat.  */
!     auto_save_mode_bits = XINT (Ffile_modes (current_buffer->filename)) | 
0600;
!   else
!     auto_save_mode_bits = 0666;
  
    return
      Fwrite_region (Qnil, Qnil,
--- 5713,5733 ----
  auto_save_1 ()
  {
    struct stat st;
+   Lisp_Object modes;
+ 
+   auto_save_mode_bits = 0666;
  
    /* Get visited file's mode to become the auto save file's mode.  */
!   if (! NILP (current_buffer->filename))
!     {
!       if (stat (SDATA (current_buffer->filename), &st) >= 0)
!       /* But make sure we can overwrite it later!  */
!       auto_save_mode_bits = st.st_mode | 0600;
!       else if ((modes = Ffile_modes (current_buffer->filename),
!               INTEGERP (modes)))
!       /* Remote files don't cooperate with stat.  */
!       auto_save_mode_bits = XINT (modes) | 0600;
!     }
  
    return
      Fwrite_region (Qnil, Qnil,
***************
*** 6190,6196 ****
  #endif
    return Qnil;
  }
!        
  DEFUN ("read-file-name", Fread_file_name, Sread_file_name, 1, 6, 0,
         doc: /* Read file name, prompting with PROMPT and completing in 
directory DIR.
  Value is not expanded---you must call `expand-file-name' yourself.
--- 6195,6201 ----
  #endif
    return Qnil;
  }
! 
  DEFUN ("read-file-name", Fread_file_name, Sread_file_name, 1, 6, 0,
         doc: /* Read file name, prompting with PROMPT and completing in 
directory DIR.
  Value is not expanded---you must call `expand-file-name' yourself.