diff options
| author | Lars Ingebrigtsen | 2021-07-25 08:54:20 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2021-07-25 08:54:20 +0200 |
| commit | f04f8126f016b43c45d432bf353ba2a0ac8f7d96 (patch) | |
| tree | 796343397718cd3e340637d505eb2fb6e1dce1d0 /src | |
| parent | aa9cba658768aba4da1b74ffb33d9962ffff5756 (diff) | |
| download | emacs-f04f8126f016b43c45d432bf353ba2a0ac8f7d96.tar.gz emacs-f04f8126f016b43c45d432bf353ba2a0ac8f7d96.zip | |
Rename directory-append to file-name-concat
* src/fileio.c (Ffile_name_concat):
* lisp/files.el (move-file-to-trash):
* lisp/emacs-lisp/shortdoc.el (file-name):
* doc/lispref/files.texi (Directory Names): Rename
`directory-append' to `file-name-concat'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fileio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c index 3d8b082a59c..13c99bee109 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -749,7 +749,7 @@ For that reason, you should normally use `make-temp-file' instead. */) | |||
| 749 | empty_unibyte_string, Qnil); | 749 | empty_unibyte_string, Qnil); |
| 750 | } | 750 | } |
| 751 | 751 | ||
| 752 | DEFUN ("directory-append", Fdirectory_append, Sdirectory_append, 1, MANY, 0, | 752 | DEFUN ("file-name-concat", Ffile_name_concat, Sfile_name_concat, 1, MANY, 0, |
| 753 | doc: /* Append COMPONENTS to DIRECTORY and return the resulting string. | 753 | doc: /* Append COMPONENTS to DIRECTORY and return the resulting string. |
| 754 | Elements in COMPONENTS must be a string or nil. | 754 | Elements in COMPONENTS must be a string or nil. |
| 755 | DIRECTORY or the non-final elements in COMPONENTS may or may not end | 755 | DIRECTORY or the non-final elements in COMPONENTS may or may not end |
| @@ -6596,7 +6596,7 @@ This includes interactive calls to `delete-file' and | |||
| 6596 | defsubr (&Sdirectory_file_name); | 6596 | defsubr (&Sdirectory_file_name); |
| 6597 | defsubr (&Smake_temp_file_internal); | 6597 | defsubr (&Smake_temp_file_internal); |
| 6598 | defsubr (&Smake_temp_name); | 6598 | defsubr (&Smake_temp_name); |
| 6599 | defsubr (&Sdirectory_append); | 6599 | defsubr (&Sfile_name_concat); |
| 6600 | defsubr (&Sexpand_file_name); | 6600 | defsubr (&Sexpand_file_name); |
| 6601 | defsubr (&Ssubstitute_in_file_name); | 6601 | defsubr (&Ssubstitute_in_file_name); |
| 6602 | defsubr (&Scopy_file); | 6602 | defsubr (&Scopy_file); |