Function: majutsu-ediff--quit-merge-session

majutsu-ediff--quit-merge-session is a natively compiled function defined in majutsu-ediff.el.

Signature

(majutsu-ediff--quit-merge-session)

Documentation

Persist merge output if edited, then close merge buffer.

This hook runs in the Ediff control buffer and is intended for jj resolve.

Source Code

;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-ediff.el
(defun majutsu-ediff--quit-merge-session ()
  "Persist merge output if edited, then close merge buffer.
This hook runs in the Ediff control buffer and is intended for `jj resolve'."
  (let ((store-file ediff-merge-store-file))
    (when (ediff-buffer-live-p ediff-buffer-C)
      (when (and (buffer-modified-p ediff-buffer-C)
                 (stringp store-file)
                 (> (length store-file) 0)
                 (majutsu-ediff--confirm-save-merge store-file))
        (ediff-with-current-buffer ediff-buffer-C
          ;; `ediff-merge-store-file' is local to the control buffer, so keep
          ;; a stable copy before switching to buffer C.
          (write-region nil nil store-file nil 'silent)))
      (ediff-with-current-buffer ediff-buffer-C
        ;; Avoid save prompts during cleanup. Output is already persisted above.
        (set-buffer-modified-p nil))
      (ediff-kill-buffer-carefully ediff-buffer-C))))