Mercurial > emacs
changeset 39258:a8be9f0afdee
(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>.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Wed, 12 Sep 2001 14:00:41 +0000 |
| parents | e5bb9e09ac4d |
| children | 6a1a2328f550 |
| files | lisp/ediff-mult.el |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff-mult.el Wed Sep 12 13:10:08 2001 +0000 +++ b/lisp/ediff-mult.el Wed Sep 12 14:00:41 2001 +0000 @@ -1968,7 +1968,8 @@ 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