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