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