diff options
| author | Juanma Barranquero | 2019-06-21 21:41:47 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2019-06-21 21:42:36 +0200 |
| commit | 572e34bb6fcbbbde2325b679fef64ee26e78ce8a (patch) | |
| tree | 9c3009a84eb028a9d4a015ad26f8686bd8ff98c0 | |
| parent | 04477adedcee0d023dabc46a652f1673a2e9bd95 (diff) | |
| download | emacs-572e34bb6fcbbbde2325b679fef64ee26e78ce8a.tar.gz emacs-572e34bb6fcbbbde2325b679fef64ee26e78ce8a.zip | |
Rename 'make-symbolic-link' argument NEWNAME to LINKNAME
* src/fileio.c (Fmake_symbolic_link): Fix docstring.
* doc/lispref/files.texi (Changing Files): Doc fix.
| -rw-r--r-- | doc/lispref/files.texi | 8 | ||||
| -rw-r--r-- | src/fileio.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 380e0543ddd..ebe2fdd6a0c 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi | |||
| @@ -1759,12 +1759,12 @@ default file permissions (see @code{set-default-file-modes} below), if | |||
| 1759 | SELinux context are not copied over in either case. | 1759 | SELinux context are not copied over in either case. |
| 1760 | @end deffn | 1760 | @end deffn |
| 1761 | 1761 | ||
| 1762 | @deffn Command make-symbolic-link target newname &optional ok-if-already-exists | 1762 | @deffn Command make-symbolic-link target linkname &optional ok-if-already-exists |
| 1763 | @pindex ln | 1763 | @pindex ln |
| 1764 | @kindex file-already-exists | 1764 | @kindex file-already-exists |
| 1765 | This command makes a symbolic link to @var{target}, named | 1765 | This command makes a symbolic link to @var{target}, named |
| 1766 | @var{newname}. This is like the shell command @samp{ln -s | 1766 | @var{linkname}. This is like the shell command @samp{ln -s |
| 1767 | @var{target} @var{newname}}. The @var{target} argument | 1767 | @var{target} @var{linkname}}. The @var{target} argument |
| 1768 | is treated only as a string; it need not name an existing file. | 1768 | is treated only as a string; it need not name an existing file. |
| 1769 | If @var{ok-if-already-exists} is an integer, indicating interactive | 1769 | If @var{ok-if-already-exists} is an integer, indicating interactive |
| 1770 | use, then leading @samp{~} is expanded and leading @samp{/:} is | 1770 | 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 | |||
| 1774 | is interpreted relative to the directory containing the symbolic link. | 1774 | is interpreted relative to the directory containing the symbolic link. |
| 1775 | @xref{Relative File Names}. | 1775 | @xref{Relative File Names}. |
| 1776 | 1776 | ||
| 1777 | If both @var{target} and @var{newname} have remote file name syntax, | 1777 | If both @var{target} and @var{linkname} have remote file name syntax, |
| 1778 | and if both remote identifications are equal, the symbolic link points | 1778 | and if both remote identifications are equal, the symbolic link points |
| 1779 | to the local file name part of @var{target}. | 1779 | to the local file name part of @var{target}. |
| 1780 | 1780 | ||
diff --git a/src/fileio.c b/src/fileio.c index ba7caddc978..47619c0b7cd 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -2474,13 +2474,13 @@ This is what happens in interactive use with M-x. */) | |||
| 2474 | 2474 | ||
| 2475 | DEFUN ("make-symbolic-link", Fmake_symbolic_link, Smake_symbolic_link, 2, 3, | 2475 | DEFUN ("make-symbolic-link", Fmake_symbolic_link, Smake_symbolic_link, 2, 3, |
| 2476 | "FMake symbolic link to file: \nGMake symbolic link to file %s: \np", | 2476 | "FMake symbolic link to file: \nGMake symbolic link to file %s: \np", |
| 2477 | doc: /* Make a symbolic link to TARGET, named NEWNAME. | 2477 | doc: /* Make a symbolic link to TARGET, named LINKNAME. |
| 2478 | If NEWNAME is a directory name, make a like-named symbolic link under | 2478 | If LINKNAME is a directory name, make a like-named symbolic link under |
| 2479 | NEWNAME. | 2479 | LINKNAME. |
| 2480 | 2480 | ||
| 2481 | Signal a `file-already-exists' error if a file NEWNAME already exists | 2481 | Signal a `file-already-exists' error if a file LINKNAME already exists |
| 2482 | unless optional third argument OK-IF-ALREADY-EXISTS is non-nil. | 2482 | unless optional third argument OK-IF-ALREADY-EXISTS is non-nil. |
| 2483 | An integer third arg means request confirmation if NEWNAME already | 2483 | An integer third arg means request confirmation if LINKNAME already |
| 2484 | exists, and expand leading "~" or strip leading "/:" in TARGET. | 2484 | exists, and expand leading "~" or strip leading "/:" in TARGET. |
| 2485 | This happens for interactive use with M-x. */) | 2485 | This happens for interactive use with M-x. */) |
| 2486 | (Lisp_Object target, Lisp_Object linkname, Lisp_Object ok_if_already_exists) | 2486 | (Lisp_Object target, Lisp_Object linkname, Lisp_Object ok_if_already_exists) |