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 /src/fileio.c | |
| 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 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/fileio.c b/src/fileio.c index 5dd14daacb4..0da9894a73a 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2599,13 +2599,13 @@ This is what happens in interactive use with M-x. */) 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 TARGET, named NEWNAME. -If NEWNAME is a directory name, make a like-named symbolic link under -NEWNAME. + doc: /* Make a symbolic link to TARGET, named LINKNAME. +If LINKNAME is a directory name, make a like-named symbolic link under +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. -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. This happens for interactive use with M-x. */) (Lisp_Object target, Lisp_Object linkname, Lisp_Object ok_if_already_exists) |