diff options
| author | Richard M. Stallman | 1996-05-06 23:17:23 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-05-06 23:17:23 +0000 |
| commit | ab8a391eec25d1a8200953b93f92705dc6d83f43 (patch) | |
| tree | a494b733dee919d8d8e78244736b4e477751cc51 | |
| parent | 345dd8f75a4c772e970df02014bcb42ac437d7de (diff) | |
| download | emacs-ab8a391eec25d1a8200953b93f92705dc6d83f43.tar.gz emacs-ab8a391eec25d1a8200953b93f92705dc6d83f43.zip | |
(ediff-setup-fine-diff-regions):
Use ediff-diff3-options or ediff-diff-options.
| -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.") | |||
| 160 | (get-buffer-create | 160 | (get-buffer-create |
| 161 | (ediff-unique-buffer-name "*ediff-fine-diff" "*")))) | 161 | (ediff-unique-buffer-name "*ediff-fine-diff" "*")))) |
| 162 | 162 | ||
| 163 | (let (diff3-job diff-program ok-regexp diff-list) | 163 | (let (diff3-job diff-program diff-options ok-regexp diff-list) |
| 164 | (setq diff3-job ediff-3way-job | 164 | (setq diff3-job ediff-3way-job |
| 165 | diff-program (if diff3-job ediff-diff3-program ediff-diff-program) | 165 | diff-program (if diff3-job ediff-diff3-program ediff-diff-program) |
| 166 | diff-options (if diff3-job ediff-diff3-options ediff-diff-options) | ||
| 166 | ok-regexp (if diff3-job | 167 | ok-regexp (if diff3-job |
| 167 | ediff-diff3-ok-lines-regexp | 168 | ediff-diff3-ok-lines-regexp |
| 168 | ediff-diff-ok-lines-regexp)) | 169 | ediff-diff-ok-lines-regexp)) |
| 169 | 170 | ||
| 170 | (ediff-message-if-verbose "Refining difference region %d ..." (1+ reg-num)) | 171 | (ediff-message-if-verbose "Refining difference region %d ..." (1+ reg-num)) |
| 171 | (ediff-exec-process diff-program ediff-fine-diff-buffer 'synchronize | 172 | (ediff-exec-process diff-program ediff-fine-diff-buffer 'synchronize |
| 173 | diff-options | ||
| 172 | ;; The shuffle below is because we can compare 3-way | 174 | ;; The shuffle below is because we can compare 3-way |
| 173 | ;; or in several 2-way fashions, like fA fC, fA fB, | 175 | ;; or in several 2-way fashions, like fA fC, fA fB, |
| 174 | ;; or fB fC. | 176 | ;; or fB fC. |