Function: smerge-mode

smerge-mode is an autoloaded, interactive and byte-compiled function defined in smerge-mode.el.gz.

Signature

(smerge-mode &optional ARG)

Documentation

Minor mode to simplify editing output from the diff3 program.

C-c ^ = < smerge-diff-base-upper
C-c ^ = = smerge-diff-upper-lower
C-c ^ = > smerge-diff-base-lower
C-c ^ C smerge-combine-with-next
C-c ^ E smerge-ediff
C-c ^ R smerge-refine
C-c ^ RET smerge-keep-current
C-c ^ a smerge-keep-all
C-c ^ b smerge-keep-base
C-c ^ l smerge-keep-lower
C-c ^ m smerge-keep-upper
C-c ^ n smerge-next
C-c ^ o smerge-keep-lower
C-c ^ p smerge-prev
C-c ^ r smerge-resolve
C-c ^ u smerge-keep-upper

This is a minor mode. If called interactively, toggle the SMerge mode mode. If the prefix argument is positive, enable the mode, and if it is zero or negative, disable the mode.

If called from Lisp, toggle the mode if ARG is toggle. Enable the mode if ARG is nil, omitted, or is a positive number. Disable the mode if ARG is a negative number.

To check whether the minor mode is enabled in the current buffer, evaluate the variable smerge-mode(var)/smerge-mode(fun).

The mode's hook is called both when the mode is enabled and when it is disabled.

View in manual

Probably introduced at or before Emacs version 21.1.

Key Bindings

Source Code

;; Defined in /usr/src/emacs/lisp/vc/smerge-mode.el.gz
;;;###autoload
(define-minor-mode smerge-mode
  "Minor mode to simplify editing output from the diff3 program.

\\{smerge-mode-map}"
  :group 'smerge :lighter " SMerge"
  (when font-lock-mode
    (save-excursion
      (if smerge-mode
	  (font-lock-add-keywords nil smerge-font-lock-keywords 'append)
	(font-lock-remove-keywords nil smerge-font-lock-keywords))
      (goto-char (point-min))
      (while (smerge-find-conflict)
	(save-excursion
          (with-demoted-errors "%S" ;Those things do happen, occasionally.
            (font-lock-fontify-region
             (match-beginning 0) (match-end 0) nil))))))
  (if (string-match (regexp-quote smerge-parsep-re) paragraph-separate)
      (unless smerge-mode
        (setq-local paragraph-separate
                    (replace-match "" t t paragraph-separate)))
    (when smerge-mode
        (setq-local paragraph-separate
                    (concat smerge-parsep-re paragraph-separate))))
  (unless smerge-mode
    (smerge-remove-props (point-min) (point-max))))