From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 15 Aug 2001 11:03:41 +0000 (+0000)
Subject: (ediff-get-meta-info): Fix the condition
X-Git-Tag: emacs-pretest-21.0.105~177
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e6f08e6f06e9058fc0f802ec58d8849c8b266ca;p=emacs.git

(ediff-get-meta-info): Fix the condition
of a while-loop.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c104c8fbe6..91879e33634 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2001-08-15  Gerd Moellmann  <gerd@gnu.org>
 
+	* ediff-mult.el (ediff-get-meta-info): Fix the condition 
+	of a while-loop.
+
 	* Makefile.in (DONTCOMPILE): Remove sc.el.
 	
 	* Makefile.in (finder_setwins): Renamed from nonobsolete_setwins.
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