Function: majutsu-conflict--enable
majutsu-conflict--enable is a natively compiled function defined in
majutsu-conflict.el.
Signature
(majutsu-conflict--enable)
Documentation
Enable conflict highlighting for JJ-style conflicts.
Source Code
;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-conflict.el
(defun majutsu-conflict--enable ()
"Enable conflict highlighting for JJ-style conflicts."
;; Add font-lock keywords for line-level highlighting
(font-lock-add-keywords nil majutsu-conflict-font-lock-keywords 'append)
(add-hook 'font-lock-extend-region-functions
#'majutsu-conflict--extend-font-lock-region nil t)
(add-hook 'after-change-functions #'majutsu-conflict--after-change nil t)
(when font-lock-mode
(font-lock-flush)
(majutsu-conflict--fontify-conflicts)))