procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(project-try-vc): Add string-start and string-end anchors to marker-re

Browse source 
* lisp/progmodes/project.el (project-try-vc):
Add string-start and string-end anchors to marker-re (bug#60956).
This commit is contained in:
Dmitry Gutov 2023-01-20 18:43:56 +02:00
parent 06953fc8e1
commit 67ee627c38
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/progmodes/project.el
View file

@ -1,7 +1,7 @@
;;; project.el --- Operations on the current project -*- lexical-binding: t; -*- ;;; project.el --- Operations on the current project -*- lexical-binding: t; -*-
;; Copyright (C) 2015-2023 Free Software Foundation, Inc. ;; Copyright (C) 2015-2023 Free Software Foundation, Inc.
;; Version: 0.9.4 ;; Version: 0.9.5
;; Package-Requires: ((emacs "26.1") (xref "1.4.0")) ;; Package-Requires: ((emacs "26.1") (xref "1.4.0"))
;; This is a GNU ELPA :core package. Avoid using functionality that ;; This is a GNU ELPA :core package. Avoid using functionality that
@ -514,11 +514,14 @@ project backend implementation of `project-external-roots'.")
(lambda (b) (assoc-default b backend-markers-alist)) (lambda (b) (assoc-default b backend-markers-alist))
vc-handled-backends))) vc-handled-backends)))
(marker-re (marker-re
(mapconcat (concat
(lambda (m) (format "\\(%s\\)" (wildcard-to-regexp m))) "\\`"
(append backend-markers (mapconcat
(project--value-in-dir 'project-vc-extra-root-markers dir)) (lambda (m) (format "\\(%s\\)" (wildcard-to-regexp m)))
"\\|")) (append backend-markers
(project--value-in-dir 'project-vc-extra-root-markers dir))
"\\|")
"\\'"))
(locate-dominating-stop-dir-regexp (locate-dominating-stop-dir-regexp
(or vc-ignore-dir-regexp locate-dominating-stop-dir-regexp)) (or vc-ignore-dir-regexp locate-dominating-stop-dir-regexp))
last-matches last-matches