]> git.eshelyaron.com Git - emacs.git/commit
Fix emerge.el for remote files
authorMichael Albinus <michael.albinus@gmx.de>
Sun, 20 Apr 2025 16:16:14 +0000 (18:16 +0200)
committerEshel Yaron <me@eshelyaron.com>
Mon, 21 Apr 2025 20:42:08 +0000 (22:42 +0200)
commit332ef34a7fc77f0e367b5c52e77f2e44607cc6df
tree3e031471b2decd8440f7dfc423bc6b31f94417f7
parent12c02edd3eb11b35fa74d3dd4516da2150399a25
Fix emerge.el for remote files

* lisp/vc/emerge.el (emerge-make-diff-list)
(emerge-make-diff3-list): Set proper `default-directory' in order
to support remote files.  (Bug#6850, Bug#74352)

* test/lisp/vc/emerge-tests.el: New file.

(cherry picked from commit 8c04396b198e81c1467314e44b720e3322ca8643)
lisp/vc/emerge.el
test/lisp/vc/emerge-tests.el [new file with mode: 0644]