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

[Miles Bader]

Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.478 emacs/src/fileio.c:1.479
*** emacs/src/fileio.c:1.478    Fri Mar 21 00:44:55 2003
--- emacs/src/fileio.c  Sat Mar 29 11:34:35 2003
***************
*** 1026,1032 ****
    int is_escaped = 0;
  #endif /* DOS_NT */
    int length;
!   Lisp_Object handler;
  
    CHECK_STRING (name);
  
--- 1026,1032 ----
    int is_escaped = 0;
  #endif /* DOS_NT */
    int length;
!   Lisp_Object handler, result;
  
    CHECK_STRING (name);
  
***************
*** 1678,1685 ****
    CORRECT_DIR_SEPS (target);
  #endif /* DOS_NT */
  
!   return make_specified_string (target, -1, o - target,
!                               STRING_MULTIBYTE (name));
  }
  
  #if 0
--- 1678,1696 ----
    CORRECT_DIR_SEPS (target);
  #endif /* DOS_NT */
  
!   result = make_specified_string (target, -1, o - target,
!                                   STRING_MULTIBYTE (name));
! 
!   /* Again look to see if the file name has special constructs in it
!      and perhaps call the corresponding file handler.  This is needed
!      for filenames such as "/foo/../address@hidden:/bar/../baz".  Expanding
!      the ".." component gives us "/address@hidden:/bar/../baz" which needs
!      to be expanded again. */
!   handler = Ffind_file_name_handler (result, Qexpand_file_name);
!   if (!NILP (handler))
!     return call3 (handler, Qexpand_file_name, result, default_directory);
! 
!   return result;
  }
  
  #if 0