diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2019-06-25 22:04:13 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2019-06-25 22:04:13 -0400 |
| commit | 9552ee4df7d2ceebb8728a61d00598aa981b580c (patch) | |
| tree | 5bd393a52f3f1b0510ff77fb2bd38e4a2c00ad8c /doc/lispref/files.texi | |
| parent | c7a59d87b5726725cffa51a1f432f0961548dbe3 (diff) | |
| parent | e62ad04963982ea9cc7622b32484778845bc2ec1 (diff) | |
| download | emacs-9552ee4df7d2ceebb8728a61d00598aa981b580c.tar.gz emacs-9552ee4df7d2ceebb8728a61d00598aa981b580c.tar.bz2 emacs-9552ee4df7d2ceebb8728a61d00598aa981b580c.zip | |
Merge from emacs-26
e62ad04963 Fix sgml-mode handling of quotes within parens (Bug#36347)
06b35b2f92 ; * lisp/frame.el: Enhance add-variable-watcher commentary.
572e34bb6f Rename 'make-symbolic-link' argument NEWNAME to LINKNAME
04477adedc Check that length of data returned by sysctl is non-zero
81535eeadb * test/lisp/progmodes/python-tests.el (python-virt-bin): D...
9d48979ca8 Fix Python tests depending on system-type
fcf6cc3177 Fix problem with wdired test when symlinks cannot be created.
4701e0663e Improve wording of documentation of click events
# Conflicts:
# lisp/textmodes/sgml-mode.el
# test/lisp/textmodes/sgml-mode-tests.el
Diffstat (limited to 'doc/lispref/files.texi')
| -rw-r--r-- | doc/lispref/files.texi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index af16b1cf4bc..66678d33915 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -1752,12 +1752,12 @@ default file permissions (see @code{set-default-file-modes} below), if SELinux context are not copied over in either case. @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 @kindex file-already-exists This command makes a symbolic link to @var{target}, named -@var{newname}. This is like the shell command @samp{ln -s -@var{target} @var{newname}}. The @var{target} argument +@var{linkname}. This is like the shell command @samp{ln -s +@var{target} @var{linkname}}. The @var{target} argument is treated only as a string; it need not name an existing file. If @var{ok-if-already-exists} is an integer, indicating interactive use, then leading @samp{~} is expanded and leading @samp{/:} is @@ -1767,7 +1767,7 @@ If @var{target} is a relative file name, the resulting symbolic link is interpreted relative to the directory containing the symbolic link. @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 to the local file name part of @var{target}. |