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