summaryrefslogtreecommitdiff
path: root/lisp/ediff-mult.el
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2001-08-15 11:03:41 +0000
committerGerd Moellmann <gerd@gnu.org>2001-08-15 11:03:41 +0000
commit3e6f08e6f06e9058fc0f802ec58d8849c8b266ca (patch)
tree8d2485a1c30e7ba59bb61926778bea8d2c32e7ef /lisp/ediff-mult.el
parent93aba6fcd408d876343aca2f02692e52de6df4bc (diff)
downloademacs-3e6f08e6f06e9058fc0f802ec58d8849c8b266ca.tar.gz
(ediff-get-meta-info): Fix the condition
of a while-loop.
Diffstat (limited to 'lisp/ediff-mult.el')
-rw-r--r--lisp/ediff-mult.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 7115a2671f8..85ac72ee464 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -1,6 +1,6 @@
;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
-;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.sunysb.edu>
@@ -1966,8 +1966,9 @@ If this is a session registry buffer then just bury it."
(setq olist
(mapcar (lambda (elt) (overlay-get elt 'ediff-meta-info))
olist))
- (while (and olist (null (car olist))
- (overlay-get (car olist) 'invisible))
+ (while (and olist
+ (or (null (car olist))
+ (overlay-get (car olist) 'invisible)))
(setq olist (cdr olist)))
(setq result (car olist)))))
(if result