From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 12 Sep 2001 14:00:41 +0000 (+0000)
Subject: (ediff-get-meta-info): Take into account that data
X-Git-Tag: emacs-pretest-21.0.106~140
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1b39996d23e3ae7e0936cd7065b06289b6b43cbe;p=emacs.git

(ediff-get-meta-info): Take into account that data
from `ediff-meta-info' properties need not be an overlay.  From
David Ponce <dponce@voila.fr>.
---

diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 85ac72ee464..83ed80b74b2 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -1968,7 +1968,8 @@ If this is a session registry buffer then just bury it."
 			  olist))
 	    (while (and olist
 			(or (null (car olist))
-			    (overlay-get (car olist) 'invisible)))
+			    (and (overlayp (car olist))
+				 (overlay-get (car olist) 'invisible))))
 	      (setq olist (cdr olist)))
 	    (setq result (car olist)))))
     (if result