procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* ediff-init.el (ediff-get-next-window): bug fix.

Browse source
This commit is contained in:
Michael Kifer 2002-09-23 06:07:34 +00:00
parent 854813211c
commit cadc57d2e4
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -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

8
lisp/ediff-init.el
View file

@ -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)