Function: emerge-combine-versions-edit

emerge-combine-versions-edit is a byte-compiled function defined in emerge.el.gz.

Signature

(emerge-combine-versions-edit DIFF-VECTOR COMBINE-TEMPLATE)

Source Code

;; Defined in /usr/src/emacs/lisp/vc/emerge.el.gz
(defun emerge-combine-versions-edit (diff-vector combine-template)
  (with-current-buffer
      emerge-merge-buffer
    (goto-char (emerge--current-beg diff-vector merge))
    (delete-region (point) (emerge--current-end diff-vector merge))
    (save-excursion
      (let ((i 0))
        (while (< i (length combine-template))
          (let ((c (aref combine-template i)))
	    (if (not (= c ?%))
                (insert c)
	      (setq i (1+ i))
	      (pcase (condition-case nil
			 (aref combine-template i)
		       (error ?%))
                (?a
                 (insert-buffer-substring emerge-A-buffer
                                          (emerge--current-beg diff-vector A)
                                          (emerge--current-end diff-vector A)))
		(?b
		 (insert-buffer-substring emerge-B-buffer
                                          (emerge--current-beg diff-vector B)
                                          (emerge--current-end diff-vector B)))
		(?% (insert ?%))
		(c (insert c)))))
          (setq i (1+ i)))))
    (aset diff-vector 6 'combined)
    (emerge-refresh-mode-line)
    (if emerge-auto-advance (emerge-next-difference))))