GNU bug report logs - #17382
24.3.90; Ediff mode is broken

Previous Next

Package: emacs;

Reported by: Rafal Kowalski <rafal.kowalski <at> mac.com>

Date: Thu, 1 May 2014 17:07:01 UTC

Severity: normal

Merged with 17257, 17259, 17265, 17273, 17285, 17287, 17491

Found in versions 24.3.90, 24.4.50

Fixed in versions 24.3.91, 24.4

Done: Stefan Monnier <monnier <at> IRO.UMontreal.CA>

Bug is archived. No further changes may be made.

Full log

View this message in rfc822 format

From: Nicolas Richard <theonewiththeevillook <at> yahoo.fr>
To: Glenn Morris <rgm <at> gnu.org>, Rafal Kowalski <rafal.kowalski <at> mac.com>
Cc: 17382 <at> debbugs.gnu.org
Subject: bug#17382: 24.3.90; Ediff mode is broken
Date: Fri, 02 May 2014 07:15:00 +0200

Glenn Morris <rgm <at> gnu.org> 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.
This bug report was last modified 11 years and 8 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.