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