diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-05-06 23:17:23 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-05-06 23:17:23 +0000 |
| commit | 19bdc02ea8e85d524a59da11d3265cc4b9e9ed8a (patch) | |
| tree | 033eb2f2a0c0f1fd52f9aabfc412fd2c7a31acea /lisp/ediff-diff.el | |
| parent | bbb2746d41dc48b89911127c4158bf657a13277c (diff) | |
| download | emacs-19bdc02ea8e85d524a59da11d3265cc4b9e9ed8a.tar.gz | |
(ediff-setup-fine-diff-regions):
Use ediff-diff3-options or ediff-diff-options.
Diffstat (limited to 'lisp/ediff-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 4 |
1 files changed, 3 insertions, 1 deletions
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. |