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

[Michael Kifer]

Index: emacs/lisp/ediff-wind.el
diff -c emacs/lisp/ediff-wind.el:1.30 emacs/lisp/ediff-wind.el:1.31
*** emacs/lisp/ediff-wind.el:1.30       Mon Dec 24 00:50:31 2001
--- emacs/lisp/ediff-wind.el    Mon Jan  7 23:36:01 2002
***************
*** 1,8 ****
  ;;; ediff-wind.el --- window manipulation utilities
  
! ;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
  
! ;; Author: Michael Kifer <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
--- 1,8 ----
  ;;; ediff-wind.el --- window manipulation utilities
  
! ;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02 Free Software Foundation, Inc.
  
! ;; Author: Michael Kifer <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
***************
*** 36,41 ****
--- 36,42 ----
  (defvar left-toolbar-width)
  (defvar right-toolbar-width)
  (defvar default-menubar)
+ (defvar top-gutter)
  (defvar frame-icon-title-format)
  (defvar ediff-diff-status)
  (defvar ediff-emacs-p)
***************
*** 271,305 ****
          (beep 1))
        (message "Please click on Window %d " wind-number))
      (ediff-read-event) ; discard event
!     (setq wind (if ediff-xemacs-p
!                  (event-window event)
!                (posn-window (event-start event))))
      ))
        
  
  ;; Select the lowest window on the frame.
  (defun ediff-select-lowest-window ()
!   (if ediff-xemacs-p
!       (select-window (frame-lowest-window))
!     (let* ((lowest-window (selected-window))
!          (bottom-edge (car (cdr (cdr (cdr (window-edges))))))
!          (last-window (save-excursion
!                         (other-window -1) (selected-window)))
!          (window-search t))
!       (while window-search
!       (let* ((this-window (next-window))
!              (next-bottom-edge
!               (car (cdr (cdr (cdr (window-edges this-window)))))))
!         (if (< bottom-edge next-bottom-edge)
!             (progn
!               (setq bottom-edge next-bottom-edge)
!               (setq lowest-window this-window)))
!         
!         (select-window this-window)
!         (if (eq last-window this-window)
!             (progn
!               (select-window lowest-window)
!               (setq window-search nil))))))))
  
  
  ;;; Common window setup routines
--- 272,310 ----
          (beep 1))
        (message "Please click on Window %d " wind-number))
      (ediff-read-event) ; discard event
!     (setq wind (ediff-cond-compile-for-xemacs-or-emacs
!               (event-window event) ; xemacs
!               (posn-window (event-start event)) ; emacs
!               )
!         )
      ))
        
  
  ;; Select the lowest window on the frame.
  (defun ediff-select-lowest-window ()
!   (ediff-cond-compile-for-xemacs-or-emacs
!    (select-window (frame-lowest-window)) ; xemacs
!    ;; emacs
!    (let* ((lowest-window (selected-window))
!         (bottom-edge (car (cdr (cdr (cdr (window-edges))))))
!         (last-window (save-excursion
!                        (other-window -1) (selected-window)))
!         (window-search t))
!      (while window-search
!        (let* ((this-window (next-window))
!             (next-bottom-edge
!              (car (cdr (cdr (cdr (window-edges this-window)))))))
!        (if (< bottom-edge next-bottom-edge)
!            (progn
!              (setq bottom-edge next-bottom-edge)
!              (setq lowest-window this-window)))
!        
!        (select-window this-window)
!        (if (eq last-window this-window)
!            (progn
!              (select-window lowest-window)
!              (setq window-search nil))))))
!    ))
  
  
  ;;; Common window setup routines
***************
*** 845,851 ****
                     (ediff-frame-has-dedicated-windows (selected-frame))
                     (ediff-frame-iconified-p (selected-frame))
                     ;; skip small windows
!                    (< (window-height (selected-window))
                        (* 3 window-min-height))
                     (if ok-unsplittable
                         nil
--- 850,856 ----
                     (ediff-frame-has-dedicated-windows (selected-frame))
                     (ediff-frame-iconified-p (selected-frame))
                     ;; skip small windows
!                    (< (frame-height (selected-frame))
                        (* 3 window-min-height))
                     (if ok-unsplittable
                         nil
***************
*** 896,902 ****
        fheight fwidth adjusted-parameters)
        
      (ediff-with-current-buffer ctl-buffer
!       (if ediff-xemacs-p (set-buffer-menubar nil))
        ;;(setq user-grabbed-mouse (ediff-user-grabbed-mouse))
        (run-hooks 'ediff-before-setup-control-frame-hook))
    
--- 901,910 ----
        fheight fwidth adjusted-parameters)
        
      (ediff-with-current-buffer ctl-buffer
!       (ediff-cond-compile-for-xemacs-or-emacs
!        (set-buffer-menubar nil) ; xemacs
!        nil ; emacs
!        )
        ;;(setq user-grabbed-mouse (ediff-user-grabbed-mouse))
        (run-hooks 'ediff-before-setup-control-frame-hook))
    
***************
*** 908,915 ****
            ediff-control-frame ctl-frame)
        ;; protect against undefined face-attribute
        (condition-case nil
!         (when (and ediff-emacs-p (face-attribute 'mode-line :box))
!           (set-face-attribute 'mode-line ctl-frame :box nil))
        (error))
        )
      
--- 916,926 ----
            ediff-control-frame ctl-frame)
        ;; protect against undefined face-attribute
        (condition-case nil
!         (ediff-cond-compile-for-xemacs-or-emacs
!          nil ; xemacs
!          (when (face-attribute 'mode-line :box)
!            (set-face-attribute 'mode-line ctl-frame :box nil))
!          )
        (error))
        )
      
***************
*** 955,968 ****
      ;; In XEmacs, buffer menubar needs to be killed before frame parameters
      ;; are changed.
      (if (ediff-has-toolbar-support-p)
!       (progn
!         (set-specifier top-toolbar-height (list ctl-frame 2))
!         (sit-for 0)
!         (set-specifier top-toolbar-height (list ctl-frame 0))
!         ;;(set-specifier bottom-toolbar-height (list ctl-frame 0))
!         (set-specifier left-toolbar-width (list ctl-frame 0))
!         (set-specifier right-toolbar-width (list ctl-frame 0))
!         ))
      
      ;; Under OS/2 (emx) we have to call modify frame parameters twice, in 
order
      ;; to make sure that at least once we do it for non-iconified frame.  If
--- 966,984 ----
      ;; In XEmacs, buffer menubar needs to be killed before frame parameters
      ;; are changed.
      (if (ediff-has-toolbar-support-p)
!       (ediff-cond-compile-for-xemacs-or-emacs
!        (progn ; xemacs
!          (set-specifier top-toolbar-height (list ctl-frame 2))
!          (set-specifier top-gutter (list ctl-frame nil))
!          (sit-for 0)
!          (set-specifier top-toolbar-height (list ctl-frame 0))
!          ;;(set-specifier bottom-toolbar-height (list ctl-frame 0))
!          (set-specifier left-toolbar-width (list ctl-frame 0))
!          (set-specifier right-toolbar-width (list ctl-frame 0))
!          )
!        nil ; emacs
!        )
!       )
      
      ;; Under OS/2 (emx) we have to call modify frame parameters twice, in 
order
      ;; to make sure that at least once we do it for non-iconified frame.  If
***************
*** 1018,1025 ****
        
      (if ediff-xemacs-p
        (ediff-with-current-buffer ctl-buffer
!         (if ediff-xemacs-p
!             (make-local-hook 'select-frame-hook))
          (add-hook
           'select-frame-hook 'ediff-xemacs-select-frame-hook nil 'local)
          ))
--- 1034,1043 ----
        
      (if ediff-xemacs-p
        (ediff-with-current-buffer ctl-buffer
!         (ediff-cond-compile-for-xemacs-or-emacs
!          (make-local-hook 'select-frame-hook) ; xemacs
!          nil     ; emacs
!          )
          (add-hook
           'select-frame-hook 'ediff-xemacs-select-frame-hook nil 'local)
          ))
***************
*** 1033,1040 ****
    (ediff-with-current-buffer ctl-buffer
      (if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
        (let ((ctl-frame ediff-control-frame))
!         (if ediff-xemacs-p
!             (set-buffer-menubar default-menubar))
          (setq ediff-control-frame nil)
          (delete-frame ctl-frame)
          )))
--- 1051,1060 ----
    (ediff-with-current-buffer ctl-buffer
      (if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
        (let ((ctl-frame ediff-control-frame))
!         (ediff-cond-compile-for-xemacs-or-emacs
!          (set-buffer-menubar default-menubar) ; xemacs
!          nil ; emacs
!          )
          (setq ediff-control-frame nil)
          (delete-frame ctl-frame)
          )))