Lines Matching +defs:compare +defs:windows +defs:skip +defs:whitespace
105 `ediff-windows-wordwise'
106 `ediff-windows-linewise'
215 (define-key ediff-mode-map "$*" 'ediff-toggle-skip-changed-regions)
241 (define-key ediff-mode-map "##" 'ediff-toggle-skip-similar))
249 (define-key ediff-mode-map "=" 'ediff-inferior-compare-regions)
271 ;; after this buf is created and before any windows are set and such.
331 ediff-windows-job (ediff-windows-job)
431 ;; This has effect only on ediff-windows/regions
516 (ediff-setup-windows buffer-A buffer-B buffer-C control-buffer)
593 (skip-chars-forward ediff-whitespace)))
772 (ediff-setup-windows
850 ;; context must be saved before switching to windows A/B/C
862 (if (and window ediff-windows-job)
1282 (ediff-recenter 'no-rehighlight) ; make sure buffs are displayed in windows
1313 (cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe)
1314 (setq window-setup-func 'ediff-setup-windows-plain))
1315 ((eq ediff-window-setup-function 'ediff-setup-windows-plain)
1318 (setq window-setup-func 'ediff-setup-windows-multiframe)))
1416 (defun ediff-toggle-skip-changed-regions ()
1420 (setq ediff-skip-merge-regions-that-differ-from-default
1421 (not ediff-skip-merge-regions-that-differ-from-default))
1422 (if ediff-skip-merge-regions-that-differ-from-default
1432 Used in ediff-windows/regions only."
1444 ;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise.
1452 ;; If ediff-*-regions/windows, ediff-visible-bounds is already set
1481 ;; Performs some operation on the two file windows (if they are showing).
1482 ;; Traps all errors on the operation in windows A/B/C.
1485 (defun ediff-operate-on-windows (operation arg)
1487 ;; make sure windows aren't dead
1529 ;; make sure windows aren't dead
1539 (ediff-operate-on-windows
1569 the width of the A/B/C windows."
1573 ;; make sure windows aren't dead
1583 (ediff-operate-on-windows
1623 ;;JOB-NAME holds ediff-job-name. The ediff-windows job positions regions
1628 (if ediff-windows-job
1631 ;; at this point, windows are positioned at the beginning of the
1696 ;; The purpose of this coefficient is to make the windows scroll in sync, so
1731 non-clash-skip skip-changed regexp-skip)
1735 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
1736 ;; this won't exec if regexp-skip is t
1737 (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
1738 skip-changed
1739 (ediff-skip-merge-region-if-changed-from-default-p n))
1744 ;; regexp skip
1745 regexp-skip
1746 ;; skip clashes, if necessary
1747 non-clash-skip
1748 ;; skip processed regions
1749 skip-changed
1750 ;; skip difference regions that differ in white space
1761 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
1762 ;; this won't exec if regexp-skip is t
1763 (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
1764 skip-changed
1765 (ediff-skip-merge-region-if-changed-from-default-p n))
1781 non-clash-skip skip-changed regexp-skip)
1785 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
1786 ;; this won't exec if regexp-skip is t
1787 (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
1788 skip-changed
1789 (ediff-skip-merge-region-if-changed-from-default-p n))
1793 ;; regexp skip
1794 regexp-skip
1795 ;; skip clashes, if necessary
1796 non-clash-skip
1798 skip-changed
1799 ;; skip difference regions that differ in white space
1810 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
1811 ;; this won't exec if regexp-skip is t
1812 (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
1813 skip-changed
1814 (ediff-skip-merge-region-if-changed-from-default-p n))
2217 ((or (and (eq ediff-skip-diff-region-function
2220 (and (eq ediff-skip-diff-region-function
2224 (setq ediff-skip-diff-region-function 'ediff-show-all-diffs))
2226 (setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function
2264 (setq ediff-skip-diff-region-function
2303 (defun ediff-toggle-skip-similar ()
2308 "Can't skip over whitespace regions: first turn auto-refining on"))
2437 ;; Restore the visibility range. This affects only ediff-*-regions/windows.
2636 (balance-windows)
2759 ;; Buries Ediff buffers, kills all windows.
2788 (delete-other-windows)
2797 (delete-other-windows)
2806 (delete-other-windows)
2829 Hit \\[ediff-recenter] to reset the windows afterward."
2833 (ediff-skip-unsuitable-frames))
2896 (if (and ediff-skip-merge-regions-that-differ-from-default ediff-merge-job)
2900 (cond ((eq ediff-skip-diff-region-function 'ediff-show-all-diffs)
2902 ((eq ediff-skip-diff-region-function
2911 ((eq ediff-skip-diff-region-function
3345 (pop-up-windows t)
3354 (delete-other-windows)
3456 (ediff-skip-unsuitable-frames ' ok-unsplittable))
3479 (defun ediff-inferior-compare-regions ()
3501 ;; ask which buffer to compare to the merge buffer
3517 "Which buffer to compare to the merge buffer (A or B)? ")
3521 ;; ask which two buffers to compare
3537 (message "Enter the 1st buffer you want to compare (%s): "
3556 (message "Enter the 2nd buffer you want to compare (%s): "
3685 (defun ediff-whitespace-diff-region-p (n buf-type)
3693 (skip-chars-forward ediff-whitespace)
3875 ;; skip, if dired is not forced
3895 ;; try also buffers that are not displayed in windows
3983 (ediff-skip-unsuitable-frames)
3988 (delete-other-windows)
4033 'delete-other-windows