/[emacs]/emacs/lisp/ediff-merg.el
ViewVC logotype

Diff of /emacs/lisp/ediff-merg.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.26 by ttn, Sat Aug 6 22:13:42 2005 UTC revision 1.27 by kifer, Thu Oct 6 00:09:49 2005 UTC
# Line 103  Buffer B." Line 103  Buffer B."
103    )    )
104  (make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default)  (make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default)
105    
106    ;; check if there is no clash between the ancestor and one of the variants.
107    (defsubst ediff-merge-region-is-non-clash (n)
108      (string-match "prefer" (or (ediff-get-state-of-merge n) "")))
109    
110  ;; If ediff-show-clashes-only, check if there is no clash between the ancestor  ;; If ediff-show-clashes-only, check if there is no clash between the ancestor
111  ;; and one of the variants.  ;; and one of the variants.
112  (defsubst ediff-merge-region-is-non-clash (n)  (defsubst ediff-merge-region-is-non-clash-to-skip (n)
113    (and ediff-show-clashes-only    (and ediff-show-clashes-only
114         (string-match "prefer" (or (ediff-get-state-of-merge n) ""))))         (ediff-merge-region-is-non-clash n)))
115    
116  ;; If ediff-skip-changed-regions, check if the merge region differs from  ;; If ediff-skip-changed-regions, check if the merge region differs from
117  ;; the current default. If a region is different from the default, it means  ;; the current default. If a region is different from the default, it means

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.27

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26