diff options
Diffstat (limited to 'lisp/vc/ediff-wind.el')
| -rw-r--r-- | lisp/vc/ediff-wind.el | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index bd3f6880da1..d45e13ea725 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -1,6 +1,6 @@ ;;; ediff-wind.el --- window manipulation utilities -*- lexical-binding:t -*- -;; Copyright (C) 1994-1997, 2000-2022 Free Software Foundation, Inc. +;; Copyright (C) 1994-2022 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: ediff @@ -24,23 +24,11 @@ ;;; Code: - -;; Compiler pacifier (defvar icon-title-format) -(defvar top-toolbar-height) -(defvar bottom-toolbar-height) -(defvar left-toolbar-height) -(defvar right-toolbar-height) -(defvar left-toolbar-width) -(defvar right-toolbar-width) -(defvar default-menubar) -(defvar top-gutter) -(defvar frame-icon-title-format) (defvar ediff-diff-status) (require 'ediff-init) (require 'ediff-help) -;; end pacifier (defgroup ediff-window nil "Ediff window manipulation." @@ -261,8 +249,8 @@ keyboard input to go into icons." (let (event) (message "Select windows by clicking. Please click on Window %d " wind-number) - (while (not (ediff-mouse-event-p (setq event - (read--potential-mouse-event)))) + (while (not (mouse-event-p (setq event + (read--potential-mouse-event)))) (if (sit-for 1) ; if sequence of events, wait till the final word (beep 1)) (message "Please click on Window %d " wind-number)) @@ -846,7 +834,7 @@ keyboard input to go into icons." Create a new splittable frame if none is found." (if (display-graphic-p) (let ((wind-frame (window-frame)) - seen-windows) + seen-windows) (while (and (not (memq (selected-window) seen-windows)) (or (ediff-frame-has-dedicated-windows wind-frame) @@ -855,8 +843,8 @@ Create a new splittable frame if none is found." (< (frame-height wind-frame) (* 3 window-min-height)) (if ok-unsplittable - nil - (ediff-frame-unsplittable-p wind-frame)))) + nil + (cdr (assq 'unsplittable (frame-parameters wind-frame)))))) ;; remember history (setq seen-windows (cons (selected-window) seen-windows)) ;; try new window |