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