Lines Matching defs:fine
204 "If `on', Ediff auto-highlights fine diffs for the current diff region.
205 If `off', auto-highlighting is not used. If `nix', no fine diffs are shown
310 (defun ediff-setup-fine-diff-regions (file-A file-B file-C reg-num)
311 (or (ediff-buffer-live-p ediff-fine-diff-buffer)
312 (setq ediff-fine-diff-buffer
314 (ediff-unique-buffer-name "*ediff-fine-diff" "*"))))
327 (ediff-exec-process diff-program ediff-fine-diff-buffer 'synchronize
338 (ediff-prepare-error-list ok-regexp ediff-fine-diff-buffer)
346 ediff-fine-diff-buffer '3way-comparison 'word-mode)
347 (ediff-extract-diffs ediff-fine-diff-buffer 'word-mode)))
367 (ediff-convert-fine-diffs-to-overlays diff-list reg-num)
670 ;; The 2-d elt, nil, is a place holder for the fine diff vector.
671 ;; The 3-d elt, nil, is a place holder for no-fine-diffs flag.
687 ;; if `flag' is 'noforce then make fine-diffs only if this region's fine
689 ;; if `flag' is 'skip then don't compute fine diffs for this region.
690 (defun ediff-make-fine-diffs (&optional n flag)
713 cumulative-fine-diff-length)
722 (ediff-set-fine-overlays-in-one-buffer 'C nil n))
745 ;; don't compute fine diffs if diff vector exists
746 ((and (eq flag 'noforce) (ediff-get-fine-diff-vector n 'A))
747 (if (ediff-no-fine-diffs-p n)
751 (cond ((eq (ediff-no-fine-diffs-p n) 'A)
753 ((eq (ediff-no-fine-diffs-p n) 'B)
755 ((eq (ediff-no-fine-diffs-p n) 'C)
758 ;; don't compute fine diffs for this region
760 (or (ediff-get-fine-diff-vector n 'A)
766 "\\[ediff-make-or-kill-fine-diffs]")
769 ;; recompute fine diffs
805 ;; set the new vector of fine diffs, if none exists
807 (ediff-setup-fine-diff-regions nil file-B file-C n))
809 (ediff-setup-fine-diff-regions file-A nil file-C n))
814 (ediff-setup-fine-diff-regions file-A file-B nil n))
816 (ediff-setup-fine-diff-regions file-A file-B file-C n)))
818 (setq cumulative-fine-diff-length
819 (+ (length (ediff-get-fine-diff-vector n 'A))
820 (length (ediff-get-fine-diff-vector n 'B))
823 (length (ediff-get-fine-diff-vector n 'C))
829 ;; none is white space and no fine diffs detected
833 (eq cumulative-fine-diff-length 0)))
837 ((eq cumulative-fine-diff-length 0)
851 (ediff-set-fine-diff-properties n)
854 ;; Interface to ediff-make-fine-diffs. Checks for auto-refine limit, etc.
855 (defun ediff-install-fine-diff-if-necessary (n)
867 (ediff-make-fine-diffs n 'noforce)
868 (ediff-make-fine-diffs n 'skip)))
870 ;; highlight iff fine diffs already exist
872 (ediff-make-fine-diffs n 'skip))))
875 ;; if fine diff vector is not set for diff N, then do nothing
876 (defun ediff-set-fine-diff-properties (n &optional default)
880 ;; when faces are supported, set faces and priorities of fine overlays
882 (ediff-set-fine-diff-properties-in-one-buffer 'A n default)
883 (ediff-set-fine-diff-properties-in-one-buffer 'B n default)
885 (ediff-set-fine-diff-properties-in-one-buffer 'C n default)))))
887 (defun ediff-set-fine-diff-properties-in-one-buffer (buf-type
889 (let ((fine-diff-vector (ediff-get-fine-diff-vector n buf-type))
894 buf-type ediff-fine-diff-face-alist))))
907 fine-diff-vector)))
910 (defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num)
921 (error "ediff-set-fine-overlays-for-combined-merge: corrupt list of
925 (ediff-set-fine-diff-vector
932 (defun ediff-set-fine-overlays-in-one-buffer (buf-type diff-list region-num)
941 (ediff-clear-fine-differences-in-one-buffer region-num buf-type)
949 (ediff-set-fine-overlays-for-combined-merge
951 ;; regular fine diff
976 (ediff-set-fine-diff-vector
981 (defsubst ediff-convert-fine-diffs-to-overlays (diff-list region-num)
982 (ediff-set-fine-overlays-in-one-buffer 'A diff-list region-num)
983 (ediff-set-fine-overlays-in-one-buffer 'B diff-list region-num)
985 (ediff-set-fine-overlays-in-one-buffer 'C diff-list region-num)
1261 (eq buffer ediff-fine-diff-buffer)