Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 01:34:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Provide a list of default values for M-n of project-find-file (bug#70996)

Browse source 
* lisp/progmodes/project.el (project-find-file)
(project-or-external-find-file): Provide a list of suggested
filenames for the first arg of project-find-file-in.
Use buffer-file-name first to make it more predictable for M-n.
(project--read-file-cpd-relative): Handle mb-default as a list.
This commit is contained in:
Juri Linkov 2024-05-28 19:31:55 +03:00
parent d9512da495
commit ebac4d4872
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lisp/progmodes/project.el
View file

@ -1080,8 +1080,9 @@ for VCS directories listed in `vc-directory-exclusion-list'."
(dirs (list root))
(project-files-relative-names t))
(project-find-file-in
(or (thing-at-point 'filename)
(and buffer-file-name (project--find-default-from buffer-file-name pr)))
(delq nil (list (and buffer-file-name (project--find-default-from
buffer-file-name pr))
(thing-at-point 'filename)))
dirs pr include-all)))
;;;###autoload
@ -1103,8 +1104,9 @@ for VCS directories listed in `vc-directory-exclusion-list'."
(project-external-roots pr)))
(project-file-history-behavior t))
(project-find-file-in
(or (thing-at-point 'filename)
(and buffer-file-name (project--find-default-from buffer-file-name pr)))
(delq nil (list (and buffer-file-name (project--find-default-from
buffer-file-name pr))
(thing-at-point 'filename)))
dirs pr include-all)))
(defcustom project-read-file-name-function #'project--read-file-cpd-relative
@ -1166,11 +1168,14 @@ by the user at will."
(setq all-files
(delete common-parent-directory all-files))
t))
(mb-default (if (and common-parent-directory
mb-default
(file-name-absolute-p mb-default))
(file-relative-name mb-default common-parent-directory)
mb-default))
(mb-default (mapcar (lambda (mb-default)
(if (and common-parent-directory
mb-default
(file-name-absolute-p mb-default))
(file-relative-name
mb-default common-parent-directory)
mb-default))
(if (listp mb-default) mb-default (list mb-default))))
(substrings (mapcar (lambda (s) (substring s cpd-length)) all-files))
(_ (when included-cpd
(setq substrings (cons "./" substrings))))