master bbd7059da4 2/2: Rename file-name-directory

[Lars Ingebrigtsen]

branch: master
commit bbd7059da4555586ecedd091cf8a223086bd6201
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    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).
---
 doc/lispref/files.texi      |  2 +-
 etc/NEWS                    |  2 +-
 lisp/emacs-lisp/shortdoc.el | 10 +++++-----
 lisp/files.el               |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 986fb22c75..e1aa2de523 100644
--- 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 0d69e87907..ff97c2350f 100644
--- 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 fe4f2ae3ac..d07d1019b4 100644
--- 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 7fde8720fa..1e1ec6127d 100644
--- 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