From 95d56b92a6b9916e2923f8c45a93d312604f5c66 Mon Sep 17 00:00:00 2001 From: dalanicolai Date: Sat, 21 Oct 2023 17:39:17 +0200 Subject: [PATCH] Fix 'locate-dominating-file' when FILE is not a directory. * lisp/files.el (locate-dominating-file): Handle FILE that is not a directory. (Bug#66542) --- lisp/files.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lisp/files.el b/lisp/files.el index 1be5b374ae8..3d838cd3b8c 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1135,9 +1135,11 @@ the function needs to examine, starting with FILE." (while (not (or root (null file) (string-match locate-dominating-stop-dir-regexp file))) - (setq try (if (stringp name) - (and (file-directory-p file) - (file-exists-p (expand-file-name name file))) + (setq file (if (file-directory-p file) + file + (file-name-directory file)) + try (if (stringp name) + (file-exists-p (expand-file-name name file)) (funcall name file))) (cond (try (setq root file)) ((equal file (setq file (file-name-directory -- 2.39.2