From: Dmitry Gutov <dmitry@gutov.dev>
Date: Wed, 20 Dec 2023 15:34:12 +0000 (+0200)
Subject: project--read-file-cpd-relative: Don't abbreviate at all
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d518b78d785613967fb1b375aa7932385991891;p=emacs.git

project--read-file-cpd-relative: Don't abbreviate at all

* lisp/progmodes/project.el (project--read-file-cpd-relative):
Don't abbreviate at all, only suffixes are shown anyway.
And expand-file-name is slightly faster.
---

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index f7e307515de..0082f12666a 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -1145,15 +1145,15 @@ by the user at will."
          (_ (when included-cpd
               (setq substrings (cons "./" substrings))))
          (new-collection (project--file-completion-table substrings))
-         (abbr-cpd (abbreviate-file-name common-parent-directory))
-         (abbr-cpd-length (length abbr-cpd))
+         (abs-cpd (expand-file-name common-parent-directory))
+         (abs-cpd-length (length abs-cpd))
          (relname (cl-letf (((symbol-value hist)
                              (mapcan
                               (lambda (s)
-                                (setq s (abbreviate-file-name s))
-                                (and (string-prefix-p abbr-cpd s)
-                                     (not (eq abbr-cpd-length (length s)))
-                                     (list (substring s abbr-cpd-length))))
+                                (setq s (expand-file-name s))
+                                (and (string-prefix-p abs-cpd s)
+                                     (not (eq abs-cpd-length (length s)))
+                                     (list (substring s abs-cpd-length))))
                               (symbol-value hist))))
                     (project--completing-read-strict prompt
                                                      new-collection