Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-wind.el @ 110:fe104dbd9147 r20-1b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-1b7
author cvs
date Mon, 13 Aug 2007 09:19:45 +0200
parents 6a378aca36af
children 34a5b81f86ba
comparison
equal deleted inserted replaced
109:e183fc049578 110:fe104dbd9147
533 (setq done-A t 533 (setq done-A t
534 done-B t))) 534 done-B t)))
535 535
536 (if use-same-frame 536 (if use-same-frame
537 (let ((window-min-height 1)) 537 (let ((window-min-height 1))
538 ;; avoid dedicated and non-splittable windows 538 (if (and (eq frame-A frame-B)
539 (ediff-skip-unsuitable-frames) 539 (eq frame-B frame-C)
540 (frame-live-p frame-A))
541 (select-frame frame-A)
542 ;; avoid dedicated and non-splittable windows
543 (ediff-skip-unsuitable-frames))
540 (delete-other-windows) 544 (delete-other-windows)
541 (setq merge-window-lines 545 (setq merge-window-lines
542 (max 2 (round (* (window-height) merge-window-share)))) 546 (max 2 (round (* (window-height) merge-window-share))))
543 (switch-to-buffer buf-A) 547 (switch-to-buffer buf-A)
544 (setq wind-A (selected-window)) 548 (setq wind-A (selected-window))
696 (setq wind-C (selected-window)) 700 (setq wind-C (selected-window))
697 (setq done-C t))) 701 (setq done-C t)))
698 702
699 (if use-same-frame 703 (if use-same-frame
700 (let (wind-width-or-height) ; this affects 3way setups only 704 (let (wind-width-or-height) ; this affects 3way setups only
701 ;; avoid dedicated and non-splittable windows 705 (if (and (eq frame-A frame-B) (frame-live-p frame-A))
702 (ediff-skip-unsuitable-frames) 706 (select-frame frame-A)
707 ;; avoid dedicated and non-splittable windows
708 (ediff-skip-unsuitable-frames))
703 (delete-other-windows) 709 (delete-other-windows)
704 (switch-to-buffer buf-A) 710 (switch-to-buffer buf-A)
705 (setq wind-A (selected-window)) 711 (setq wind-A (selected-window))
706 712
707 (if three-way-comparison 713 (if three-way-comparison