diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-09-23 06:07:34 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-09-23 06:07:34 +0000 |
| commit | cadc57d2e48ccb9faa80ca72db81a95ffa19197b (patch) | |
| tree | 57c9b66b256d0850efb28f05f57ac9b8e1034da7 /lisp/ediff-init.el | |
| parent | 854813211c48f836a69817021e937a15fa8e5887 (diff) | |
| download | emacs-cadc57d2e48ccb9faa80ca72db81a95ffa19197b.tar.gz | |
* ediff-init.el (ediff-get-next-window): bug fix.
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) |