Mercurial > emacs
comparison lisp/ediff-merg.el @ 20003:9bc6a4017c8c
new version
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Tue, 30 Sep 1997 01:13:53 +0000 |
| parents | f90d40b0bff5 |
| children | f44ff2c52fac |
comparison
equal
deleted
inserted
replaced
| 20002:e89847e2df84 | 20003:9bc6a4017c8c |
|---|---|
| 78 | 78 |
| 79 (ediff-defvar-local ediff-show-clashes-only nil | 79 (ediff-defvar-local ediff-show-clashes-only nil |
| 80 "*If t, show only those diff regions where both buffers disagree with the ancestor. | 80 "*If t, show only those diff regions where both buffers disagree with the ancestor. |
| 81 This means that regions that have status prefer-A or prefer-B will be | 81 This means that regions that have status prefer-A or prefer-B will be |
| 82 skiped over. Nil means show all regions.") | 82 skiped over. Nil means show all regions.") |
| 83 | |
| 84 ;; If ediff-show-clashes-only, check if there is no clash between the ancestor | |
| 85 ;; and one of the variants. | |
| 86 (defsubst ediff-merge-region-is-non-clash (n) | |
| 87 (and ediff-show-clashes-only | |
| 88 (string-match "prefer" (or (ediff-get-state-of-merge n) "")))) | |
| 83 | 89 |
| 84 | 90 |
| 85 (defsubst ediff-get-combined-region (n) | 91 (defsubst ediff-get-combined-region (n) |
| 86 (concat (nth 0 ediff-combination-pattern) "\n" | 92 (concat (nth 0 ediff-combination-pattern) "\n" |
| 87 (ediff-get-region-contents n 'A ediff-control-buffer) | 93 (ediff-get-region-contents n 'A ediff-control-buffer) |