Rename file-name-directory

* lisp/emacs-lisp/shortdoc.el (file-name):
* doc/lispref/files.texi (Directory Names): Adjust.
* lisp/files.el (file-name-parent-directory): Rename from
`file-name-directory' (bug#58039).

diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 986fb22c75b24f0ecfc81f8ba4afaff1807aef98..e1aa2de523c418628793183da64d5c73e78344a8 100644 (file)
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -2445,7 +2445,7 @@ You can use this function for directory names and for file names,
 because it recognizes abbreviations even as part of the name.
 @end defun
 
-@defun file-parent-directory filename
+@defun file-name-parent-directory filename
 This function returns the directory name of the parent directory of
 @var{filename}.  If @var{filename} is at the root directory of the
 filesystem, it returns @code{nil}.  A relative @var{filename} is

diff --git a/etc/NEWS b/etc/NEWS
index 0d69e87907e078344a29f08f5cf39cab13ac3d9c..ff97c2350f2afc00e6fe5d2baee1bb9c43e5a4ba 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -482,7 +482,7 @@ user option 'global-text-scale-adjust-resizes-frames' controls whether
 the frames are resized when the font size is changed.
 
 +++
-** New function 'file-parent-directory'.
+** New function 'file-name-parent-directory'.
 Get the parent directory of a file.
 
 ** New config variable 'syntax-wholeline-max' to reduce the cost of long lines.

diff --git a/lisp/emacs-lisp/shortdoc.el b/lisp/emacs-lisp/shortdoc.el
index fe4f2ae3acf9eab24c629b7bb528f7a0903482ea..d07d1019b4d48c3837013d80b0555ca330349ece 100644 (file)
--- a/lisp/emacs-lisp/shortdoc.el
+++ b/lisp/emacs-lisp/shortdoc.el
@@ -355,11 +355,11 @@ A FUNC form can have any number of `:no-eval' (or `:no-value'),
   (abbreviate-file-name
    :no-eval (abbreviate-file-name "/home/some-user")
    :eg-result "~some-user")
-  (file-parent-directory
-   :eval (file-parent-directory "/foo/bar")
-   :eval (file-parent-directory "/foo/")
-   :eval (file-parent-directory "foo/bar")
-   :eval (file-parent-directory "foo"))
+  (file-name-parent-directory
+   :eval (file-name-parent-directory "/foo/bar")
+   :eval (file-name-parent-directory "/foo/")
+   :eval (file-name-parent-directory "foo/bar")
+   :eval (file-name-parent-directory "foo"))
   "Quoted File Names"
   (file-name-quote
    :args (name)

diff --git a/lisp/files.el b/lisp/files.el
index 7fde8720fa70291af00a428f445cf24f53ae7bc9..1e1ec6127de08254c347906b264303cba431d27a 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5173,7 +5173,7 @@ On most systems, this will be true:
           (setq filename nil))))
     components))
 
-(defun file-parent-directory (filename)
+(defun file-name-parent-directory (filename)
   "Return the directory name of the parent directory of FILENAME.
 If FILENAME is at the root of the filesystem, return nil.
 If FILENAME is relative, it is interpreted to be relative