diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/ediff-mult.el | 7 |
2 files changed, 7 insertions, 3 deletions
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 |