branch: externals/compat commit 177deb51ef38b8facdbec26ef1fdecd8160514ea Author: Daniel Mendler <m...@daniel-mendler.de> Commit: Daniel Mendler <m...@daniel-mendler.de>
Get rid of compat--internal-directory-name-p --- compat-25.el | 3 +-- compat-28.el | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/compat-25.el b/compat-25.el index 5398d59e4a..92d3e8ec3b 100644 --- a/compat-25.el +++ b/compat-25.el @@ -79,7 +79,6 @@ This implementation is equivalent to `format'." (compat-defun directory-name-p (name) "Return non-nil if NAME ends with a directory separator character." - :realname compat--internal-directory-name-p (eq (eval-when-compile (if (memq system-type '(cygwin windows-nt ms-dos)) ?\\ ?/)) @@ -306,7 +305,7 @@ recursion." (dolist (file (sort (file-name-all-completions "" dir) 'string<)) (unless (member file '("./" "../")) - (if (compat--internal-directory-name-p file) + (if (directory-name-p file) (let* ((leaf (substring file 0 (1- (length file)))) (full-file (concat dir "/" leaf))) ;; Don't follow symlinks to other directories. diff --git a/compat-28.el b/compat-28.el index 47febbec4b..7a66d6c5d8 100644 --- a/compat-28.el +++ b/compat-28.el @@ -623,7 +623,7 @@ See also `file-name-sans-extension'." (error "Empty filename")) ((string= extn "") (error "Malformed extension: %s" extension)) - ((compat--internal-directory-name-p filename) + ((directory-name-p filename) (error "Filename is a directory: %s" filename)) (t (concat (file-name-sans-extension filename) "." extn)))))