aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-09-12 14:00:41 +0000
committerGerd Moellmann2001-09-12 14:00:41 +0000
commit1b39996d23e3ae7e0936cd7065b06289b6b43cbe (patch)
tree0c4cc7830dc47f65196a6a9f39cca4420e2cc1ca
parenteaa493dfe68750d0bc7782fd7aae89b5726d2719 (diff)
downloademacs-1b39996d23e3ae7e0936cd7065b06289b6b43cbe.tar.gz
emacs-1b39996d23e3ae7e0936cd7065b06289b6b43cbe.zip
(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>.
-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."
1968 olist)) 1968 olist))
1969 (while (and olist 1969 (while (and olist
1970 (or (null (car olist)) 1970 (or (null (car olist))
1971 (overlay-get (car olist) 'invisible))) 1971 (and (overlayp (car olist))
1972 (overlay-get (car olist) 'invisible))))
1972 (setq olist (cdr olist))) 1973 (setq olist (cdr olist)))
1973 (setq result (car olist))))) 1974 (setq result (car olist)))))
1974 (if result 1975 (if result