The patch fixed the problem.



On Thu, Apr 17, 2014 at 4:37 PM, Nicolas Richard <
theonewiththeevillook@yahoo.fr> wrote:

> Charles Rendleman <carendle@gmail.com> writes:
> > ediff-set-fine-diff-properties: Wrong type argument: listp, [#<overlay
> > from 14 to 17 in f1>]
>
> 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.
>