mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-03-11 01:11:31 -07:00
66bd2ce8e6
* 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. |
||
|---|---|---|
| .. | ||
| add-log.el | ||
| compare-w.el | ||
| cvs-status.el | ||
| diff-mode.el | ||
| diff.el | ||
| ediff-diff.el | ||
| ediff-help.el | ||
| ediff-hook.el | ||
| ediff-init.el | ||
| ediff-merg.el | ||
| ediff-mult.el | ||
| ediff-ptch.el | ||
| ediff-util.el | ||
| ediff-vers.el | ||
| ediff-wind.el | ||
| ediff.el | ||
| emerge.el | ||
| log-edit.el | ||
| log-view.el | ||
| pcvs-defs.el | ||
| pcvs-info.el | ||
| pcvs-parse.el | ||
| pcvs-util.el | ||
| pcvs.el | ||
| smerge-mode.el | ||
| vc-annotate.el | ||
| vc-bzr.el | ||
| vc-cvs.el | ||
| vc-dir.el | ||
| vc-dispatcher.el | ||
| vc-filewise.el | ||
| vc-git.el | ||
| vc-hg.el | ||
| vc-hooks.el | ||
| vc-rcs.el | ||
| vc-sccs.el | ||
| vc-src.el | ||
| vc-svn.el | ||
| vc.el | ||