diff options
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 41f294c1b13..caa927f2113 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -1794,6 +1794,7 @@ With a prefix argument, go back that many differences." skip-changed ;; skip difference regions that differ in white space (and ediff-ignore-similar-regions + (ediff-merge-region-is-non-clash n) (or (eq (ediff-no-fine-diffs-p n) t) (and (ediff-merge-job) (eq (ediff-no-fine-diffs-p n) 'C))) @@ -3172,7 +3173,7 @@ Hit \\[ediff-recenter] to reset the windows afterward." (setq f (concat ediff-temp-file-prefix p) short-f (concat ediff-temp-file-prefix short-p) f (cond (given-file) - ((find-file-name-handler f 'find-file-noselect) + ((find-file-name-handler f 'insert-file-contents) ;; to thwart file handlers in write-region, e.g., if file ;; name ends with .Z or .gz ;; This is needed so that patches produced by ediff will |