[Emacs-diffs] Changes to emacs/lisp/ediff-init.el

[Michael Kifer]

Index: emacs/lisp/ediff-init.el
diff -c emacs/lisp/ediff-init.el:1.59 emacs/lisp/ediff-init.el:1.60
*** emacs/lisp/ediff-init.el:1.59       Wed Sep 18 00:23:27 2002
--- emacs/lisp/ediff-init.el    Mon Sep 23 02:07:34 2002
***************
*** 1373,1382 ****
    (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)))))
  
  
  (defsubst ediff-kill-buffer-carefully (buf)
--- 1373,1382 ----
    (cdr (assq 'unsplittable (frame-parameters frame))))
  
  (defsubst ediff-get-next-window (wind prev-wind)
!   (cond ((window-live-p wind) wind)
!       (prev-wind (next-window wind))
!       (t (selected-window))
!       ))
  
  
  (defsubst ediff-kill-buffer-carefully (buf)