Mercurial > emacs
changeset 47583:332e69c0d7dc
* ediff-init.el (ediff-get-next-window): bug fix.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Mon, 23 Sep 2002 06:07:34 +0000 |
| parents | c15bf1d4d32d |
| children | 9d26bf959510 |
| files | lisp/ChangeLog lisp/ediff-init.el |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Sep 23 04:59:08 2002 +0000 +++ b/lisp/ChangeLog Mon Sep 23 06:07:34 2002 +0000 @@ -1,3 +1,7 @@ +2002-09-23 Michael Kifer <kifer@cs.stonybrook.edu> + + * ediff-init.el (ediff-get-next-window): bug fix. + 2002-09-22 Richard M. Stallman <rms@gnu.org> * international/mule-cmds.el (select-safe-coding-system): Cope if
--- a/lisp/ediff-init.el Mon Sep 23 04:59:08 2002 +0000 +++ b/lisp/ediff-init.el Mon Sep 23 06:07:34 2002 +0000 @@ -1373,10 +1373,10 @@ (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)