diff options
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 8 |
1 files changed, 4 insertions, 4 deletions
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) |