aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Albinus <[email protected]>2008-04-10 20:35:54 +0000
committerMichael Albinus <[email protected]>2008-04-10 20:35:54 +0000
commite89b536d4b54f200b2f9a6f4561d4b634ef4bbe0 (patch)
tree08a40dbfe653a3b223c0f813837056b5164dd5fe /src
parent31403b2446c0f130398c64bdfd3a0b81cc87baac (diff)
* fileio.c (Fmake_symbolic_link): Surround code by #ifdef S_IFLNK
only after check for file name handler functions. Signal, when native functionality is not supported. (syms_of_fileio): Declare it unconditionally.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/fileio.c11
2 files changed, 14 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 34edb2370b..3e222ecf37 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-10 Michael Albinus <[email protected]>
+
+ * fileio.c (Fmake_symbolic_link): Surround code by #ifdef S_IFLNK
+ only after check for file name handler functions. Signal, when
+ native functionality is not supported.
+ (syms_of_fileio): Declare it unconditionally.
+
2008-04-10 Jason Rumney <[email protected]>
* w32menu.c (is_simple_dialog, simple_dialog_show): New functions.
diff --git a/src/fileio.c b/src/fileio.c
index 6433fe9323..f9f37404b1 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2878,7 +2878,6 @@ This is what happens in interactive use with M-x. */)
return Qnil;
}
-#ifdef S_IFLNK
DEFUN ("make-symbolic-link", Fmake_symbolic_link, Smake_symbolic_link, 2, 3,
"FMake symbolic link to file: \nGMake symbolic link to file %s: \np",
doc: /* Make a symbolic link to FILENAME, named LINKNAME.
@@ -2923,6 +2922,7 @@ This happens for interactive use with M-x. */)
RETURN_UNGCPRO (call4 (handler, Qmake_symbolic_link, filename,
linkname, ok_if_already_exists));
+#ifdef S_IFLNK
encoded_filename = ENCODE_FILE (filename);
encoded_linkname = ENCODE_FILE (linkname);
@@ -2949,8 +2949,13 @@ This happens for interactive use with M-x. */)
}
UNGCPRO;
return Qnil;
-}
+
+#else
+ UNGCPRO;
+ xsignal1 (Qfile_error, build_string ("Symbolic links are not supported"));
+
#endif /* S_IFLNK */
+}
#ifdef VMS
@@ -6637,9 +6642,7 @@ A non-nil value may result in data loss! */);
defsubr (&Sdelete_file);
defsubr (&Srename_file);
defsubr (&Sadd_name_to_file);
-#ifdef S_IFLNK
defsubr (&Smake_symbolic_link);
-#endif /* S_IFLNK */
#ifdef VMS
defsubr (&Sdefine_logical_name);
#endif /* VMS */