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'.

1 files changed, 17 insertions, 17 deletions

diff --git a/test/src/fileio-tests.el b/test/src/fileio-tests.el
index b1288f943e3..f4d123b4261 100644
--- a/test/src/fileio-tests.el
+++ b/test/src/fileio-tests.el
@@ -160,26 +160,26 @@ Also check that an encoding error can appear in a symlink."
   (should-error (file-exists-p "/foo\0bar")
                 :type 'wrong-type-argument))
 
-(ert-deftest fileio-tests/directory-append ()
-  (should (equal (directory-append "foo" "bar") "foo/bar"))
-  (should (equal (directory-append "foo" "bar") "foo/bar"))
-  (should (equal (directory-append "foo" "bar" "zot") "foo/bar/zot"))
-  (should (equal (directory-append "foo/" "bar") "foo/bar"))
-  (should (equal (directory-append "foo//" "bar") "foo//bar"))
-  (should (equal (directory-append "foo/" "bar/" "zot") "foo/bar/zot"))
-  (should (equal (directory-append "fóo" "bar") "fóo/bar"))
-  (should (equal (directory-append "foo" "bár") "foo/bár"))
-  (should (equal (directory-append "fóo" "bár") "fóo/bár"))
+(ert-deftest fileio-tests/file-name-concat ()
+  (should (equal (file-name-concat "foo" "bar") "foo/bar"))
+  (should (equal (file-name-concat "foo" "bar") "foo/bar"))
+  (should (equal (file-name-concat "foo" "bar" "zot") "foo/bar/zot"))
+  (should (equal (file-name-concat "foo/" "bar") "foo/bar"))
+  (should (equal (file-name-concat "foo//" "bar") "foo//bar"))
+  (should (equal (file-name-concat "foo/" "bar/" "zot") "foo/bar/zot"))
+  (should (equal (file-name-concat "fóo" "bar") "fóo/bar"))
+  (should (equal (file-name-concat "foo" "bár") "foo/bár"))
+  (should (equal (file-name-concat "fóo" "bár") "fóo/bár"))
   (let ((string (make-string 5 ?a)))
     (should (not (multibyte-string-p string)))
     (aset string 2 255)
     (should (not (multibyte-string-p string)))
-    (should (equal (directory-append "fóo" string) "fóo/aa\377aa")))
-  (should (equal (directory-append "foo") "foo"))
-  (should (equal (directory-append "foo/") "foo/"))
-  (should (equal (directory-append "foo" "") "foo"))
-  (should (equal (directory-append "foo" "" "" "" nil) "foo"))
-  (should (equal (directory-append "" "bar") "bar"))
-  (should (equal (directory-append "" "") "")))
+    (should (equal (file-name-concat "fóo" string) "fóo/aa\377aa")))
+  (should (equal (file-name-concat "foo") "foo"))
+  (should (equal (file-name-concat "foo/") "foo/"))
+  (should (equal (file-name-concat "foo" "") "foo"))
+  (should (equal (file-name-concat "foo" "" "" "" nil) "foo"))
+  (should (equal (file-name-concat "" "bar") "bar"))
+  (should (equal (file-name-concat "" "") "")))
 
 ;;; fileio-tests.el ends here