diff options
| author | Paul Eggert | 2014-04-16 12:43:46 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-04-16 12:43:46 -0700 |
| commit | 290d7ac277986bd118e594a8100b3f40e4492cb1 (patch) | |
| tree | d63a3aa61cac577dd119665edaffe2def8d194e2 /lisp/vc | |
| parent | 37eccff4f72c5a36dcd4b89d417b0047aab84e50 (diff) | |
| parent | b262bde327db2cd9b2f01f2d3ed946d0b188cb9d (diff) | |
| download | emacs-290d7ac277986bd118e594a8100b3f40e4492cb1.tar.gz emacs-290d7ac277986bd118e594a8100b3f40e4492cb1.zip | |
Merge from emacs-24; up to 2014-04-16T15:28:26Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/ediff-diff.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index f429eb35d70..ed248fbf835 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el | |||
| @@ -822,8 +822,9 @@ one optional arguments, diff-number to refine.") | |||
| 822 | (ediff-get-symbol-from-alist | 822 | (ediff-get-symbol-from-alist |
| 823 | buf-type ediff-fine-diff-face-alist) | 823 | buf-type ediff-fine-diff-face-alist) |
| 824 | ))) | 824 | ))) |
| 825 | (dolist (overl fine-diff-vector) | 825 | (mapc (lambda (overl) |
| 826 | (ediff-set-overlay-face overl face)))) | 826 | (ediff-set-overlay-face overl face)) |
| 827 | fine-diff-vector))) | ||
| 827 | 828 | ||
| 828 | ;; Set overlays over the regions that denote delimiters | 829 | ;; Set overlays over the regions that denote delimiters |
| 829 | (defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num) | 830 | (defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num) |