• Home
  • History
  • Annotate
  • Raw
  • Download
  • only in /macosx-10.9.5/emacs-92/emacs/lisp/

Lines Matching defs:regions

107 	`ediff-regions-wordwise'
108 `ediff-regions-linewise'
215 (define-key ediff-mode-map "$*" 'ediff-toggle-skip-changed-regions)
249 (define-key ediff-mode-map "=" 'ediff-inferior-compare-regions)
355 ;; because the merge buffer will contain lossage: diff regions
416 ;; ediff-setup-diff-regions-function must be set after setup
418 (setq ediff-setup-diff-regions-function
421 'ediff-setup-diff-regions))
431 ;; This has effect only on ediff-windows/regions
505 (funcall ediff-setup-diff-regions-function file-A file-B file-C)
621 "Recompute difference regions in buffers A, B, and C.
695 (setq ediff-killed-diffs-alist nil) ; invalidate saved killed diff regions
699 (let ((ediff-setup-diff-regions-function ediff-setup-diff-regions-function)
705 (setq ediff-setup-diff-regions-function 'ediff-setup-diff-regions3
710 (funcall ediff-setup-diff-regions-function file-A file-B file-C))
937 (message "Unhighlighting unselected difference regions")
953 (message "Re-highlighting all difference regions")
959 (ediff-paint-background-regions)
960 (ediff-paint-background-regions 'unhighlight))
1406 "Toggle the mode that shows only the merge regions where both variants differ from the ancestor."
1413 (message "Focus on regions where both buffers differ from the ancestor")
1414 (message "Canceling focus on regions where changes clash")))
1416 (defun ediff-toggle-skip-changed-regions ()
1417 "Toggle the mode that skips the merge regions that differ from the default."
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
1423 (message "Skipping regions that differ from default setting")
1424 (message "Showing regions that differ from default setting")))
1432 Used in ediff-windows/regions only."
1444 ;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise.
1446 ;; to two different regions in one buffer.
1452 ;; If ediff-*-regions/windows, ediff-visible-bounds is already set
1623 ;;JOB-NAME holds ediff-job-name. The ediff-windows job positions regions
1632 ;; file regions (not diff-regions) being compared.
1748 ;; skip processed regions
1750 ;; skip difference regions that differ in white space
1751 (and ediff-ignore-similar-regions
1797 ;; skipp changed regions
1799 ;; skip difference regions that differ in white space
1800 (and ediff-ignore-similar-regions
1950 copying difference regions. The first character in the sequence specifies
2167 ;; have modified diff regions after copying and, thus, may have recomputed
2208 "Toggle between focusing and hiding of difference regions that match
2230 "Ignore A-regions matching this regexp (default %s): "
2235 "Ignore B-regions matching this regexp (default %s): "
2241 "Ignore C-regions matching this regexp (default %s): "
2252 "Ignore regions that match %s regexps, OK? "
2254 (message "Will ignore regions that match %s regexps" msg-connective)
2256 (message "Will ignore regions that match %s regexps"
2269 "Focus on A-regions matching this regexp (default %s): "
2274 "Focus on B-regions matching this regexp (default %s): "
2280 "Focus on C-regions matching this regexp (default %s): "
2291 "Focus on regions that match %s regexps, OK? "
2293 (message "Will focus on regions that match %s regexps"
2296 (message "Will focus on regions that match %s regexps"
2308 "Can't skip over whitespace regions: first turn auto-refining on"))
2309 (setq ediff-ignore-similar-regions (not ediff-ignore-similar-regions))
2310 (if ediff-ignore-similar-regions
2312 "Skipping regions that differ only in white space & line breaks")
2437 ;; Restore the visibility range. This affects only ediff-*-regions/windows.
2890 (format "\n%s regions that differ in white space & line breaks only"
2891 (if ediff-ignore-similar-regions
2895 "\nFocusing on regions where both buffers differ from the ancestor"))
2896 (if (and ediff-skip-merge-regions-that-differ-from-default ediff-merge-job)
2898 "\nSkipping merge regions that differ from default setting"))
2905 "\nIgnoring regions that match")
2914 "\nFocusing on regions that match")
3082 (ediff-paint-background-regions 'unhighlight)
3479 (defun ediff-inferior-compare-regions ()
3480 "Compare regions in an active Ediff session.
3481 Like ediff-regions-linewise but is called from under an active Ediff session on
3489 (zmacs-regions t)
3497 (ediff-paint-background-regions 'unhighlight)
3565 (y-or-n-p "Compare currently highlighted difference regions? "))
3599 (ediff-regions-internal
3603 'ediff-regions-wordwise
3604 'ediff-regions-linewise)
3742 (ediff-paint-background-regions))
3994 reporting that certain difference regions are not matched as you think they