Mercurial > emacs

changeset 38824:3dab620fa384

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(ediff-get-meta-info): Fix the condition of a while-loop.
author Gerd Moellmann <gerd@gnu.org>
date Wed, 15 Aug 2001 11:03:18 +0000
parents c0ba1d102e9d
children 6a0bd207233e
files lisp/ediff-mult.el
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ediff-mult.el	Wed Aug 15 09:31:06 2001 +0000
+++ b/lisp/ediff-mult.el	Wed Aug 15 11:03:18 2001 +0000
@@ -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 @@
 	    (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