Function: majutsu-conflict--refine-pair
majutsu-conflict--refine-pair is a natively compiled function defined
in majutsu-conflict.el.
Signature
(majutsu-conflict--refine-pair REMOVE-BEG REMOVE-END ADD-BEG ADD-END)
Documentation
Refine a removed/added region pair.
REMOVE-BEG/REMOVE-END and ADD-BEG/ADD-END are content-only ranges (no +/-).
Source Code
;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-conflict.el
(defun majutsu-conflict--refine-pair (remove-beg remove-end add-beg add-end)
"Refine a removed/added region pair.
REMOVE-BEG/REMOVE-END and ADD-BEG/ADD-END are content-only ranges (no +/-)."
(when (and remove-beg remove-end add-beg add-end
(< remove-beg remove-end) (< add-beg add-end))
(let ((props-r `((majutsu-conflict-refine . t)
(face . majutsu-conflict-refined-removed)))
(props-a `((majutsu-conflict-refine . t)
(face . majutsu-conflict-refined-added)))
(smerge-refine-ignore-whitespace t)
(write-region-inhibit-fsync t))
(smerge-refine-regions remove-beg remove-end add-beg add-end
nil nil props-r props-a)
(dolist (ov (overlays-in remove-beg add-end))
(when (overlay-get ov 'majutsu-conflict-refine)
(overlay-put ov 'priority 100))))))