Mercurial > emacs
annotate lisp/ediff-wind.el @ 31321:648bbc1ab413
*** empty log message ***
author | Dave Love <fx@gnu.org> |
---|---|
date | Fri, 01 Sep 2000 14:06:45 +0000 |
parents | ebf68f69b586 |
children | d8593bb2af46 |
rev | line source |
---|---|
11042 | 1 ;;; ediff-wind.el --- window manipulation utilities |
14169 | 2 |
18054 | 3 ;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. |
11042 | 4 |
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> | |
6 | |
7 ;; This file is part of GNU Emacs. | |
8 | |
9 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
10 ;; it under the terms of the GNU General Public License as published by | |
11 ;; the Free Software Foundation; either version 2, or (at your option) | |
12 ;; any later version. | |
13 | |
14 ;; GNU Emacs is distributed in the hope that it will be useful, | |
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 ;; GNU General Public License for more details. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
14169 | 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
22 ;; Boston, MA 02111-1307, USA. | |
11042 | 23 |
14169 | 24 ;;; Code: |
18054 | 25 |
26 (provide 'ediff-wind) | |
11042 | 27 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
28 ;; Compiler pacifier |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
29 (defvar icon-title-format) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
30 (defvar top-toolbar-height) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
31 (defvar bottom-toolbar-height) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
32 (defvar left-toolbar-height) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
33 (defvar right-toolbar-height) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
34 (defvar left-toolbar-width) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
35 (defvar right-toolbar-width) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
36 (defvar default-menubar) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
37 (defvar frame-icon-title-format) |
18054 | 38 (defvar ediff-diff-status) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
39 (defvar ediff-emacs-p) |
18054 | 40 |
41 (eval-when-compile | |
42 (let ((load-path (cons (expand-file-name ".") load-path))) | |
43 (or (featurep 'ediff-init) | |
44 (load "ediff-init.el" nil nil 'nosuffix)) | |
45 (or (featurep 'ediff-util) | |
46 (load "ediff-util.el" nil nil 'nosuffix)) | |
47 (or (featurep 'ediff-help) | |
48 (load "ediff-help.el" nil nil 'nosuffix)) | |
49 (or (featurep 'ediff-tbar) | |
21940 | 50 ediff-emacs-p |
18054 | 51 (load "ediff-tbar.el" 'noerror nil 'nosuffix)) |
52 )) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
53 ;; end pacifier |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
54 |
18054 | 55 (require 'ediff-init) |
11042 | 56 |
18054 | 57 ;; be careful with ediff-tbar |
58 (if ediff-xemacs-p | |
59 (condition-case nil | |
60 (require 'ediff-tbar) | |
61 (error | |
62 (defun ediff-compute-toolbar-width () 0))) | |
63 (defun ediff-compute-toolbar-width () 0)) | |
64 | |
65 (defgroup ediff-window nil | |
66 "Ediff window manipulation" | |
67 :prefix "ediff-" | |
68 :group 'ediff | |
69 :group 'frames) | |
70 | |
71 | |
72 (defcustom ediff-window-setup-function (if (ediff-window-display-p) | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
73 'ediff-setup-windows-multiframe |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
74 'ediff-setup-windows-plain) |
11042 | 75 "*Function called to set up windows. |
26934 | 76 Ediff provides a choice of two functions: `ediff-setup-windows-plain', for |
77 doing everything in one frame, and `ediff-setup-windows-multiframe', | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
78 which sets the control panel in a separate frame. Also, if the latter |
11042 | 79 function detects that one of the buffers A/B is seen in some other frame, |
80 it will try to keep that buffer in that frame. | |
81 | |
82 If you don't like the two functions provided---write your own one. | |
83 The basic guidelines: | |
84 1. It should leave the control buffer current and the control window | |
26934 | 85 selected. |
86 2. It should set `ediff-window-A', `ediff-window-B', `ediff-window-C', | |
87 and `ediff-control-window' to contain window objects that display | |
11042 | 88 the corresponding buffers. |
89 3. It should accept the following arguments: | |
90 buffer-A, buffer-B, buffer-C, control-buffer | |
91 Buffer C may not be used in jobs that compare only two buffers. | |
92 If you plan to do something fancy, take a close look at how the two | |
18054 | 93 provided functions are written." |
94 :type 'function | |
95 :group 'ediff-window) | |
11042 | 96 |
97 ;; indicates if we are in a multiframe setup | |
98 (ediff-defvar-local ediff-multiframe nil "") | |
99 | |
100 ;; Share of the frame occupied by the merge window (buffer C) | |
101 (ediff-defvar-local ediff-merge-window-share 0.45 "") | |
102 | |
103 ;; The control window. | |
104 (ediff-defvar-local ediff-control-window nil "") | |
105 ;; Official window for buffer A | |
106 (ediff-defvar-local ediff-window-A nil "") | |
107 ;; Official window for buffer B | |
108 (ediff-defvar-local ediff-window-B nil "") | |
109 ;; Official window for buffer C | |
110 (ediff-defvar-local ediff-window-C nil "") | |
111 ;; Ediff's window configuration. | |
112 ;; Used to minimize the need to rearrange windows. | |
113 (ediff-defvar-local ediff-window-config-saved "" "") | |
114 | |
19047 | 115 ;; Association between buff-type and ediff-window-* |
116 (defconst ediff-window-alist | |
117 '((A . ediff-window-A) | |
118 (?A . ediff-window-A) | |
119 (B . ediff-window-B) | |
120 (?B . ediff-window-B) | |
121 (C . ediff-window-C) | |
122 (?C . ediff-window-C))) | |
123 | |
11042 | 124 |
18054 | 125 (defcustom ediff-split-window-function 'split-window-vertically |
11042 | 126 "*The function used to split the main window between buffer-A and buffer-B. |
127 You can set it to a horizontal split instead of the default vertical split | |
128 by setting this variable to `split-window-horizontally'. | |
129 You can also have your own function to do fancy splits. | |
130 This variable has no effect when buffer-A/B are shown in different frames. | |
18054 | 131 In this case, Ediff will use those frames to display these buffers." |
132 :type 'function | |
133 :group 'ediff-window) | |
11042 | 134 |
18054 | 135 (defcustom ediff-merge-split-window-function 'split-window-horizontally |
11042 | 136 "*The function used to split the main window between buffer-A and buffer-B. |
137 You can set it to a vertical split instead of the default horizontal split | |
138 by setting this variable to `split-window-vertically'. | |
139 You can also have your own function to do fancy splits. | |
140 This variable has no effect when buffer-A/B/C are shown in different frames. | |
18054 | 141 In this case, Ediff will use those frames to display these buffers." |
142 :type 'function | |
143 :group 'ediff-window) | |
11042 | 144 |
145 (defconst ediff-control-frame-parameters | |
26934 | 146 (list |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
147 '(name . "Ediff") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
148 ;;'(unsplittable . t) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
149 '(minibuffer . nil) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
150 '(user-position . t) ; Emacs only |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
151 '(vertical-scroll-bars . nil) ; Emacs only |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
152 '(scrollbar-width . 0) ; XEmacs only |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
153 '(menu-bar-lines . 0) ; Emacs only |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
154 ;; don't lower and auto-raise |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
155 '(auto-lower . nil) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
156 '(auto-raise . t) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
157 '(visibility . nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
158 ;; make initial frame small to avoid distraction |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
159 '(width . 1) '(height . 1) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
160 ;; this blocks queries from window manager as to where to put |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
161 ;; ediff's control frame. we put the frame outside the display, |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
162 ;; so the initial frame won't jump all over the screen |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
163 (cons 'top (if (fboundp 'ediff-display-pixel-height) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
164 (1+ (ediff-display-pixel-height)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
165 3000)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
166 (cons 'left (if (fboundp 'ediff-display-pixel-width) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
167 (1+ (ediff-display-pixel-width)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
168 3000)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
169 ) |
11042 | 170 "Frame parameters for displaying Ediff Control Panel. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
171 Used internally---not a user option.") |
11042 | 172 |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
173 ;; position of the mouse; used to decide whether to warp the mouse into ctl |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
174 ;; frame |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
175 (ediff-defvar-local ediff-mouse-pixel-position nil "") |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
176 |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
177 ;; not used for now |
13948
60556fda3e6f
(ediff-mouse-pixel-threshold): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
13132
diff
changeset
|
178 (defvar ediff-mouse-pixel-threshold 30 |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
179 "If the user moves mouse more than this many pixels, Ediff won't warp mouse into control window.") |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
180 |
18054 | 181 (defcustom ediff-grab-mouse t |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
182 "*If t, Ediff will always grab the mouse and put it in the control frame. |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
183 If 'maybe, Ediff will do it sometimes, but not after operations that require |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
184 relatively long time. If nil, the mouse will be entirely user's |
18054 | 185 responsibility." |
186 :type 'boolean | |
187 :group 'ediff-window) | |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
188 |
18054 | 189 (defcustom ediff-control-frame-position-function 'ediff-make-frame-position |
11042 | 190 "Function to call to determine the desired location for the control panel. |
191 Expects three parameters: the control buffer, the desired width and height | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
192 of the control frame. It returns an association list |
18054 | 193 of the form \(\(top . <position>\) \(left . <position>\)\)" |
18839 | 194 :type 'function |
18054 | 195 :group 'ediff-window) |
11042 | 196 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
197 (defcustom ediff-control-frame-upward-shift 42 |
11042 | 198 "*The upward shift of control frame from the top of buffer A's frame. |
199 Measured in pixels. | |
200 This is used by the default control frame positioning function, | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
201 `ediff-make-frame-position'. This variable is provided for easy |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
202 customization of the default control frame positioning." |
18054 | 203 :type 'integer |
204 :group 'ediff-window) | |
11042 | 205 |
18054 | 206 (defcustom ediff-narrow-control-frame-leftward-shift (if ediff-xemacs-p 7 3) |
11042 | 207 "*The leftward shift of control frame from the right edge of buf A's frame. |
208 Measured in characters. | |
209 This is used by the default control frame positioning function, | |
210 `ediff-make-frame-position' to adjust the position of the control frame | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
211 when it shows the short menu. This variable is provided for easy |
18054 | 212 customization of the default." |
213 :type 'integer | |
214 :group 'ediff-window) | |
11042 | 215 |
18054 | 216 (defcustom ediff-wide-control-frame-rightward-shift 7 |
11042 | 217 "*The rightward shift of control frame from the left edge of buf A's frame. |
218 Measured in characters. | |
219 This is used by the default control frame positioning function, | |
220 `ediff-make-frame-position' to adjust the position of the control frame | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
221 when it shows the full menu. This variable is provided for easy |
18054 | 222 customization of the default." |
223 :type 'integer | |
224 :group 'ediff-window) | |
11042 | 225 |
226 | |
227 ;; Wide frame display | |
228 | |
229 ;; t means Ediff is using wide display | |
230 (ediff-defvar-local ediff-wide-display-p nil "") | |
231 ;; keeps frame config for toggling wide display | |
26934 | 232 (ediff-defvar-local ediff-wide-display-orig-parameters nil |
11042 | 233 "Frame parameters to be restored when the user wants to toggle the wide |
234 display off.") | |
235 (ediff-defvar-local ediff-wide-display-frame nil | |
236 "Frame to be used for wide display.") | |
237 (ediff-defvar-local ediff-make-wide-display-function 'ediff-make-wide-display | |
238 "The value is a function that is called to create a wide display. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
239 The function is called without arguments. It should resize the frame in |
11042 | 240 which buffers A, B, and C are to be displayed, and it should save the old |
241 frame parameters in `ediff-wide-display-orig-parameters'. | |
242 The variable `ediff-wide-display-frame' should be set to contain | |
243 the frame used for the wide display.") | |
244 | |
245 ;; Frame used for the control panel in a windowing system. | |
246 (ediff-defvar-local ediff-control-frame nil "") | |
247 | |
18054 | 248 (defcustom ediff-prefer-iconified-control-frame nil |
11042 | 249 "*If t, keep control panel iconified when help message is off. |
250 This has effect only on a windowing system. | |
13948
60556fda3e6f
(ediff-mouse-pixel-threshold): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
13132
diff
changeset
|
251 If t, hitting `?' to toggle control panel off iconifies it. |
11042 | 252 |
253 This is only useful in Emacs and only for certain kinds of window managers, | |
254 such as TWM and its derivatives, since the window manager must permit | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
255 keyboard input to go into icons. XEmacs completely ignores keyboard input |
18054 | 256 into icons, regardless of the window manager." |
257 :type 'boolean | |
258 :group 'ediff-window) | |
11042 | 259 |
260 ;;; Functions | |
261 | |
262 (defun ediff-get-window-by-clicking (wind prev-wind wind-number) | |
263 (let (event) | |
264 (message | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
265 "Select windows by clicking. Please click on Window %d " wind-number) |
11042 | 266 (while (not (ediff-mouse-event-p (setq event (ediff-read-event)))) |
267 (if (sit-for 1) ; if sequence of events, wait till the final word | |
268 (beep 1)) | |
269 (message "Please click on Window %d " wind-number)) | |
270 (ediff-read-event) ; discard event | |
271 (setq wind (if ediff-xemacs-p | |
272 (event-window event) | |
273 (posn-window (event-start event)))) | |
274 )) | |
275 | |
276 | |
27899
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26934
diff
changeset
|
277 ;; Select the lowest window on the frame. |
11042 | 278 (defun ediff-select-lowest-window () |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
279 (if ediff-xemacs-p |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
280 (select-window (frame-lowest-window)) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
281 (let* ((lowest-window (selected-window)) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
282 (bottom-edge (car (cdr (cdr (cdr (window-edges)))))) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
283 (last-window (save-excursion |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
284 (other-window -1) (selected-window))) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
285 (window-search t)) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
286 (while window-search |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
287 (let* ((this-window (next-window)) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
288 (next-bottom-edge |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
289 (car (cdr (cdr (cdr (window-edges this-window))))))) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
290 (if (< bottom-edge next-bottom-edge) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
291 (progn |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
292 (setq bottom-edge next-bottom-edge) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
293 (setq lowest-window this-window))) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
294 |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
295 (select-window this-window) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
296 (if (eq last-window this-window) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
297 (progn |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
298 (select-window lowest-window) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
299 (setq window-search nil)))))))) |
11042 | 300 |
301 | |
302 ;;; Common window setup routines | |
303 | |
304 ;; Set up the window configuration. If POS is given, set the points to | |
305 ;; the beginnings of the buffers. | |
306 ;; When 3way comparison is added, this will have to choose the appropriate | |
307 ;; setup function based on ediff-job-name | |
308 (defun ediff-setup-windows (buffer-A buffer-B buffer-C control-buffer) | |
309 ;; Make sure we are not in the minibuffer window when we try to delete | |
310 ;; all other windows. | |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
311 (run-hooks 'ediff-before-setup-windows-hook) |
11042 | 312 (if (eq (selected-window) (minibuffer-window)) |
313 (other-window 1)) | |
314 | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
315 ;; in case user did a no-no on a tty |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
316 (or (ediff-window-display-p) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
317 (setq ediff-window-setup-function 'ediff-setup-windows-plain)) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
318 |
11042 | 319 (or (ediff-keep-window-config control-buffer) |
26934 | 320 (funcall |
19047 | 321 (ediff-with-current-buffer control-buffer ediff-window-setup-function) |
11042 | 322 buffer-A buffer-B buffer-C control-buffer)) |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
323 (run-hooks 'ediff-after-setup-windows-hook)) |
11042 | 324 |
325 ;; Just set up 3 windows. | |
326 ;; Usually used without windowing systems | |
327 ;; With windowing, we want to use dedicated frames. | |
328 (defun ediff-setup-windows-plain (buffer-A buffer-B buffer-C control-buffer) | |
19047 | 329 (ediff-with-current-buffer control-buffer |
11042 | 330 (setq ediff-multiframe nil)) |
331 (if ediff-merge-job | |
332 (ediff-setup-windows-plain-merge | |
333 buffer-A buffer-B buffer-C control-buffer) | |
26934 | 334 (ediff-setup-windows-plain-compare |
11042 | 335 buffer-A buffer-B buffer-C control-buffer))) |
336 | |
337 (defun ediff-setup-windows-plain-merge (buf-A buf-B buf-C control-buffer) | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
338 ;; skip dedicated and unsplittable frames |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
339 (ediff-destroy-control-frame control-buffer) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
340 (let ((window-min-height 1) |
26934 | 341 split-window-function |
11042 | 342 merge-window-share merge-window-lines |
343 wind-A wind-B wind-C) | |
19047 | 344 (ediff-with-current-buffer control-buffer |
11042 | 345 (setq merge-window-share ediff-merge-window-share |
346 ;; this lets us have local versions of ediff-split-window-function | |
347 split-window-function ediff-split-window-function)) | |
348 (delete-other-windows) | |
349 (split-window-vertically) | |
350 (ediff-select-lowest-window) | |
351 (ediff-setup-control-buffer control-buffer) | |
352 | |
353 ;; go to the upper window and split it betw A, B, and possibly C | |
26934 | 354 (other-window 1) |
11042 | 355 (setq merge-window-lines |
356 (max 2 (round (* (window-height) merge-window-share)))) | |
357 (switch-to-buffer buf-A) | |
358 (setq wind-A (selected-window)) | |
359 | |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
360 ;; XEmacs used to have a lot of trouble with display |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
361 ;; It did't set things right unless we tell it to sit still |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
362 ;; 19.12 seems ok. |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
363 ;;(if ediff-xemacs-p (sit-for 0)) |
11042 | 364 |
365 (split-window-vertically (max 2 (- (window-height) merge-window-lines))) | |
26934 | 366 (if (eq (selected-window) wind-A) |
11042 | 367 (other-window 1)) |
368 (setq wind-C (selected-window)) | |
369 (switch-to-buffer buf-C) | |
370 | |
371 (select-window wind-A) | |
372 (funcall split-window-function) | |
373 | |
374 (if (eq (selected-window) wind-A) | |
375 (other-window 1)) | |
376 (switch-to-buffer buf-B) | |
377 (setq wind-B (selected-window)) | |
378 | |
19047 | 379 (ediff-with-current-buffer control-buffer |
11042 | 380 (setq ediff-window-A wind-A |
381 ediff-window-B wind-B | |
382 ediff-window-C wind-C)) | |
383 | |
384 (ediff-select-lowest-window) | |
385 (ediff-setup-control-buffer control-buffer) | |
386 )) | |
387 | |
388 | |
389 ;; This function handles all comparison jobs, including 3way jobs | |
390 (defun ediff-setup-windows-plain-compare (buf-A buf-B buf-C control-buffer) | |
391 ;; skip dedicated and unsplittable frames | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
392 (ediff-destroy-control-frame control-buffer) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
393 (let ((window-min-height 1) |
11042 | 394 split-window-function wind-width-or-height |
395 three-way-comparison | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
396 wind-A-start wind-B-start wind-A wind-B wind-C) |
19047 | 397 (ediff-with-current-buffer control-buffer |
11042 | 398 (setq wind-A-start (ediff-overlay-start |
399 (ediff-get-value-according-to-buffer-type | |
400 'A ediff-narrow-bounds)) | |
401 wind-B-start (ediff-overlay-start | |
402 (ediff-get-value-according-to-buffer-type | |
403 'B ediff-narrow-bounds)) | |
404 ;; this lets us have local versions of ediff-split-window-function | |
405 split-window-function ediff-split-window-function | |
406 three-way-comparison ediff-3way-comparison-job)) | |
407 (delete-other-windows) | |
408 (split-window-vertically) | |
409 (ediff-select-lowest-window) | |
410 (ediff-setup-control-buffer control-buffer) | |
411 | |
412 ;; go to the upper window and split it betw A, B, and possibly C | |
26934 | 413 (other-window 1) |
11042 | 414 (switch-to-buffer buf-A) |
415 (setq wind-A (selected-window)) | |
416 (if three-way-comparison | |
417 (setq wind-width-or-height | |
418 (/ (if (eq split-window-function 'split-window-vertically) | |
419 (window-height wind-A) | |
420 (window-width wind-A)) | |
421 3))) | |
422 | |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
423 ;; XEmacs used to have a lot of trouble with display |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
424 ;; It did't set things right unless we told it to sit still |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
425 ;; 19.12 seems ok. |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
426 ;;(if ediff-xemacs-p (sit-for 0)) |
11042 | 427 |
428 (funcall split-window-function wind-width-or-height) | |
429 | |
430 (if (eq (selected-window) wind-A) | |
431 (other-window 1)) | |
432 (switch-to-buffer buf-B) | |
433 (setq wind-B (selected-window)) | |
434 | |
435 (if three-way-comparison | |
436 (progn | |
437 (funcall split-window-function) ; equally | |
438 (if (eq (selected-window) wind-B) | |
439 (other-window 1)) | |
440 (switch-to-buffer buf-C) | |
441 (setq wind-C (selected-window)))) | |
442 | |
19047 | 443 (ediff-with-current-buffer control-buffer |
11042 | 444 (setq ediff-window-A wind-A |
445 ediff-window-B wind-B | |
446 ediff-window-C wind-C)) | |
447 | |
448 ;; It is unlikely that we will want to implement 3way window comparison. | |
449 ;; So, only buffers A and B are used here. | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
450 (if ediff-windows-job |
11042 | 451 (progn |
452 (set-window-start wind-A wind-A-start) | |
453 (set-window-start wind-B wind-B-start))) | |
454 | |
455 (ediff-select-lowest-window) | |
456 (ediff-setup-control-buffer control-buffer) | |
457 )) | |
458 | |
459 | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
460 ;; dispatch an appropriate window setup function |
11042 | 461 (defun ediff-setup-windows-multiframe (buf-A buf-B buf-C control-buf) |
19047 | 462 (ediff-with-current-buffer control-buf |
11042 | 463 (setq ediff-multiframe t)) |
464 (if ediff-merge-job | |
465 (ediff-setup-windows-multiframe-merge buf-A buf-B buf-C control-buf) | |
466 (ediff-setup-windows-multiframe-compare buf-A buf-B buf-C control-buf))) | |
467 | |
468 (defun ediff-setup-windows-multiframe-merge (buf-A buf-B buf-C control-buf) | |
469 ;;; Algorithm: | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
470 ;;; 1. Never use frames that have dedicated windows in them---it is bad to |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
471 ;;; destroy dedicated windows. |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
472 ;;; 2. If A and B are in the same frame but C's frame is different--- use one |
26934 | 473 ;;; frame for A and B and use a separate frame for C. |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
474 ;;; 3. If C's frame is non-existent, then: if the first suitable |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
475 ;;; non-dedicated frame is different from A&B's, then use it for C. |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
476 ;;; Otherwise, put A,B, and C in one frame. |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
477 ;;; 4. If buffers A, B, C are is separate frames, use them to display these |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
478 ;;; buffers. |
11042 | 479 |
26934 | 480 ;; Skip dedicated or iconified frames. |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
481 ;; Unsplittable frames are taken care of later. |
11042 | 482 (ediff-skip-unsuitable-frames 'ok-unsplittable) |
483 | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
484 (let* ((window-min-height 1) |
11042 | 485 (wind-A (ediff-get-visible-buffer-window buf-A)) |
486 (wind-B (ediff-get-visible-buffer-window buf-B)) | |
487 (wind-C (ediff-get-visible-buffer-window buf-C)) | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
488 (frame-A (if wind-A (window-frame wind-A))) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
489 (frame-B (if wind-B (window-frame wind-B))) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
490 (frame-C (if wind-C (window-frame wind-C))) |
11042 | 491 ;; on wide display, do things in one frame |
26934 | 492 (force-one-frame |
19047 | 493 (ediff-with-current-buffer control-buf ediff-wide-display-p)) |
11042 | 494 ;; this lets us have local versions of ediff-split-window-function |
26934 | 495 (split-window-function |
19047 | 496 (ediff-with-current-buffer control-buf ediff-split-window-function)) |
11042 | 497 (orig-wind (selected-window)) |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
498 (orig-frame (selected-frame)) |
11042 | 499 (use-same-frame (or force-one-frame |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
500 ;; A and C must be in one frame |
11042 | 501 (eq frame-A (or frame-C orig-frame)) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
502 ;; B and C must be in one frame |
11042 | 503 (eq frame-B (or frame-C orig-frame)) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
504 ;; A or B is not visible |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
505 (not (frame-live-p frame-A)) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
506 (not (frame-live-p frame-B)) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
507 ;; A or B is not suitable for display |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
508 (not (ediff-window-ok-for-display wind-A)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
509 (not (ediff-window-ok-for-display wind-B)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
510 ;; A and B in the same frame, and no good frame |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
511 ;; for C |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
512 (and (eq frame-A frame-B) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
513 (not (frame-live-p frame-C))) |
11042 | 514 )) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
515 ;; use-same-frame-for-AB implies wind A and B are ok for display |
11042 | 516 (use-same-frame-for-AB (and (not use-same-frame) |
517 (eq frame-A frame-B))) | |
19047 | 518 (merge-window-share (ediff-with-current-buffer control-buf |
11042 | 519 ediff-merge-window-share)) |
520 merge-window-lines | |
521 designated-minibuffer-frame | |
522 done-A done-B done-C) | |
523 | |
524 ;; buf-A on its own | |
525 (if (and (window-live-p wind-A) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
526 (null use-same-frame) ; implies wind-A is suitable |
11042 | 527 (null use-same-frame-for-AB)) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
528 (progn ; bug A on its own |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
529 ;; buffer buf-A is seen in live wind-A |
11042 | 530 (select-window wind-A) |
531 (delete-other-windows) | |
532 (setq wind-A (selected-window)) | |
533 (setq done-A t))) | |
534 | |
535 ;; buf-B on its own | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
536 (if (and (window-live-p wind-B) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
537 (null use-same-frame) ; implies wind-B is suitable |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
538 (null use-same-frame-for-AB)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
539 (progn ; buf B on its own |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
540 ;; buffer buf-B is seen in live wind-B |
11042 | 541 (select-window wind-B) |
542 (delete-other-windows) | |
543 (setq wind-B (selected-window)) | |
544 (setq done-B t))) | |
545 | |
546 ;; buf-C on its own | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
547 (if (and (window-live-p wind-C) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
548 (ediff-window-ok-for-display wind-C) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
549 (null use-same-frame)) ; buf C on its own |
11042 | 550 (progn |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
551 ;; buffer buf-C is seen in live wind-C |
11042 | 552 (select-window wind-C) |
553 (delete-other-windows) | |
554 (setq wind-C (selected-window)) | |
555 (setq done-C t))) | |
556 | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
557 (if (and use-same-frame-for-AB ; implies wind A and B are suitable |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
558 (window-live-p wind-A)) |
26934 | 559 (progn |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
560 ;; wind-A must already be displaying buf-A |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
561 (select-window wind-A) |
11042 | 562 (delete-other-windows) |
563 (setq wind-A (selected-window)) | |
564 | |
565 (funcall split-window-function) | |
26934 | 566 (if (eq (selected-window) wind-A) |
11042 | 567 (other-window 1)) |
568 (switch-to-buffer buf-B) | |
569 (setq wind-B (selected-window)) | |
570 | |
571 (setq done-A t | |
572 done-B t))) | |
573 | |
574 (if use-same-frame | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
575 (let ((window-min-height 1)) |
18054 | 576 (if (and (eq frame-A frame-B) |
577 (eq frame-B frame-C) | |
578 (frame-live-p frame-A)) | |
579 (select-frame frame-A) | |
580 ;; avoid dedicated and non-splittable windows | |
581 (ediff-skip-unsuitable-frames)) | |
11042 | 582 (delete-other-windows) |
583 (setq merge-window-lines | |
584 (max 2 (round (* (window-height) merge-window-share)))) | |
585 (switch-to-buffer buf-A) | |
586 (setq wind-A (selected-window)) | |
587 | |
588 (split-window-vertically | |
589 (max 2 (- (window-height) merge-window-lines))) | |
26934 | 590 (if (eq (selected-window) wind-A) |
11042 | 591 (other-window 1)) |
592 (setq wind-C (selected-window)) | |
593 (switch-to-buffer buf-C) | |
594 | |
595 (select-window wind-A) | |
596 | |
597 (funcall split-window-function) | |
26934 | 598 (if (eq (selected-window) wind-A) |
11042 | 599 (other-window 1)) |
600 (switch-to-buffer buf-B) | |
601 (setq wind-B (selected-window)) | |
602 | |
603 (setq done-A t | |
604 done-B t | |
605 done-C t) | |
606 )) | |
607 | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
608 (or done-A ; Buf A to be set in its own frame, |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
609 ;;; or it was set before because use-same-frame = 1 |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
610 (progn |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
611 ;; Buf-A was not set up yet as it wasn't visible, |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
612 ;; and use-same-frame = nil, use-same-frame-for-AB = nil |
11042 | 613 (select-window orig-wind) |
614 (delete-other-windows) | |
615 (switch-to-buffer buf-A) | |
616 (setq wind-A (selected-window)) | |
617 )) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
618 (or done-B ; Buf B to be set in its own frame, |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
619 ;;; or it was set before because use-same-frame = 1 |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
620 (progn |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
621 ;; Buf-B was not set up yet as it wasn't visible |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
622 ;; and use-same-frame = nil, use-same-frame-for-AB = nil |
11042 | 623 (select-window orig-wind) |
624 (delete-other-windows) | |
625 (switch-to-buffer buf-B) | |
626 (setq wind-B (selected-window)) | |
627 )) | |
628 | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
629 (or done-C ; Buf C to be set in its own frame, |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
630 ;;; or it was set before because use-same-frame = 1 |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
631 (progn |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
632 ;; Buf-C was not set up yet as it wasn't visible |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
633 ;; and use-same-frame = nil |
11042 | 634 (select-window orig-wind) |
635 (delete-other-windows) | |
636 (switch-to-buffer buf-C) | |
637 (setq wind-C (selected-window)) | |
638 )) | |
639 | |
19047 | 640 (ediff-with-current-buffer control-buf |
11042 | 641 (setq ediff-window-A wind-A |
642 ediff-window-B wind-B | |
643 ediff-window-C wind-C) | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
644 (setq frame-A (window-frame ediff-window-A) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
645 designated-minibuffer-frame |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
646 (window-frame (minibuffer-window frame-A)))) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
647 |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
648 (ediff-setup-control-frame control-buf designated-minibuffer-frame) |
11042 | 649 )) |
650 | |
651 | |
652 ;; Window setup for all comparison jobs, including 3way comparisons | |
653 (defun ediff-setup-windows-multiframe-compare (buf-A buf-B buf-C control-buf) | |
654 ;;; Algorithm: | |
26934 | 655 ;;; If a buffer is seen in a frame, use that frame for that buffer. |
11042 | 656 ;;; If it is not seen, use the current frame. |
657 ;;; If both buffers are not seen, they share the current frame. If one | |
658 ;;; of the buffers is not seen, it is placed in the current frame (where | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
659 ;;; ediff started). If that frame is displaying the other buffer, it is |
11042 | 660 ;;; shared between the two buffers. |
661 ;;; However, if we decide to put both buffers in one frame | |
662 ;;; and the selected frame isn't splittable, we create a new frame and | |
663 ;;; put both buffers there, event if one of this buffers is visible in | |
664 ;;; another frame. | |
665 | |
666 ;; Skip dedicated or iconified frames. | |
667 ;; Unsplittable frames are taken care of later. | |
668 (ediff-skip-unsuitable-frames 'ok-unsplittable) | |
669 | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
670 (let* ((window-min-height 1) |
11042 | 671 (wind-A (ediff-get-visible-buffer-window buf-A)) |
672 (wind-B (ediff-get-visible-buffer-window buf-B)) | |
673 (wind-C (ediff-get-visible-buffer-window buf-C)) | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
674 (frame-A (if wind-A (window-frame wind-A))) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
675 (frame-B (if wind-B (window-frame wind-B))) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
676 (frame-C (if wind-C (window-frame wind-C))) |
19047 | 677 (ctl-frame-exists-p (ediff-with-current-buffer control-buf |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
678 (frame-live-p ediff-control-frame))) |
11042 | 679 ;; on wide display, do things in one frame |
26934 | 680 (force-one-frame |
19047 | 681 (ediff-with-current-buffer control-buf ediff-wide-display-p)) |
11042 | 682 ;; this lets us have local versions of ediff-split-window-function |
26934 | 683 (split-window-function |
19047 | 684 (ediff-with-current-buffer control-buf ediff-split-window-function)) |
11042 | 685 (three-way-comparison |
19047 | 686 (ediff-with-current-buffer control-buf ediff-3way-comparison-job)) |
11042 | 687 (orig-wind (selected-window)) |
688 (use-same-frame (or force-one-frame | |
689 (eq frame-A frame-B) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
690 (not (ediff-window-ok-for-display wind-A)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
691 (not (ediff-window-ok-for-display wind-B)) |
11042 | 692 (if three-way-comparison |
693 (or (eq frame-A frame-C) | |
694 (eq frame-B frame-C) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
695 (not (ediff-window-ok-for-display wind-C)) |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
696 (not (frame-live-p frame-A)) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
697 (not (frame-live-p frame-B)) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
698 (not (frame-live-p frame-C)))) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
699 (and (not (frame-live-p frame-B)) |
11042 | 700 (or ctl-frame-exists-p |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
701 (eq frame-A (selected-frame)))) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
702 (and (not (frame-live-p frame-A)) |
11042 | 703 (or ctl-frame-exists-p |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
704 (eq frame-B (selected-frame)))))) |
26934 | 705 wind-A-start wind-B-start |
11042 | 706 designated-minibuffer-frame |
707 done-A done-B done-C) | |
708 | |
19047 | 709 (ediff-with-current-buffer control-buf |
11042 | 710 (setq wind-A-start (ediff-overlay-start |
711 (ediff-get-value-according-to-buffer-type | |
712 'A ediff-narrow-bounds)) | |
713 wind-B-start (ediff-overlay-start | |
714 (ediff-get-value-according-to-buffer-type | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
715 'B ediff-narrow-bounds)))) |
11042 | 716 |
717 (if (and (window-live-p wind-A) (null use-same-frame)) ; buf-A on its own | |
718 (progn | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
719 ;; buffer buf-A is seen in live wind-A |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
720 (select-window wind-A) ; must be displaying buf-A |
11042 | 721 (delete-other-windows) |
722 (setq wind-A (selected-window)) | |
723 (setq done-A t))) | |
724 | |
725 (if (and (window-live-p wind-B) (null use-same-frame)) ; buf B on its own | |
726 (progn | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
727 ;; buffer buf-B is seen in live wind-B |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
728 (select-window wind-B) ; must be displaying buf-B |
11042 | 729 (delete-other-windows) |
730 (setq wind-B (selected-window)) | |
731 (setq done-B t))) | |
732 | |
733 (if (and (window-live-p wind-C) (null use-same-frame)) ; buf C on its own | |
734 (progn | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
735 ;; buffer buf-C is seen in live wind-C |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
736 (select-window wind-C) ; must be displaying buf-C |
11042 | 737 (delete-other-windows) |
738 (setq wind-C (selected-window)) | |
739 (setq done-C t))) | |
740 | |
741 (if use-same-frame | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
742 (let (wind-width-or-height) ; this affects 3way setups only |
18054 | 743 (if (and (eq frame-A frame-B) (frame-live-p frame-A)) |
744 (select-frame frame-A) | |
745 ;; avoid dedicated and non-splittable windows | |
746 (ediff-skip-unsuitable-frames)) | |
11042 | 747 (delete-other-windows) |
748 (switch-to-buffer buf-A) | |
749 (setq wind-A (selected-window)) | |
750 | |
751 (if three-way-comparison | |
752 (setq wind-width-or-height | |
753 (/ | |
754 (if (eq split-window-function 'split-window-vertically) | |
755 (window-height wind-A) | |
756 (window-width wind-A)) | |
757 3))) | |
758 | |
759 (funcall split-window-function wind-width-or-height) | |
26934 | 760 (if (eq (selected-window) wind-A) |
11042 | 761 (other-window 1)) |
762 (switch-to-buffer buf-B) | |
763 (setq wind-B (selected-window)) | |
764 | |
765 (if three-way-comparison | |
766 (progn | |
767 (funcall split-window-function) ; equally | |
768 (if (memq (selected-window) (list wind-A wind-B)) | |
769 (other-window 1)) | |
770 (switch-to-buffer buf-C) | |
771 (setq wind-C (selected-window)))) | |
772 (setq done-A t | |
773 done-B t | |
774 done-C t) | |
775 )) | |
776 | |
777 (or done-A ; Buf A to be set in its own frame | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
778 ;;; or it was set before because use-same-frame = 1 |
26934 | 779 (progn |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
780 ;; Buf-A was not set up yet as it wasn't visible, |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
781 ;; and use-same-frame = nil |
11042 | 782 (select-window orig-wind) |
783 (delete-other-windows) | |
784 (switch-to-buffer buf-A) | |
785 (setq wind-A (selected-window)) | |
786 )) | |
787 (or done-B ; Buf B to be set in its own frame | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
788 ;;; or it was set before because use-same-frame = 1 |
26934 | 789 (progn |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
790 ;; Buf-B was not set up yet as it wasn't visible, |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
791 ;; and use-same-frame = nil |
11042 | 792 (select-window orig-wind) |
793 (delete-other-windows) | |
794 (switch-to-buffer buf-B) | |
795 (setq wind-B (selected-window)) | |
796 )) | |
797 | |
798 (if three-way-comparison | |
799 (or done-C ; Buf C to be set in its own frame | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
800 ;;; or it was set before because use-same-frame = 1 |
26934 | 801 (progn |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
802 ;; Buf-C was not set up yet as it wasn't visible, |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
803 ;; and use-same-frame = nil |
11042 | 804 (select-window orig-wind) |
805 (delete-other-windows) | |
806 (switch-to-buffer buf-C) | |
807 (setq wind-C (selected-window)) | |
808 ))) | |
809 | |
19047 | 810 (ediff-with-current-buffer control-buf |
11042 | 811 (setq ediff-window-A wind-A |
812 ediff-window-B wind-B | |
813 ediff-window-C wind-C) | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
814 |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
815 (setq frame-A (window-frame ediff-window-A) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
816 designated-minibuffer-frame |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
817 (window-frame (minibuffer-window frame-A)))) |
11042 | 818 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
819 ;; It is unlikely that we'll implement a version of ediff-windows that |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
820 ;; would compare 3 windows at once. So, we don't use buffer C here. |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
821 (if ediff-windows-job |
11042 | 822 (progn |
823 (set-window-start wind-A wind-A-start) | |
824 (set-window-start wind-B wind-B-start))) | |
825 | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
826 (ediff-setup-control-frame control-buf designated-minibuffer-frame) |
11042 | 827 )) |
828 | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
829 ;; skip unsplittable frames and frames that have dedicated windows. |
11042 | 830 ;; create a new splittable frame if none is found |
831 (defun ediff-skip-unsuitable-frames (&optional ok-unsplittable) | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
832 (if (ediff-window-display-p) |
11042 | 833 (let (last-window) |
834 (while (and (not (eq (selected-window) last-window)) | |
835 (or | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
836 (ediff-frame-has-dedicated-windows (selected-frame)) |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
837 (ediff-frame-iconified-p (selected-frame)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
838 ;; skip small frames |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
839 (< (frame-height (selected-frame)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
840 (* 3 window-min-height)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
841 ;; skip small windows |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
842 (< (window-height (selected-window)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
843 (* 3 window-min-height)) |
11042 | 844 (if ok-unsplittable |
845 nil | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
846 (ediff-frame-unsplittable-p (selected-frame))))) |
11042 | 847 ;; remember where started |
848 (or last-window (setq last-window (selected-window))) | |
849 ;; try new window | |
850 (other-window 1 t)) | |
851 (if (eq (selected-window) last-window) | |
852 ;; fed up, no appropriate frame | |
853 (progn | |
12559
c4daa54a92fc
(ediff-skip-unsuitable-frames): Use make-frame,
Karl Heuer <kwzh@gnu.org>
parents:
12399
diff
changeset
|
854 (select-frame (make-frame '((unsplittable))))))))) |
11042 | 855 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
856 (defun ediff-frame-has-dedicated-windows (frame) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
857 (let ((cur-fr (selected-frame)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
858 ans) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
859 (select-frame frame) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
860 (walk-windows |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
861 (lambda (wind) (if (window-dedicated-p wind) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
862 (setq ans t))) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
863 'ignore-minibuffer |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
864 frame) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
865 (select-frame cur-fr) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
866 ans)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
867 |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
868 ;; window is ok, if it is only one window on the frame, not counting the |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
869 ;; minibuffer, or none of the frame's windows is dedicated. |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
870 ;; The idea is that it is bad to destroy dedicated windows while creating an |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
871 ;; ediff window setup |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
872 (defun ediff-window-ok-for-display (wind) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
873 (and |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
874 (window-live-p wind) |
26934 | 875 (or |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
876 ;; only one window |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
877 (eq wind (next-window wind 'ignore-minibuffer (window-frame wind))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
878 ;; none is dedicated |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
879 (not (ediff-frame-has-dedicated-windows (window-frame wind))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
880 ))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
881 |
11042 | 882 ;; Prepare or refresh control frame |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
883 (defun ediff-setup-control-frame (ctl-buffer designated-minibuffer-frame) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
884 (let ((window-min-height 1) |
11042 | 885 ctl-frame-iconified-p dont-iconify-ctl-frame deiconify-ctl-frame |
26934 | 886 ctl-frame old-ctl-frame lines |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
887 ;; user-grabbed-mouse |
26934 | 888 fheight fwidth adjusted-parameters) |
11042 | 889 |
19047 | 890 (ediff-with-current-buffer ctl-buffer |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
891 (if ediff-xemacs-p (set-buffer-menubar nil)) |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
892 ;;(setq user-grabbed-mouse (ediff-user-grabbed-mouse)) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
893 (run-hooks 'ediff-before-setup-control-frame-hook)) |
11042 | 894 |
19047 | 895 (setq old-ctl-frame (ediff-with-current-buffer ctl-buffer ediff-control-frame)) |
896 (ediff-with-current-buffer ctl-buffer | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
897 (setq ctl-frame (if (frame-live-p old-ctl-frame) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
898 old-ctl-frame |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
899 (make-frame ediff-control-frame-parameters)) |
29977
ebf68f69b586
(ediff-setup-control-frame): Remove :box
Gerd Moellmann <gerd@gnu.org>
parents:
27899
diff
changeset
|
900 ediff-control-frame ctl-frame) |
ebf68f69b586
(ediff-setup-control-frame): Remove :box
Gerd Moellmann <gerd@gnu.org>
parents:
27899
diff
changeset
|
901 (when (and ediff-emacs-p (face-attribute 'mode-line :box)) |
ebf68f69b586
(ediff-setup-control-frame): Remove :box
Gerd Moellmann <gerd@gnu.org>
parents:
27899
diff
changeset
|
902 (set-face-attribute 'mode-line ctl-frame :box nil))) |
11042 | 903 |
904 (setq ctl-frame-iconified-p (ediff-frame-iconified-p ctl-frame)) | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
905 (select-frame ctl-frame) |
11042 | 906 (if (window-dedicated-p (selected-window)) |
907 () | |
908 (delete-other-windows) | |
909 (switch-to-buffer ctl-buffer)) | |
910 | |
911 ;; must be before ediff-setup-control-buffer | |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
912 ;; just a precaution--we should be in ctl-buffer already |
19047 | 913 (ediff-with-current-buffer ctl-buffer |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
914 (make-local-variable 'frame-title-format) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
915 (make-local-variable 'frame-icon-title-format) ; XEmacs |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
916 (make-local-variable 'icon-title-format)) ; Emacs |
11042 | 917 |
918 (ediff-setup-control-buffer ctl-buffer) | |
919 (setq dont-iconify-ctl-frame | |
920 (not (string= ediff-help-message ediff-brief-help-message))) | |
26934 | 921 (setq deiconify-ctl-frame |
11042 | 922 (and (eq this-command 'ediff-toggle-help) |
923 dont-iconify-ctl-frame)) | |
924 | |
925 ;; 1 more line for the modeline | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
926 (setq lines (1+ (count-lines (point-min) (point-max))) |
11042 | 927 fheight lines |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
928 fwidth (max (+ (ediff-help-message-line-length) 2) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
929 (ediff-compute-toolbar-width)) |
18054 | 930 adjusted-parameters |
931 (list | |
932 ;; possibly change surrogate minibuffer | |
933 (cons 'minibuffer | |
934 (minibuffer-window | |
935 designated-minibuffer-frame)) | |
936 (cons 'width fwidth) | |
937 (cons 'height fheight)) | |
938 ) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
939 (if ediff-use-long-help-message |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
940 (setq adjusted-parameters |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
941 (cons '(auto-raise . nil) adjusted-parameters))) |
11042 | 942 |
943 ;; In XEmacs, buffer menubar needs to be killed before frame parameters | |
26934 | 944 ;; are changed. |
21940 | 945 (if (ediff-has-toolbar-support-p) |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
946 (progn |
18054 | 947 (set-specifier top-toolbar-height (list ctl-frame 2)) |
948 (sit-for 0) | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
949 (set-specifier top-toolbar-height (list ctl-frame 0)) |
18054 | 950 ;;(set-specifier bottom-toolbar-height (list ctl-frame 0)) |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
951 (set-specifier left-toolbar-width (list ctl-frame 0)) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
952 (set-specifier right-toolbar-width (list ctl-frame 0)) |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
953 )) |
11042 | 954 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
955 ;; Under OS/2 (emx) we have to call modify frame parameters twice, in order |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
956 ;; to make sure that at least once we do it for non-iconified frame. If |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
957 ;; appears that in the OS/2 port of Emacs, one can't modify frame |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
958 ;; parameters of iconified frames. As a precaution, we do likewise for |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
959 ;; windows-nt. |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
960 (if (memq system-type '(emx windows-nt windows-95)) |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
961 (modify-frame-parameters ctl-frame adjusted-parameters)) |
11042 | 962 |
18054 | 963 ;; make or zap toolbar (if not requested) |
964 (ediff-make-bottom-toolbar ctl-frame) | |
965 | |
11042 | 966 (goto-char (point-min)) |
18054 | 967 |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
968 (modify-frame-parameters ctl-frame adjusted-parameters) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
969 (make-frame-visible ctl-frame) |
11042 | 970 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
971 ;; This works around a bug in 19.25 and earlier. There, if frame gets |
11042 | 972 ;; iconified, the current buffer changes to that of the frame that |
973 ;; becomes exposed as a result of this iconification. | |
974 ;; So, we make sure the current buffer doesn't change. | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
975 (select-frame ctl-frame) |
11042 | 976 (ediff-refresh-control-frame) |
977 | |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
978 (cond ((and ediff-prefer-iconified-control-frame |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
979 (not ctl-frame-iconified-p) (not dont-iconify-ctl-frame)) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
980 (iconify-frame ctl-frame)) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
981 ((or deiconify-ctl-frame (not ctl-frame-iconified-p)) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
982 (raise-frame ctl-frame))) |
11042 | 983 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
984 (set-window-dedicated-p (selected-window) t) |
18054 | 985 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
986 ;; Now move the frame. We must do it separately due to an obscure bug in |
18054 | 987 ;; XEmacs |
988 (modify-frame-parameters | |
989 ctl-frame | |
990 (funcall ediff-control-frame-position-function ctl-buffer fwidth fheight)) | |
11042 | 991 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
992 ;; synchronize so the cursor will move to control frame |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
993 ;; per RMS suggestion |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
994 (if (ediff-window-display-p) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
995 (let ((count 7)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
996 (sit-for .1) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
997 (while (and (not (frame-visible-p ctl-frame)) (> count 0)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
998 (setq count (1- count)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
999 (sit-for .3)))) |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1000 |
11042 | 1001 (or (ediff-frame-iconified-p ctl-frame) |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1002 ;; don't warp the mouse, unless ediff-grab-mouse = t |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1003 (ediff-reset-mouse ctl-frame |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1004 (or (eq this-command 'ediff-quit) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1005 (not (eq ediff-grab-mouse t))))) |
11042 | 1006 |
1007 (if ediff-xemacs-p | |
19047 | 1008 (ediff-with-current-buffer ctl-buffer |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1009 (make-local-hook 'select-frame-hook) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1010 (add-hook 'select-frame-hook 'ediff-xemacs-select-frame-hook nil t) |
11042 | 1011 )) |
1012 | |
19047 | 1013 (ediff-with-current-buffer ctl-buffer |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1014 (run-hooks 'ediff-after-setup-control-frame-hook)) |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1015 )) |
18054 | 1016 |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1017 |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1018 (defun ediff-destroy-control-frame (ctl-buffer) |
19047 | 1019 (ediff-with-current-buffer ctl-buffer |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1020 (if (and (ediff-window-display-p) (frame-live-p ediff-control-frame)) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1021 (let ((ctl-frame ediff-control-frame)) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1022 (if ediff-xemacs-p |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1023 (set-buffer-menubar default-menubar)) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1024 (setq ediff-control-frame nil) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1025 (delete-frame ctl-frame) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1026 ))) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1027 (ediff-skip-unsuitable-frames) |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1028 ;;(ediff-reset-mouse nil) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1029 ) |
11042 | 1030 |
1031 | |
1032 ;; finds a good place to clip control frame | |
1033 (defun ediff-make-frame-position (ctl-buffer ctl-frame-width ctl-frame-height) | |
19047 | 1034 (ediff-with-current-buffer ctl-buffer |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1035 (let* ((frame-A (window-frame ediff-window-A)) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1036 (frame-A-parameters (frame-parameters frame-A)) |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1037 (frame-A-top (eval (cdr (assoc 'top frame-A-parameters)))) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1038 (frame-A-left (eval (cdr (assoc 'left frame-A-parameters)))) |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1039 (frame-A-width (frame-width frame-A)) |
11042 | 1040 (ctl-frame ediff-control-frame) |
1041 horizontal-adjustment upward-adjustment | |
26934 | 1042 ctl-frame-top ctl-frame-left) |
11042 | 1043 |
1044 ;; Multiple control frames are clipped based on the value of | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
21940
diff
changeset
|
1045 ;; ediff-control-buffer-number. This is done in order not to obscure |
11042 | 1046 ;; other active control panels. |
1047 (setq horizontal-adjustment (* 2 ediff-control-buffer-number) | |
1048 upward-adjustment (* -14 ediff-control-buffer-number)) | |
1049 | |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1050 (setq ctl-frame-top |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1051 (- frame-A-top upward-adjustment ediff-control-frame-upward-shift) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1052 ctl-frame-left |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1053 (+ frame-A-left |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1054 (if ediff-use-long-help-message |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1055 (* (ediff-frame-char-width ctl-frame) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1056 (+ ediff-wide-control-frame-rightward-shift |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1057 horizontal-adjustment)) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1058 (- (* frame-A-width (ediff-frame-char-width frame-A)) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1059 (* (ediff-frame-char-width ctl-frame) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1060 (+ ctl-frame-width |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1061 ediff-narrow-control-frame-leftward-shift |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1062 horizontal-adjustment)))))) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1063 (setq ctl-frame-top |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1064 (min ctl-frame-top |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1065 (- (ediff-display-pixel-height) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1066 (* 2 ctl-frame-height |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1067 (ediff-frame-char-height ctl-frame)))) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1068 ctl-frame-left |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1069 (min ctl-frame-left |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1070 (- (ediff-display-pixel-width) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1071 (* ctl-frame-width (ediff-frame-char-width ctl-frame))))) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1072 ;; keep ctl frame within the visible bounds |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1073 (setq ctl-frame-top (max ctl-frame-top 1) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1074 ctl-frame-left (max ctl-frame-left 1)) |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1075 |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1076 (list (cons 'top ctl-frame-top) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1077 (cons 'left ctl-frame-left)) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1078 ))) |
11042 | 1079 |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1080 (defun ediff-xemacs-select-frame-hook () |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1081 (if (and (equal (selected-frame) ediff-control-frame) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1082 (not ediff-use-long-help-message)) |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1083 (raise-frame ediff-control-frame))) |
11042 | 1084 |
1085 (defun ediff-make-wide-display () | |
1086 "Construct an alist of parameters for the wide display. | |
1087 Saves the old frame parameters in `ediff-wide-display-orig-parameters'. | |
1088 The frame to be resized is kept in `ediff-wide-display-frame'. | |
1089 This function modifies only the left margin and the width of the display. | |
1090 It assumes that it is called from within the control buffer." | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1091 (if (not (fboundp 'ediff-display-pixel-width)) |
26934 | 1092 (error "Can't determine display width")) |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1093 (let* ((frame-A (window-frame ediff-window-A)) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1094 (frame-A-params (frame-parameters frame-A)) |
11042 | 1095 (cw (ediff-frame-char-width frame-A)) |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1096 (wd (- (/ (ediff-display-pixel-width) cw) 5))) |
26934 | 1097 (setq ediff-wide-display-orig-parameters |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1098 (list (cons 'left (max 0 (eval (cdr (assoc 'left frame-A-params))))) |
11042 | 1099 (cons 'width (cdr (assoc 'width frame-A-params)))) |
1100 ediff-wide-display-frame frame-A) | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1101 (modify-frame-parameters frame-A (list (cons 'left cw) |
11042 | 1102 (cons 'width wd))))) |
1103 | |
1104 | |
1105 | |
1106 ;; Revise the mode line to display which difference we have selected | |
1107 ;; Also resets modelines of buffers A/B, since they may be clobbered by | |
1108 ;; anothe invocations of Ediff. | |
1109 (defun ediff-refresh-mode-lines () | |
1110 (let (buf-A-state-diff buf-B-state-diff buf-C-state-diff buf-C-state-merge) | |
1111 | |
1112 (if (ediff-valid-difference-p) | |
1113 (setq | |
1114 buf-C-state-diff (ediff-get-state-of-diff ediff-current-difference 'C) | |
1115 buf-C-state-merge (ediff-get-state-of-merge ediff-current-difference) | |
1116 buf-A-state-diff (ediff-get-state-of-diff ediff-current-difference 'A) | |
1117 buf-B-state-diff (ediff-get-state-of-diff ediff-current-difference 'B) | |
1118 buf-A-state-diff (if buf-A-state-diff | |
1119 (format "[%s] " buf-A-state-diff) | |
1120 "") | |
1121 buf-B-state-diff (if buf-B-state-diff | |
1122 (format "[%s] " buf-B-state-diff) | |
1123 "") | |
1124 buf-C-state-diff (if (and (ediff-buffer-live-p ediff-buffer-C) | |
1125 (or buf-C-state-diff buf-C-state-merge)) | |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1126 (format "[%s%s%s] " |
11042 | 1127 (or buf-C-state-diff "") |
1128 (if buf-C-state-merge | |
1129 (concat " " buf-C-state-merge) | |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1130 "") |
26934 | 1131 (if (ediff-get-state-of-ancestor |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1132 ediff-current-difference) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1133 " AncestorEmpty" |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1134 "") |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1135 ) |
11042 | 1136 "")) |
1137 (setq buf-A-state-diff "" | |
1138 buf-B-state-diff "" | |
1139 buf-C-state-diff "")) | |
1140 | |
1141 ;; control buffer format | |
1142 (setq mode-line-format | |
18054 | 1143 (if (ediff-narrow-control-frame-p) |
1144 (list " " mode-line-buffer-identification) | |
1145 (list "-- " mode-line-buffer-identification " Quick Help"))) | |
11042 | 1146 ;; control buffer id |
26934 | 1147 (setq mode-line-buffer-identification |
11042 | 1148 (if (ediff-narrow-control-frame-p) |
1149 (ediff-make-narrow-control-buffer-id 'skip-name) | |
1150 (ediff-make-wide-control-buffer-id))) | |
1151 ;; Force mode-line redisplay | |
1152 (force-mode-line-update) | |
1153 | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1154 (if (and (ediff-window-display-p) (frame-live-p ediff-control-frame)) |
11042 | 1155 (ediff-refresh-control-frame)) |
1156 | |
19047 | 1157 (ediff-with-current-buffer ediff-buffer-A |
11042 | 1158 (setq ediff-diff-status buf-A-state-diff) |
1159 (ediff-strip-mode-line-format) | |
1160 (setq mode-line-format | |
1161 (list " A: " 'ediff-diff-status mode-line-format)) | |
1162 (force-mode-line-update)) | |
19047 | 1163 (ediff-with-current-buffer ediff-buffer-B |
11042 | 1164 (setq ediff-diff-status buf-B-state-diff) |
1165 (ediff-strip-mode-line-format) | |
1166 (setq mode-line-format | |
1167 (list " B: " 'ediff-diff-status mode-line-format)) | |
1168 (force-mode-line-update)) | |
1169 (if ediff-3way-job | |
19047 | 1170 (ediff-with-current-buffer ediff-buffer-C |
11042 | 1171 (setq ediff-diff-status buf-C-state-diff) |
1172 (ediff-strip-mode-line-format) | |
1173 (setq mode-line-format | |
1174 (list " C: " 'ediff-diff-status mode-line-format)) | |
1175 (force-mode-line-update))) | |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1176 (if (ediff-buffer-live-p ediff-ancestor-buffer) |
19047 | 1177 (ediff-with-current-buffer ediff-ancestor-buffer |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1178 (ediff-strip-mode-line-format) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1179 ;; we keep the second dummy string in the mode line format of the |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1180 ;; ancestor, since for other buffers Ediff prepends 2 strings and |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1181 ;; ediff-strip-mode-line-format expects that. |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1182 (setq mode-line-format |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1183 (list " Ancestor: " |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1184 (cond ((not (stringp buf-C-state-merge)) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1185 "") |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1186 ((string-match "prefer-A" buf-C-state-merge) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1187 "[=diff(B)] ") |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1188 ((string-match "prefer-B" buf-C-state-merge) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1189 "[=diff(A)] ") |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1190 (t "")) |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1191 mode-line-format)))) |
11042 | 1192 )) |
1193 | |
1194 | |
1195 (defun ediff-refresh-control-frame () | |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1196 (if ediff-emacs-p |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1197 ;; set frame/icon titles for Emacs |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1198 (modify-frame-parameters |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1199 ediff-control-frame |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1200 (list (cons 'title (ediff-make-base-title)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1201 (cons 'icon-name (ediff-make-narrow-control-buffer-id)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1202 )) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1203 ;; set frame/icon titles for XEmacs |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1204 (setq frame-title-format (ediff-make-base-title) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1205 frame-icon-title-format (ediff-make-narrow-control-buffer-id)) |
13132
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1206 ;; force an update of the frame title |
7ed272c3c177
(ediff-make-frame-position): fixed bugs.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12559
diff
changeset
|
1207 (modify-frame-parameters ediff-control-frame '(())))) |
11042 | 1208 |
1209 | |
1210 (defun ediff-make-narrow-control-buffer-id (&optional skip-name) | |
1211 (concat | |
1212 (if skip-name | |
1213 " " | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1214 (ediff-make-base-title)) |
26934 | 1215 (cond ((< ediff-current-difference 0) |
11042 | 1216 (format " _/%d" ediff-number-of-differences)) |
1217 ((>= ediff-current-difference ediff-number-of-differences) | |
1218 (format " $/%d" ediff-number-of-differences)) | |
1219 (t | |
1220 (format " %d/%d" | |
1221 (1+ ediff-current-difference) | |
1222 ediff-number-of-differences))))) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1223 |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1224 (defun ediff-make-base-title () |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1225 (concat |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1226 (cdr (assoc 'name ediff-control-frame-parameters)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1227 ediff-control-buffer-suffix)) |
11042 | 1228 |
1229 (defun ediff-make-wide-control-buffer-id () | |
1230 (cond ((< ediff-current-difference 0) | |
1231 (list (format "%%b At start of %d diffs" | |
1232 ediff-number-of-differences))) | |
1233 ((>= ediff-current-difference ediff-number-of-differences) | |
1234 (list (format "%%b At end of %d diffs" | |
1235 ediff-number-of-differences))) | |
1236 (t | |
1237 (list (format "%%b diff %d of %d" | |
1238 (1+ ediff-current-difference) | |
1239 ediff-number-of-differences))))) | |
1240 | |
1241 | |
1242 | |
1243 ;; If buff is not live, return nil | |
1244 (defun ediff-get-visible-buffer-window (buff) | |
1245 (if (ediff-buffer-live-p buff) | |
1246 (if ediff-xemacs-p | |
1247 (get-buffer-window buff t) | |
1248 (get-buffer-window buff 'visible)))) | |
1249 | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1250 |
11042 | 1251 ;;; Functions to decide when to redraw windows |
1252 | |
1253 (defun ediff-keep-window-config (control-buf) | |
1254 (and (eq control-buf (current-buffer)) | |
1255 (/= (buffer-size) 0) | |
19047 | 1256 (ediff-with-current-buffer control-buf |
11042 | 1257 (let ((ctl-wind ediff-control-window) |
1258 (A-wind ediff-window-A) | |
1259 (B-wind ediff-window-B) | |
1260 (C-wind ediff-window-C)) | |
1261 | |
1262 (and | |
1263 (ediff-window-visible-p A-wind) | |
1264 (ediff-window-visible-p B-wind) | |
1265 ;; if buffer C is defined then take it into account | |
1266 (or (not ediff-3way-job) | |
1267 (ediff-window-visible-p C-wind)) | |
1268 (eq (window-buffer A-wind) ediff-buffer-A) | |
1269 (eq (window-buffer B-wind) ediff-buffer-B) | |
1270 (or (not ediff-3way-job) | |
1271 (eq (window-buffer C-wind) ediff-buffer-C)) | |
1272 (string= ediff-window-config-saved | |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1273 (format "%S%S%S%S%S%S%S" |
11042 | 1274 ctl-wind A-wind B-wind C-wind |
12084
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1275 ediff-split-window-function |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1276 (ediff-multiframe-setup-p) |
4a13777b153b
(ediff-make-control-frame): optimized for display.
Karl Heuer <kwzh@gnu.org>
parents:
12020
diff
changeset
|
1277 ediff-wide-display-p))))))) |
11042 | 1278 |
1279 | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1280 ;;; Local Variables: |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1281 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) |
19047 | 1282 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
1283 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1284 ;;; End: |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1285 |
11042 | 1286 ;;; ediff-wind.el ends here |