summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2021-07-25 08:54:20 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2021-07-25 08:54:20 +0200
commitf04f8126f016b43c45d432bf353ba2a0ac8f7d96 (patch)
tree796343397718cd3e340637d505eb2fb6e1dce1d0 /lisp/emacs-lisp
parentaa9cba658768aba4da1b74ffb33d9962ffff5756 (diff)
downloademacs-f04f8126f016b43c45d432bf353ba2a0ac8f7d96.tar.gz
emacs-f04f8126f016b43c45d432bf353ba2a0ac8f7d96.tar.bz2
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 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/shortdoc.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/shortdoc.el b/lisp/emacs-lisp/shortdoc.el
index c507ad7c812..a74a5a4225c 100644
--- a/lisp/emacs-lisp/shortdoc.el
+++ b/lisp/emacs-lisp/shortdoc.el
@@ -273,11 +273,11 @@ There can be any number of :example/:result elements."
:eval (file-relative-name "/tmp/foo" "/tmp"))
(make-temp-name
:eval (make-temp-name "/tmp/foo-"))
- (directory-append
- :eval (directory-append "/tmp/" "foo")
- :eval (directory-append "/tmp" "foo")
- :eval (directory-append "/tmp" "foo" "bar/" "zot")
- :eval (directory-append "/tmp" "~"))
+ (file-name-concat
+ :eval (file-name-concat "/tmp/" "foo")
+ :eval (file-name-concat "/tmp" "foo")
+ :eval (file-name-concat "/tmp" "foo" "bar/" "zot")
+ :eval (file-name-concat "/tmp" "~"))
(expand-file-name
:eval (expand-file-name "foo" "/tmp/")
:eval (expand-file-name "foo" "/tmp///")