[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#17287: 24.3.90; EDiff fails from second hunk
From: |
Nicolas Richard |
Subject: |
bug#17287: 24.3.90; EDiff fails from second hunk |
Date: |
Fri, 18 Apr 2014 10:59:20 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.90 (gnu/linux) |
Martin Apel <martin.apel@simpack.de> writes:
> ediff-set-fine-diff-properties: Wrong type argument: listp, [#<overlay
[...]
This looks like a duplicate of #17257, fixed a few days ago. You can try
to rebuild emacs or apply the fix to your tree:
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index f429eb3..ed248fb 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -822,8 +822,9 @@ one optional arguments, diff-number to refine.")
(ediff-get-symbol-from-alist
buf-type ediff-fine-diff-face-alist)
)))
- (dolist (overl fine-diff-vector)
- (ediff-set-overlay-face overl face))))
+ (mapc (lambda (overl)
+ (ediff-set-overlay-face overl face))
+ fine-diff-vector)))
;; Set overlays over the regions that denote delimiters
(defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num)
--
Nico.