From f04f8126f016b43c45d432bf353ba2a0ac8f7d96 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sun, 25 Jul 2021 08:54:20 +0200 Subject: 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'. --- lisp/emacs-lisp/shortdoc.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lisp/emacs-lisp') 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///") -- cgit v1.2.3