From ab8a391eec25d1a8200953b93f92705dc6d83f43 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 6 May 1996 23:17:23 +0000 Subject: [PATCH] (ediff-setup-fine-diff-regions): Use ediff-diff3-options or ediff-diff-options. --- lisp/ediff-diff.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index af0b9a9a404..4e8a6d19fb0 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -160,15 +160,17 @@ one optional arguments, diff-number to refine.") (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. -- 2.39.2