From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Charles Rendleman Newsgroups: gmane.emacs.bugs Subject: bug#17285: 24.3.90: EDIFF fails with 'Wrong type argument: lisp' in ediff-set-fine-diff-properties Date: Thu, 17 Apr 2014 19:05:12 -0400 Message-ID: References: <87y4z38zgz.fsf@geodiff-mac3.ulb.ac.be> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a11c32a88c072eb04f74510de X-Trace: ger.gmane.org 1397775991 2247 80.91.229.3 (17 Apr 2014 23:06:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 17 Apr 2014 23:06:31 +0000 (UTC) Cc: 17285@debbugs.gnu.org To: Nicolas Richard Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Apr 18 01:06:22 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WavNt-0000X7-Mn for geb-bug-gnu-emacs@m.gmane.org; Fri, 18 Apr 2014 01:06:21 +0200 Original-Received: from localhost ([::1]:35493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WavNs-0004et-TK for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Apr 2014 19:06:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37575) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WavNk-0004Nj-Ee for bug-gnu-emacs@gnu.org; Thu, 17 Apr 2014 19:06:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WavNa-0004sm-U7 for bug-gnu-emacs@gnu.org; Thu, 17 Apr 2014 19:06:12 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:43251) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WavNa-0004sS-Pd for bug-gnu-emacs@gnu.org; Thu, 17 Apr 2014 19:06:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WavNa-0005M1-6p for bug-gnu-emacs@gnu.org; Thu, 17 Apr 2014 19:06:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Charles Rendleman Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 17 Apr 2014 23:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17285 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17285-submit@debbugs.gnu.org id=B17285.139777592320499 (code B ref 17285); Thu, 17 Apr 2014 23:06:02 +0000 Original-Received: (at 17285) by debbugs.gnu.org; 17 Apr 2014 23:05:23 +0000 Original-Received: from localhost ([127.0.0.1]:51408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WavMw-0005KY-Fr for submit@debbugs.gnu.org; Thu, 17 Apr 2014 19:05:22 -0400 Original-Received: from mail-ig0-f172.google.com ([209.85.213.172]:51774) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WavMs-0005K9-Cs for 17285@debbugs.gnu.org; Thu, 17 Apr 2014 19:05:19 -0400 Original-Received: by mail-ig0-f172.google.com with SMTP id hn18so132287igb.11 for <17285@debbugs.gnu.org>; Thu, 17 Apr 2014 16:05:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=m9s5ZqwNPJF2xo0yJzdYfS4WYIRbHSHPFY5NagL52x8=; b=XpCwBN491EcJBj3Y9QY9CfhwwIsc9h7V/wd4aKiz2DATss8ISNnZypLzOobyKzWN6q Wha+Lwb00N8NEzURzawVJMXEVrAuX+vr05lrVgZB4zHsHMkvKXVjtweLHZD0oghlg179 SF06+V/Rlt2gBPVbc3rBKKH1IWhCmaLzwtD5m8rvPgJDsZnfOA5np8AB4j2gee0XbPfN 1UBP6rERa5uRgSEYyGJdQEUyU1bdhw2Dvvxi4OYMJ1eBxVXlmP4FFTHe7KyGvEc38a1q yGZe8A3slT634bZHVeLh0nKlGMtHn5f0LY/PIOCiZMoqET/tGEOM8VIrdQIz6I2ylVLJ lmzA== X-Received: by 10.50.4.70 with SMTP id i6mr113354igi.40.1397775912692; Thu, 17 Apr 2014 16:05:12 -0700 (PDT) Original-Received: by 10.64.81.199 with HTTP; Thu, 17 Apr 2014 16:05:12 -0700 (PDT) In-Reply-To: <87y4z38zgz.fsf@geodiff-mac3.ulb.ac.be> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:88118 Archived-At: --001a11c32a88c072eb04f74510de Content-Type: text/plain; charset=UTF-8 The patch fixed the problem. On Thu, Apr 17, 2014 at 4:37 PM, Nicolas Richard < theonewiththeevillook@yahoo.fr> wrote: > Charles Rendleman writes: > > ediff-set-fine-diff-properties: Wrong type argument: listp, [# > 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. > --001a11c32a88c072eb04f74510de Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
The patch fixed the problem.



On Thu, Apr 17, 2014 a= t 4:37 PM, Nicolas Richard <theonewiththeevillook@yahoo.fr> wrote:
Charles Rendleman <carendle@gmail.com> writes:
> ediff-set-fine-diff-properties: Wrong type argument: listp, [#<over= lay
> 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.") =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (ediff-get-symbol-f= rom-alist
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0buf-type edif= f-fine-diff-face-alist)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 )))
- =C2=A0 =C2=A0(dolist (overl fine-diff-vector)
- =C2=A0 =C2=A0 =C2=A0(ediff-set-overlay-face overl face))))
+ =C2=A0 =C2=A0(mapc (lambda (overl)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (ediff-set-overlay-face overl face)) + =C2=A0 =C2=A0 =C2=A0 =C2=A0 fine-diff-vector)))

=C2=A0;; Set overlays over the regions that denote delimiters
=C2=A0(defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num)=


--
Nico.

--001a11c32a88c072eb04f74510de--