Mercurial > emacs
changeset 15175:bd6c4ed55f9c
(ediff-setup-fine-diff-regions):
Use ediff-diff3-options or ediff-diff-options.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 06 May 1996 23:17:23 +0000 |
| parents | 08937f70419e |
| children | 87c0298bd4f7 |
| files | lisp/ediff-diff.el |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff-diff.el Mon May 06 10:21:23 1996 +0000 +++ b/lisp/ediff-diff.el Mon May 06 23:17:23 1996 +0000 @@ -160,15 +160,17 @@ (get-buffer-create (ediff-unique-buffer-name "*ediff-fine-diff" "*")))) - (let (diff3-job diff-program ok-regexp diff-list) + (let (diff3-job diff-program diff-options ok-regexp diff-list) (setq diff3-job ediff-3way-job diff-program (if diff3-job ediff-diff3-program ediff-diff-program) + diff-options (if diff3-job ediff-diff3-options ediff-diff-options) ok-regexp (if diff3-job ediff-diff3-ok-lines-regexp ediff-diff-ok-lines-regexp)) (ediff-message-if-verbose "Refining difference region %d ..." (1+ reg-num)) (ediff-exec-process diff-program ediff-fine-diff-buffer 'synchronize + diff-options ;; The shuffle below is because we can compare 3-way ;; or in several 2-way fashions, like fA fC, fA fB, ;; or fB fC.