Commit a5a44b91 authored by Jim Blandy's avatar Jim Blandy
Browse files

* fileio.c (Frename_file): Pass all arguments to the file name handler.

	* eval.c (call4): New function.
parent 5ac622b2
......@@ -1803,6 +1803,30 @@ call3 (fn, arg, arg1, arg2)
#endif /* not NO_ARG_ARRAY */
}
/* Call function fn with arguments arg, arg1, arg2, arg3 */
/* ARGSUSED */
Lisp_Object
call4 (fn, arg, arg1, arg2, arg3)
Lisp_Object fn, arg, arg1, arg2, arg3;
{
struct gcpro gcpro1;
#ifdef NO_ARG_ARRAY
Lisp_Object args[5];
args[0] = fn;
args[1] = arg;
args[2] = arg1;
args[3] = arg2;
args[4] = arg3;
GCPRO1 (args[0]);
gcpro1.nvars = 5;
RETURN_UNGCPRO (Ffuncall (5, args));
#else /* not NO_ARG_ARRAY */
GCPRO1 (fn);
gcpro1.nvars = 5;
RETURN_UNGCPRO (Ffuncall (5, &fn));
#endif /* not NO_ARG_ARRAY */
}
DEFUN ("funcall", Ffuncall, Sfuncall, 1, MANY, 0,
"Call first argument as a function, passing remaining arguments to it.\n\
Thus, (funcall 'cons 'x 'y) returns (x . y).")
......
......@@ -1748,7 +1748,8 @@ This is what happens in interactive use with M-x.")
call the corresponding file handler. */
handler = Ffind_file_name_handler (filename);
if (!NILP (handler))
return call3 (handler, Qrename_file, filename, newname);
return call4 (handler, Qrename_file,
filename, newname, ok_if_already_exists);
if (NILP (ok_if_already_exists)
|| XTYPE (ok_if_already_exists) == Lisp_Int)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment