[Emacs-diffs] Changes to emacs/lisp/ediff-merg.el

[Michael Kifer]

Index: emacs/lisp/ediff-merg.el
diff -c emacs/lisp/ediff-merg.el:1.26 emacs/lisp/ediff-merg.el:1.27
*** emacs/lisp/ediff-merg.el:1.26       Sat Aug  6 22:13:42 2005
--- emacs/lisp/ediff-merg.el    Thu Oct  6 00:09:49 2005
***************
*** 103,113 ****
    )
  (make-variable-buffer-local 
'ediff-skip-merge-regions-that-differ-from-default)
  
  ;; If ediff-show-clashes-only, check if there is no clash between the ancestor
  ;; and one of the variants.
! (defsubst ediff-merge-region-is-non-clash (n)
    (and ediff-show-clashes-only
!        (string-match "prefer" (or (ediff-get-state-of-merge n) ""))))
  
  ;; If ediff-skip-changed-regions, check if the merge region differs from
  ;; the current default. If a region is different from the default, it means
--- 103,117 ----
    )
  (make-variable-buffer-local 
'ediff-skip-merge-regions-that-differ-from-default)
  
+ ;; check if there is no clash between the ancestor and one of the variants.
+ (defsubst ediff-merge-region-is-non-clash (n)
+   (string-match "prefer" (or (ediff-get-state-of-merge n) "")))
+ 
  ;; If ediff-show-clashes-only, check if there is no clash between the ancestor
  ;; and one of the variants.
! (defsubst ediff-merge-region-is-non-clash-to-skip (n)
    (and ediff-show-clashes-only
!        (ediff-merge-region-is-non-clash n)))
  
  ;; If ediff-skip-changed-regions, check if the merge region differs from
  ;; the current default. If a region is different from the default, it means