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