summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ediff-mult.el3
1 files changed, 2 insertions, 1 deletions
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