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

[Richard M . Stallman]

Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.530 emacs/src/fileio.c:1.531
*** emacs/src/fileio.c:1.530    Fri Mar 11 11:59:42 2005
--- emacs/src/fileio.c  Fri Mar 11 23:49:25 2005
***************
*** 2691,2697 ****
    CHECK_STRING (file);
    CHECK_STRING (newname);
    file = Fexpand_file_name (file, Qnil);
!   newname = Fexpand_file_name (newname, Qnil);
  
    /* If the file name has special constructs in it,
       call the corresponding file handler.  */
--- 2691,2701 ----
    CHECK_STRING (file);
    CHECK_STRING (newname);
    file = Fexpand_file_name (file, Qnil);
! 
!   if (!NILP (Ffile_directory_p (newname)))
!     newname = Fexpand_file_name (Ffile_name_nondirectory (file), newname);
!   else
!     newname = Fexpand_file_name (newname, Qnil);
  
    /* If the file name has special constructs in it,
       call the corresponding file handler.  */
***************
*** 2774,2780 ****
    CHECK_STRING (file);
    CHECK_STRING (newname);
    file = Fexpand_file_name (file, Qnil);
!   newname = Fexpand_file_name (newname, Qnil);
  
    /* If the file name has special constructs in it,
       call the corresponding file handler.  */
--- 2778,2788 ----
    CHECK_STRING (file);
    CHECK_STRING (newname);
    file = Fexpand_file_name (file, Qnil);
! 
!   if (!NILP (Ffile_directory_p (newname)))
!     newname = Fexpand_file_name (Ffile_name_nondirectory (file), newname);
!   else
!     newname = Fexpand_file_name (newname, Qnil);
  
    /* If the file name has special constructs in it,
       call the corresponding file handler.  */
***************
*** 2841,2847 ****
       we want to permit links to relative file names.  */
    if (SREF (filename, 0) == '~')
      filename = Fexpand_file_name (filename, Qnil);
!   linkname = Fexpand_file_name (linkname, Qnil);
  
    /* If the file name has special constructs in it,
       call the corresponding file handler.  */
--- 2849,2859 ----
       we want to permit links to relative file names.  */
    if (SREF (filename, 0) == '~')
      filename = Fexpand_file_name (filename, Qnil);
! 
!   if (!NILP (Ffile_directory_p (linkname)))
!     linkname = Fexpand_file_name (Ffile_name_nondirectory (file), linkname);
!   else
!     linkname = Fexpand_file_name (linkname, Qnil);
  
    /* If the file name has special constructs in it,
       call the corresponding file handler.  */