From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 30 Aug 2022 16:09:00 +0000 (+0300)
Subject: One more fix for find-file.el
X-Git-Tag: emacs-28.2~17
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bbc23ca8ab42d7a45bcbadd5ffd911868eb6f99d;p=emacs.git

One more fix for find-file.el

* lisp/find-file.el (ff-get-file-name): Use 'expand-file-name'
instead of 'concat', which doesn't DTRT with absolute file names.
(ff-other-file-alist): Yet another doc fix.  (Bug#57325)
---

diff --git a/lisp/find-file.el b/lisp/find-file.el
index aaabec11e83..646779fc919 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -216,9 +216,9 @@ matching extension or name (e.g., `.cc' yields `.hh').
 This alist should be set by the major mode.
 
 Note: if an element of the alist names a FUNCTION as its cdr, that
-function must return a non-nil list of file-name extensions.  It cannot
+function must return a non-nil list of file-names.  It cannot
 return nil, nor can it signal in any way a failure to find a suitable
-list of extensions."
+list of file names."
   :type '(choice (repeat (list regexp (choice (repeat string) function)))
 		 symbol))
 
@@ -629,7 +629,7 @@ name of the first file found."
             (while (and suffixes (not found))
 
               (setq filename (concat fname-stub this-suffix))
-              (setq file (concat dir "/" filename))
+              (setq file (expand-file-name filename dir))
 
               (if (not ff-quiet-mode)
                   (message "Finding %s..." file))