procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename 'make-symbolic-link' argument NEWNAME to LINKNAME

Browse source 
* src/fileio.c (Fmake_symbolic_link): Fix docstring.
* doc/lispref/files.texi (Changing Files): Doc fix.
This commit is contained in:
Juanma Barranquero 2019-06-21 21:41:47 +02:00
parent 04477adedc
commit 572e34bb6f
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/lispref/files.texi
View file

@ -1759,12 +1759,12 @@ default file permissions (see @code{set-default-file-modes} below), if
SELinux context are not copied over in either case. SELinux context are not copied over in either case.
@end deffn @end deffn
@deffn Command make-symbolic-link target newname &optional ok-if-already-exists @deffn Command make-symbolic-link target linkname &optional ok-if-already-exists
@pindex ln @pindex ln
@kindex file-already-exists @kindex file-already-exists
This command makes a symbolic link to @var{target}, named This command makes a symbolic link to @var{target}, named
@var{newname}. This is like the shell command @samp{ln -s @var{linkname}. This is like the shell command @samp{ln -s
@var{target} @var{newname}}. The @var{target} argument @var{target} @var{linkname}}. The @var{target} argument
is treated only as a string; it need not name an existing file. is treated only as a string; it need not name an existing file.
If @var{ok-if-already-exists} is an integer, indicating interactive If @var{ok-if-already-exists} is an integer, indicating interactive
use, then leading @samp{~} is expanded and leading @samp{/:} is use, then leading @samp{~} is expanded and leading @samp{/:} is
@ -1774,7 +1774,7 @@ If @var{target} is a relative file name, the resulting symbolic link
is interpreted relative to the directory containing the symbolic link. is interpreted relative to the directory containing the symbolic link.
@xref{Relative File Names}. @xref{Relative File Names}.
If both @var{target} and @var{newname} have remote file name syntax, If both @var{target} and @var{linkname} have remote file name syntax,
and if both remote identifications are equal, the symbolic link points and if both remote identifications are equal, the symbolic link points
to the local file name part of @var{target}. to the local file name part of @var{target}.

10
src/fileio.c
View file

@ -2474,13 +2474,13 @@ This is what happens in interactive use with M-x. */)
DEFUN ("make-symbolic-link", Fmake_symbolic_link, Smake_symbolic_link, 2, 3, DEFUN ("make-symbolic-link", Fmake_symbolic_link, Smake_symbolic_link, 2, 3,
"FMake symbolic link to file: \nGMake symbolic link to file %s: \np", "FMake symbolic link to file: \nGMake symbolic link to file %s: \np",
doc: /* Make a symbolic link to TARGET, named NEWNAME. doc: /* Make a symbolic link to TARGET, named LINKNAME.
If NEWNAME is a directory name, make a like-named symbolic link under If LINKNAME is a directory name, make a like-named symbolic link under
NEWNAME. LINKNAME.
Signal a `file-already-exists' error if a file NEWNAME already exists Signal a `file-already-exists' error if a file LINKNAME already exists
unless optional third argument OK-IF-ALREADY-EXISTS is non-nil. unless optional third argument OK-IF-ALREADY-EXISTS is non-nil.
An integer third arg means request confirmation if NEWNAME already An integer third arg means request confirmation if LINKNAME already
exists, and expand leading "~" or strip leading "/:" in TARGET. exists, and expand leading "~" or strip leading "/:" in TARGET.
This happens for interactive use with M-x. */) This happens for interactive use with M-x. */)
(Lisp_Object target, Lisp_Object linkname, Lisp_Object ok_if_already_exists) (Lisp_Object target, Lisp_Object linkname, Lisp_Object ok_if_already_exists)