comparison src/fileio.c @ 60574:f5607c3ce8fd

(Fmake_symbolic_link): Fix last change.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sat, 12 Mar 2005 01:36:25 +0000
parents d19eab3028e2
children 3f5458d947ec 48ba3f89c89f 8395880305fe
comparison
equal deleted inserted replaced
60573:76fcfe4d97de 60574:f5607c3ce8fd
1 /* File IO for GNU Emacs. 1 /* File IO for GNU Emacs.
2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998, 2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998,
3 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. 3 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
4 4
5 This file is part of GNU Emacs. 5 This file is part of GNU Emacs.
6 6
7 GNU Emacs is free software; you can redistribute it and/or modify 7 GNU Emacs is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
2849 we want to permit links to relative file names. */ 2849 we want to permit links to relative file names. */
2850 if (SREF (filename, 0) == '~') 2850 if (SREF (filename, 0) == '~')
2851 filename = Fexpand_file_name (filename, Qnil); 2851 filename = Fexpand_file_name (filename, Qnil);
2852 2852
2853 if (!NILP (Ffile_directory_p (linkname))) 2853 if (!NILP (Ffile_directory_p (linkname)))
2854 linkname = Fexpand_file_name (Ffile_name_nondirectory (file), linkname); 2854 linkname = Fexpand_file_name (Ffile_name_nondirectory (filename), linkname);
2855 else 2855 else
2856 linkname = Fexpand_file_name (linkname, Qnil); 2856 linkname = Fexpand_file_name (linkname, Qnil);
2857 2857
2858 /* If the file name has special constructs in it, 2858 /* If the file name has special constructs in it,
2859 call the corresponding file handler. */ 2859 call the corresponding file handler. */