Skip to content

GitLab

Commit cadc57d2 authored by Michael Kifer's avatar Michael Kifer
Browse files

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

parent 85481321
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
lisp/ChangeLog
View file @ cadc57d2
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> 2002-09-22 Richard M. Stallman <rms@gnu.org>
* international/mule-cmds.el (select-safe-coding-system): Cope if * international/mule-cmds.el (select-safe-coding-system): Cope if
......
lisp/ediff-init.el
View file @ cadc57d2
...@@ -1373,10 +1373,10 @@ This default should work without changes." ...@@ -1373,10 +1373,10 @@ This default should work without changes."
(cdr (assq 'unsplittable (frame-parameters frame)))) (cdr (assq 'unsplittable (frame-parameters frame))))
(defsubst ediff-get-next-window (wind prev-wind) (defsubst ediff-get-next-window (wind prev-wind)
(or (window-live-p wind) (cond ((window-live-p wind) wind)
(setq wind (if prev-wind (prev-wind (next-window wind))
(next-window wind) (t (selected-window))
(selected-window))))) ))
(defsubst ediff-kill-buffer-carefully (buf) (defsubst ediff-kill-buffer-carefully (buf)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment