]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d92aa6b) | patch
Fix unwanted revert file prompt after repeated vc-ediff (bug#11605)
authorSean Whitton <spwhitton@spwhitton.name>
Tue, 4 Mar 2025 03:58:15 +0000 (11:58 +0800)
committerEshel Yaron <me@eshelyaron.com>
Tue, 4 Mar 2025 21:05:28 +0000 (22:05 +0100)
commit5e618ad512a7bc3d77448947b770e6aff9b90cb4
treecb836900260c9f5db471d90181fcc74c3cabf831tree | snapshot
parentd92aa6bc9aaa4a65d54d92c641aeb5158923bae6commit | diff
Fix unwanted revert file prompt after repeated vc-ediff (bug#11605)

* lisp/vc/ediff-vers.el (vc-find-revision-no-save): Declare.
(ediff-vc-internal, ediff-vc-merge-internal): Bind
vc-find-revision-no-save instead of calling
ediff-delete-version-file (bug#11605).
(ediff-delete-version-file): Delete.

(cherry picked from commit a38ed1618d7c6293e38ffdc76fb2c16f8ef33874)
lisp/vc/ediff-vers.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.