diff options
| author | Miles Bader | 2008-01-30 07:57:28 +0000 |
|---|---|---|
| committer | Miles Bader | 2008-01-30 07:57:28 +0000 |
| commit | d235ca2ff8fab139ce797757fcb159d1e28fa7e0 (patch) | |
| tree | 96c5cd1a06a0d9dc26e8470c6eabfc032c0046f3 /lisp/ediff-diff.el | |
| parent | 3709a060f679dba14df71ae64a0035fa2b5b3106 (diff) | |
| parent | 02cbe062bee38a6705bafb1699d77e3c44cfafcf (diff) | |
| download | emacs-d235ca2ff8fab139ce797757fcb159d1e28fa7e0.tar.gz emacs-d235ca2ff8fab139ce797757fcb159d1e28fa7e0.zip | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324
Diffstat (limited to 'lisp/ediff-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 685543b5369..b690bfbe4e1 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el | |||
| @@ -948,7 +948,7 @@ delimiter regions")) | |||
| 948 | ))) | 948 | ))) |
| 949 | 949 | ||
| 950 | 950 | ||
| 951 | (defsubst ediff-convert-fine-diffs-to-overlays (diff-list region-num) | 951 | (defun ediff-convert-fine-diffs-to-overlays (diff-list region-num) |
| 952 | (ediff-set-fine-overlays-in-one-buffer 'A diff-list region-num) | 952 | (ediff-set-fine-overlays-in-one-buffer 'A diff-list region-num) |
| 953 | (ediff-set-fine-overlays-in-one-buffer 'B diff-list region-num) | 953 | (ediff-set-fine-overlays-in-one-buffer 'B diff-list region-num) |
| 954 | (if ediff-3way-job | 954 | (if ediff-3way-job |