From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nicolas Richard Newsgroups: gmane.emacs.bugs Subject: bug#17382: 24.3.90; Ediff mode is broken Date: Fri, 02 May 2014 07:15:00 +0200 Message-ID: <87y4ykwyln.fsf@geodiff-mac3.ulb.ac.be> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1399007728 17658 80.91.229.3 (2 May 2014 05:15:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 2 May 2014 05:15:28 +0000 (UTC) Cc: 17382@debbugs.gnu.org To: Glenn Morris , Rafal Kowalski Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri May 02 07:15:18 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 1Wg5oc-0007ic-5B for geb-bug-gnu-emacs@m.gmane.org; Fri, 02 May 2014 07:15:18 +0200 Original-Received: from localhost ([::1]:42274 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wg5ob-0007vo-Kd for geb-bug-gnu-emacs@m.gmane.org; Fri, 02 May 2014 01:15:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58287) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wg5oT-0007vY-4y for bug-gnu-emacs@gnu.org; Fri, 02 May 2014 01:15:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wg5oN-0003XB-5W for bug-gnu-emacs@gnu.org; Fri, 02 May 2014 01:15:09 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:58741) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wg5oN-0003Wk-25 for bug-gnu-emacs@gnu.org; Fri, 02 May 2014 01:15:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Wg5oL-0002g1-RU for bug-gnu-emacs@gnu.org; Fri, 02 May 2014 01:15:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Nicolas Richard Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 02 May 2014 05:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17382 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17382-submit@debbugs.gnu.org id=B17382.139900765810200 (code B ref 17382); Fri, 02 May 2014 05:15:01 +0000 Original-Received: (at 17382) by debbugs.gnu.org; 2 May 2014 05:14:18 +0000 Original-Received: from localhost ([127.0.0.1]:47859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wg5nd-0002eS-W3 for submit@debbugs.gnu.org; Fri, 02 May 2014 01:14:18 -0400 Original-Received: from mxin.ulb.ac.be ([164.15.128.112]:33762) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wg5na-0002e9-J8 for 17382@debbugs.gnu.org; Fri, 02 May 2014 01:14:15 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApEHAPMoY1OkD4Xx/2dsb2JhbABarnYFAZoKgSl0giUBAQV5EAsOCgklDwEESQESiCwBFKZsnAgBhxwXhVaBf4Z9B4Q5AQOfeowkgzU7 Original-Received: from mathsrv4.ulb.ac.be (HELO geodiff-mac3.ulb.ac.be) ([164.15.133.241]) by smtp.ulb.ac.be with ESMTP; 02 May 2014 07:14:13 +0200 In-Reply-To: (Glenn Morris's message of "Thu, 01 May 2014 20:01:08 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.90 (gnu/linux) 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:88509 Archived-At: Glenn Morris writes: > Rafal Kowalski wrote: >> While ediffing two buffers with 4 different regions, got an error >> related to an overlay in the 3rd chunk (see below). Ediff was not able >> to skip to the next region nor to exit the ediff session. I'd guess this is #17257 Rafal, can you try the following patch and see if it fixes the problem for you ? 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.