From cadc57d2e48ccb9faa80ca72db81a95ffa19197b Mon Sep 17 00:00:00 2001 From: Michael Kifer Date: Mon, 23 Sep 2002 06:07:34 +0000 Subject: [PATCH] * ediff-init.el (ediff-get-next-window): bug fix. --- lisp/ChangeLog | 4 ++++ lisp/ediff-init.el | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b4a17dc047..16a3d5e99d4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2002-09-23 Michael Kifer + + * ediff-init.el (ediff-get-next-window): bug fix. + 2002-09-22 Richard M. Stallman * international/mule-cmds.el (select-safe-coding-system): Cope if diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 7b540ad710c..01c9b1e129a 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -1373,10 +1373,10 @@ This default should work without changes." (cdr (assq 'unsplittable (frame-parameters frame)))) (defsubst ediff-get-next-window (wind prev-wind) - (or (window-live-p wind) - (setq wind (if prev-wind - (next-window wind) - (selected-window))))) + (cond ((window-live-p wind) wind) + (prev-wind (next-window wind)) + (t (selected-window)) + )) (defsubst ediff-kill-buffer-carefully (buf) -- 2.39.2