Lines Matching defs:merge
34 (defvar ediff-merge-window-share)
48 (defcustom ediff-quit-merge-hook 'ediff-maybe-save-and-delete-merge
49 "*Hooks to run before quitting a merge job.
50 The most common use is to save and delete the merge buffer."
52 :group 'ediff-merge)
59 :group 'ediff-merge)
80 :group 'ediff-merge)
87 :group 'ediff-merge
91 (defcustom ediff-skip-merge-regions-that-differ-from-default nil
101 :group 'ediff-merge
103 (make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default)
106 ;; if it is not a merge job then return true
107 (defsubst ediff-merge-region-is-non-clash (n)
108 (if (ediff-merge-job)
109 (string-match "prefer" (or (ediff-get-state-of-merge n) ""))
114 (defsubst ediff-merge-region-is-non-clash-to-skip (n)
116 (ediff-merge-region-is-non-clash n)))
118 ;; If ediff-skip-changed-regions, check if the merge region differs from
120 ;; that the user has made determination as to how to merge for this particular
122 (defsubst ediff-skip-merge-region-if-changed-from-default-p (n)
123 (and ediff-skip-merge-regions-that-differ-from-default
124 (ediff-merge-changed-from-default-p n 'prefers-too)))
201 (defun ediff-set-merge-mode ()
203 (remove-hook 'local-write-file-hooks 'ediff-set-merge-mode))
209 ;; no need to optimize ediff-do-merge any further.
211 ;; If re-merging, change state of merge in all diffs starting with
215 (defun ediff-do-merge (diff-num &optional remerging)
218 ;;(default-state-of-merge (format "%S" ediff-default-variant))
219 do-not-copy state-of-merge)
228 (setq state-of-merge (ediff-get-state-of-merge n))
237 (if (or (ediff-merge-changed-from-default-p n)
239 (string-match "prefer" state-of-merge))
243 ;; change state of merge for this diff, if necessary
244 (if (and (string-match "\\(default\\|combined\\)" state-of-merge)
246 (ediff-set-state-of-merge
250 ;; state-of-merge may have changed via ediff-set-state-of-merge, so
252 (setq state-of-merge (ediff-get-state-of-merge n))
255 (if (string= state-of-merge "combined")
260 n (if (string-match "-A" state-of-merge) 'A 'B) 'C 'batch)))
266 (defun ediff-re-merge ()
277 (format "Current merge default is `%S'. New default: "
280 (ediff-do-merge ediff-current-difference 'remerge)
289 (if (not ediff-merge-job)
294 (let ((ediff-merge-window-share
296 ediff-merge-window-share 0)))
300 (setq ediff-merge-window-share (* ediff-merge-window-share 0.9))
304 (setq ediff-merge-window-share (* ediff-merge-window-share 1.1))
332 (defun ediff-looks-like-combined-merge (region-num)
333 (if ediff-merge-job
362 (eval-when-compile (defvar state-of-merge)) ; dynamic var
364 ;; Check if the non-preferred merge has been modified since originally set.
368 (defun ediff-merge-changed-from-default-p (diff-num &optional prefers-too)
373 (setq state-of-merge (ediff-get-state-of-merge diff-num))
376 (or (and (string= state-of-merge "default-A")
378 (and (string= state-of-merge "default-B")
380 (and (string= state-of-merge "combined")
384 (string= state-of-merge "prefer-A")
387 (string= state-of-merge "prefer-B")