master 698776764d8: Adjust 'log-edit-insert-changelog-entry' to recent 'vc-dir' change
Stephen Berman via Mailing list for Emacs changes <[email protected]> Fri, 31 Jul 2026 06:05:06 -0400 (EDT)
| Newsgroups | gmane.emacs.diffs |
|---|---|
| Message-ID | <[email protected]> |
branch: master commit 698776764d8489dccdbb1b72285ce835379c3974 Author: Stephen Berman <[email protected]> Commit: Stephen Berman <[email protected]> Adjust 'log-edit-insert-changelog-entry' to recent 'vc-dir' change * lisp/vc/log-edit.el (log-edit-insert-changelog-entry): Since commit 0a714557ebd 'vc-dir' does not always resolve the working directory to its truename, but 'vc-dir-deduce-fileset' does expand file names, so do that also when generating the list of changed files according to the ChangeLog entry in order to prevent a spurious failure on comparing the two lists of files. --- lisp/vc/log-edit.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el index b7b9c32ad99..1933b637998 100644 --- a/lisp/vc/log-edit.el +++ b/lisp/vc/log-edit.el @@ -1420,7 +1420,8 @@ changes." (string-match "\\`\\*changes to \\(.+\\)\\*\\'" bn) (match-string 1 bn))))) (while (re-search-forward "\t\\* \\([^ :\n]+\\)[ :\n]" nil t) - (let ((fn (concat fnd (match-string-no-properties 1)))) + (let ((fn (expand-file-name + (concat fnd (match-string-no-properties 1))))) (when (file-exists-p fn) (push fn files-in-changelog)))))))) (log-edit-changelog-insert-entries buffer beg end)