/[emacs]/emacs/src/fileio.c
ViewVC logotype

Diff of /emacs/src/fileio.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.530 by handa, Fri Mar 11 11:59:42 2005 UTC revision 1.531 by rms, Fri Mar 11 23:49:25 2005 UTC
# Line 2691  This is what happens in interactive use Line 2691  This is what happens in interactive use
2691    CHECK_STRING (file);    CHECK_STRING (file);
2692    CHECK_STRING (newname);    CHECK_STRING (newname);
2693    file = Fexpand_file_name (file, Qnil);    file = Fexpand_file_name (file, Qnil);
2694    newname = Fexpand_file_name (newname, Qnil);  
2695      if (!NILP (Ffile_directory_p (newname)))
2696        newname = Fexpand_file_name (Ffile_name_nondirectory (file), newname);
2697      else
2698        newname = Fexpand_file_name (newname, Qnil);
2699    
2700    /* If the file name has special constructs in it,    /* If the file name has special constructs in it,
2701       call the corresponding file handler.  */       call the corresponding file handler.  */
# Line 2774  This is what happens in interactive use Line 2778  This is what happens in interactive use
2778    CHECK_STRING (file);    CHECK_STRING (file);
2779    CHECK_STRING (newname);    CHECK_STRING (newname);
2780    file = Fexpand_file_name (file, Qnil);    file = Fexpand_file_name (file, Qnil);
2781    newname = Fexpand_file_name (newname, Qnil);  
2782      if (!NILP (Ffile_directory_p (newname)))
2783        newname = Fexpand_file_name (Ffile_name_nondirectory (file), newname);
2784      else
2785        newname = Fexpand_file_name (newname, Qnil);
2786    
2787    /* If the file name has special constructs in it,    /* If the file name has special constructs in it,
2788       call the corresponding file handler.  */       call the corresponding file handler.  */
# Line 2841  This happens for interactive use with M- Line 2849  This happens for interactive use with M-
2849       we want to permit links to relative file names.  */       we want to permit links to relative file names.  */
2850    if (SREF (filename, 0) == '~')    if (SREF (filename, 0) == '~')
2851      filename = Fexpand_file_name (filename, Qnil);      filename = Fexpand_file_name (filename, Qnil);
2852    linkname = Fexpand_file_name (linkname, Qnil);  
2853      if (!NILP (Ffile_directory_p (linkname)))
2854        linkname = Fexpand_file_name (Ffile_name_nondirectory (file), linkname);
2855      else
2856        linkname = Fexpand_file_name (linkname, Qnil);
2857    
2858    /* If the file name has special constructs in it,    /* If the file name has special constructs in it,
2859       call the corresponding file handler.  */       call the corresponding file handler.  */

Legend:
Removed from v.1.530  
changed lines
  Added in v.1.531

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26