diff options
| author | Stefan Monnier | 2026-03-10 15:52:35 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2026-03-10 15:52:35 -0400 |
| commit | 66bd2ce8e69d31c04fb2f71c651d34a435f607eb (patch) | |
| tree | 03d4f5c9421a98bf8639c5ee930797e30eb3560e /admin/notes/cpp | |
| parent | a61d25d4112f1db954f7b5798c2a8aafc927268d (diff) | |
| download | emacs-master.tar.gz emacs-master.zip | |
* lisp/vc/smerge-mode.el (smerge--refine-chopup-region):
Replace `beg..end` arg with an overlay.
(smerge-refine-regions): Replace `beg` arg with an overlay.
(smerge--refine-prepare-regions, smerge--refine-apply-diff-1):
New functions, extracted from `smerge-refine-regions`.
(smerge--refine-apply-diff): New function.
(smerge-refine-regions): Use them. Also delete temp files right after
running `diff` rather than after applying diff's output.
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions