Function: majutsu-conflict--refine-diffs
majutsu-conflict--refine-diffs is a natively compiled function defined
in majutsu-conflict.el.
Signature
(majutsu-conflict--refine-diffs)
Documentation
Add word-level refinement to JJ diff sections.
Source Code
;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-conflict.el
(defun majutsu-conflict--refine-diffs ()
"Add word-level refinement to JJ diff sections."
(dolist (conflict (majutsu-conflict-parse-buffer))
(when (eq (majutsu-conflict-style conflict) 'jj-diff)
(save-excursion
(let ((end (majutsu-conflict-end-pos conflict))
(marker-len (majutsu-conflict-marker-len conflict)))
(goto-char (majutsu-conflict-begin-pos conflict))
(forward-line 1)
(while (< (point) end)
(pcase (car-safe (majutsu-conflict--line-marker-at-point marker-len))
('diff
;; Skip marker line and optional note line.
(forward-line 1)
(when (and (< (point) end)
(eq (car-safe (majutsu-conflict--line-marker-at-point marker-len))
'note))
(forward-line 1))
(let ((content-start (point)))
(while (and (< (point) end)
(not (majutsu-conflict--line-marker-at-point marker-len)))
(forward-line 1))
(let ((content-end (point)))
(when (> content-end content-start)
(majutsu-conflict--refine-diff-region content-start content-end)))))
(_
(forward-line 1)))))))))