/[emacs]/emacs/lisp/ediff-init.el
ViewVC logotype

Diff of /emacs/lisp/ediff-init.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.59 by kifer, Wed Sep 18 04:23:27 2002 UTC revision 1.60 by kifer, Mon Sep 23 06:07:34 2002 UTC
# Line 1373  This default should work without changes Line 1373  This default should work without changes
1373    (cdr (assq 'unsplittable (frame-parameters frame))))    (cdr (assq 'unsplittable (frame-parameters frame))))
1374    
1375  (defsubst ediff-get-next-window (wind prev-wind)  (defsubst ediff-get-next-window (wind prev-wind)
1376    (or (window-live-p wind)    (cond ((window-live-p wind) wind)
1377        (setq wind (if prev-wind          (prev-wind (next-window wind))
1378                       (next-window wind)          (t (selected-window))
1379                     (selected-window)))))          ))
1380    
1381    
1382  (defsubst ediff-kill-buffer-carefully (buf)  (defsubst ediff-kill-buffer-carefully (buf)

Legend:
Removed from v.1.59  
changed lines
  Added in v.1.60

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26