Mercurial > emacs
annotate lisp/ediff.el @ 9386:17dfca2d42e2
(perl-font-lock-keywords): New variable.
(perl-mode): Set font-lock-keywords locally.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 07 Oct 1994 10:08:48 +0000 |
parents | 716969785d08 |
children | 17b319a26eea |
rev | line source |
---|---|
7267 | 1 ;;; ediff.el --- a visual interface to diff & patch |
2 ;;; Copyright (C) 1994 Free Software Foundation, Inc. | |
3 | |
4 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> | |
5 ;; Created: February 2, 1994 | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
6 ;; Version: 1.65e |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
7 ;; Keywords: comparing, merging, patching, version control. |
7267 | 8 |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
9 (defvar ediff-version "1.65e" "The current version of Ediff") |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
10 (defvar ediff-date "September 1, 1994" "Date of last update") |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
11 |
7267 | 12 ;; This file is part of GNU Emacs. |
13 | |
14 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
15 ;; it under the terms of the GNU General Public License as published by | |
16 ;; the Free Software Foundation; either version 2, or (at your option) | |
17 ;; any later version. | |
18 | |
19 ;; GNU Emacs is distributed in the hope that it will be useful, | |
20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
22 ;; GNU General Public License for more details. | |
23 | |
24 ;; You should have received a copy of the GNU General Public License | |
25 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
26 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
27 | |
28 | |
29 ;;; Commentary: | |
30 ;; ---------- | |
31 | |
7391 | 32 ;; Never read those diff outputs again! |
33 ;; Apply patch selectively, like a pro! | |
7267 | 34 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
35 ;; This package provides a convenient way of simultaneous browsing through |
7267 | 36 ;; the differences between a pair of files or buffers. The two files being |
37 ;; compared (file-A and file-B) are shown in separate windows (side by | |
38 ;; side, one above the another, or in separate frames), and the differences | |
39 ;; are highlighted as you step through them. You can also copy difference | |
40 ;; regions from one buffer to another (and recover old differences if you | |
41 ;; change your mind). | |
42 | |
43 ;; In addition, Ediff can apply a patch to a file and then let you step | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
44 ;; though both files, the patched and the original one, simultaneously, |
7267 | 45 ;; difference-by-difference. You can even apply a patch right out of a |
46 ;; mail buffer, i.e., patches received by mail don't even have to be saved. | |
47 ;; Since Ediff lets you copy differences between buffers, you can, in | |
48 ;; effect, apply patches selectively (i.e., you can copy a difference | |
49 ;; region from file.orig to file, thereby undoing any particular patch that | |
50 ;; you don't like). | |
51 | |
7424 | 52 ;; This package builds upon the ideas borrowed from emerge.el. It is still |
53 ;; using half a dozen of functions defined there. Several other Ediff's | |
54 ;; functions are adaptations from emerge.el. Ediff requires, at least, | |
55 ;; Version 5 of emerge.el. This version comes with standard distributions | |
56 ;; of Emacs and Lemacs. Make sure you don't have some stray old copy of | |
57 ;; Emerge on your load path. | |
58 | |
59 ;; Ediff is complimentary to Emerge. While Emerge is primarily intended | |
60 ;; for merging of files, Ediff is by far superior for browsing through | |
61 ;; files compared via diff and for patching files with patch. | |
62 ;; Furthermore, Ediff is more convenient even for merging, when one of the | |
63 ;; files is a designated output. This situation arises while patching | |
64 ;; files or when comparing an old version of a file with a newer version | |
65 ;; (in such cases, it is often desirable to selectively revert some | |
66 ;; portions of the new file to its old state). | |
67 | |
68 ;; Ediff also supports version control via vc.el (in the standard | |
69 ;; distribution of Emacs 19) and rcs.el. The latter is a package written by | |
70 ;; Sebastian Kremer <sk@thp.Uni-Koeln.DE>, which is available in | |
71 ;; | |
72 ;; ftp.cs.buffalo.edu:pub/Emacs/rcs.tar.Z | |
73 ;; ftp.uni-koeln.de:/pub/gnu/emacs/rcs.tar.Z | |
74 ;; | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
75 ;; To specify which version control package you are using, set the variable |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
76 ;; ediff-version-control-package, e.g., |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
77 ;; (setq ediff-version-control-package 'rcs) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
78 ;; The default, is 'vc'. |
7424 | 79 |
7267 | 80 |
81 ;; Window configuration: | |
82 ;; ---------------------- | |
83 | |
84 ;; By default, Ediff sets things up in one frame, splitting it between a | |
85 ;; small control window and the two windows for file-A and file-B. The | |
86 ;; split between these latter windows can be horizontal or vertical, which | |
87 ;; can be changed interactively by hitting 's' while the cursor is in the | |
88 ;; control window. | |
89 ;; | |
90 ;; In a multi-frame situation, Ediff would work as follows. When it starts, | |
91 ;; it will place the control window in the frame that was selected at the | |
92 ;; time of the invocation. If file-A or file-B is seen in one of the | |
93 ;; frames, Ediff will leave it there. If a file (A/B) is not visible in any | |
94 ;; frame, Ediff will arrange that it will share a frame with the control | |
95 ;; window. (If none of the files is visible, then both will share the | |
96 ;; control window frame.) The same algorithm works when you hit 'c' | |
97 ;; (ediff-recenter), 'p' (ediff-previous-difference), 'n', etc. | |
98 ;; | |
99 ;; Thus, you can compare files in one frame or in different frames. | |
100 ;; The former is done by default, while the latter can be achieved by | |
101 ;; arranging files A and B to be seen in different frames. Ediff | |
102 ;; respects these arrangements, automatically adapting itself to | |
103 ;; the multi-frame mode. | |
104 | |
105 | |
7424 | 106 ;; To those who like to go where noone has gone before: |
7267 | 107 |
108 ;; Ediff lets the user run multiple sessions at once, i.e., you can invoke | |
109 ;; Ediff on different functions several times in a row, without exiting | |
110 ;; the previous Ediff sessions. Different sessions may even operate on the | |
111 ;; same pair of files. So, in principle, it is possible to do, say, | |
112 ;; pairwise comparison of three (or more) different files. Each session | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
113 ;; would have its own Ediff Control Panel and all the regarding a |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
114 ;; particular session is local to the associated control panel buffer. |
7267 | 115 ;; You can switch between sessions by suspending one session and then |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
116 ;; switching to another control panel. (Different control panel buffers |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
117 ;; are distinguished by a numerical suffix, e.g., Ediff Control Panel<3>.) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
118 ;; Thus, if you would like to compare three files pairwise, you can do |
7267 | 119 ;; this by preparing three different frames, each with its own control |
120 ;; window. (This would require a very wide screen, and I never claimed | |
121 ;; that such 3-way comparison is very easy to do.) | |
122 ;; | |
123 ;; If you need to conduct multiple Ediff sessions on the same file, one | |
124 ;; thing should be kept in mind: each time you invoke Ediff on a buffer that | |
125 ;; already participates in another Ediff session, that buffer should not | |
126 ;; have any ASCII Ediff flags in it. (Highlighting with faces is OK.) If | |
127 ;; flags are not removed, difference overlays won't be set correctly | |
128 ;; for the second invocation of Ediff. The simplest way to remove ASCII | |
7424 | 129 ;; flags from an Ediff buffer is to hit `h' and thus switch to highlighting |
130 ;; with faces (unhighlighting on a dumb terminal). | |
7267 | 131 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
132 ;;; Remote and Compressed Files |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
133 ;; --------------------------- |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
134 |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
135 ;; Ediff will work with remote, compressed, and encrypted files. Ediff |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
136 ;; supports ange-ftp.el, jka-compr.el, uncompress.el and crypt++.el, but |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
137 ;; it may work with other similar packages as well. This |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
138 ;; means that you can compare files residing on another machine, or you |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
139 ;; can apply a patch to a file on another machine (even the patch itself |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
140 ;; can be a remote file!). |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
141 ;; |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
142 ;; When patching compressed or remote files, Ediff doesn't rename the |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
143 ;; source file into source-file-name.orig (unlike what `patch' would |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
144 ;; usually do). Instead, the source file retains its name and the result |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
145 ;; of applying the patch is placed in a temporary file that has the suffix |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
146 ;; `.patched'. Generally, this applies to files that are handled using |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
147 ;; black magic, such as special file handlers (ange-ftp and some |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
148 ;; compression and encryption packages all use this method). |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
149 ;; |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
150 ;; Regular files are treated by `patch' in the usual manner, i.e., the |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
151 ;; original is renamed into source-name.orig and the result of the patch |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
152 ;; is placed into the file source-name. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
153 |
7267 | 154 |
155 ;;; Remarks: | |
156 ;; ------- | |
157 | |
7424 | 158 ;; 1. Ediff is heavily dependent on the new features of Emacs 19. |
159 ;; It won't run under Emacs 18 at all. | |
7267 | 160 ;; 2. If running Lucid Emacs, Ediff requires at least version 19.9. |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
161 ;; 3. The function ediff-revision requires the version of vc.el that comes |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
162 ;; with Emacs 19.22 and later, or rcs.el version 1.67 or later. |
7267 | 163 |
164 | |
165 ;;; Installation and use: | |
166 ;; -------------------- | |
167 | |
168 ;; You can invoke Ediff interactively using the following functions: | |
169 ;; | |
170 ;; ediff-buffers - compare buffers | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
171 ;; ediff - alias for ediff-files) |
7267 | 172 ;; ediff-files - compare files |
173 ;; ediff-patch-file - patch file then compare | |
7424 | 174 ;; epatch - alias for ediff-patch-file |
7267 | 175 ;; ediff-patch-buffer - patch buffer then compare |
7424 | 176 ;; epatch-buffer - alias for ediff-patch-buffer |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
177 ;; ediff-revision - compare buffer & version |
7267 | 178 ;; |
179 ;; | |
180 ;; To use Ediff, put this in your .emacs file: | |
181 ;; | |
7391 | 182 ;; (autoload 'ediff-buffers "ediff" "Visual interface to diff" t) |
183 ;; (autoload 'ediff "ediff" "Visual interface to diff" t) | |
184 ;; (autoload 'ediff-files "ediff" "Visual interface to diff" t) | |
185 ;; (autoload 'epatch "ediff" "Visual interface to patch" t) | |
186 ;; (autoload 'ediff-patch-file "ediff" "Visual interface to patch" t) | |
187 ;; (autoload 'ediff-patch-buffer "ediff" "Visual interface to patch" t) | |
7424 | 188 ;; (autoload 'epatch-buffer "ediff" "Visual interface to patch" t) |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
189 ;; (autoload 'ediff-revision "ediff" |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
190 ;; "Interface to diff & version control" t) |
7267 | 191 ;; |
192 ;; | |
193 ;; If you want Ediff to be loaded from the very beginning, you should have | |
194 ;; | |
195 ;; (require 'ediff) | |
196 ;; | |
197 ;; in your .emacs file. This way it is also easier to figure out changes | |
198 ;; to the default Ediff setting, if such changes become necessary --- see | |
199 ;; Customization. | |
200 ;; | |
201 | |
202 ;;; Compilation | |
203 ;; ----------- | |
204 ;; | |
205 ;; When you byte-compile Ediff, you will get some warnings about functions | |
206 ;; being undefined. These can be safely ignored. | |
7424 | 207 ;; |
208 ;; Important: | |
209 ;; ========= | |
210 ;; | |
211 ;; If you are using advice.el (directly or indirectly, via one of the | |
212 ;; other packages), Ediff may not compile properly. In this case, you | |
213 ;; should do: | |
214 ;; | |
215 ;; M-x ad-deactivate-all RET | |
216 ;; | |
217 ;; M-x byte-compile-file RET ediff.el RET | |
218 ;; | |
219 ;; M-x ad-activate-all RET | |
220 ;; | |
221 ;; This precaution will not be needed starting with GNU Emacs 19.23 and | |
222 ;; Lucid Emacs 19.10, due to fixing a bug in advice.el. | |
7267 | 223 |
224 ;;; Customization: | |
225 ;; ------------- | |
226 | |
7424 | 227 ;; Hooks: |
228 ;; ----- | |
7267 | 229 ;; If you don't like the default setting, you can change it through the |
230 ;; various variables and hooks. In particular, the following hooks are | |
231 ;; available: | |
232 | |
233 ;; ediff-load-hooks | |
234 ;; ediff-before-setup-windows-hooks | |
235 ;; ediff-startup-hooks | |
236 ;; ediff-select-hooks | |
237 ;; ediff-unselect-hooks | |
238 ;; ediff-suspend-hooks | |
239 ;; ediff-quit-hooks | |
240 ;; ediff-prepare-buffer-hooks | |
241 | |
242 ;; The hooks in ediff-load-hooks can be used to change defaults after Ediff | |
243 ;; is loaded. | |
244 ;; The hooks in ediff-before-setup-windows-hooks, ediff-suspend-hooks, and | |
245 ;; ediff-quit-hooks can be used to save and then restore whatever window | |
246 ;; configuration you want. However, make sure you understand what you are | |
247 ;; doing. Many variables that drive Ediff are local to the different | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
248 ;; Ediff Control Panel buffers. Take a look at ediff-default-suspend-hook and |
7267 | 249 ;; ediff-default-quit-hook to see what's involved. |
250 ;; The hooks in ediff-prepare-buffer-hooks are executed for each Ediff buffer | |
251 ;; (A and B) right after these buffers are arranged. | |
252 ;; | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
253 ;; |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
254 ;; Selective browsing: Control over stepping through difference regions |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
255 ;; ----------------------------------------------- |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
256 ;; |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
257 ;; Sometimes it is convenient to be able to step through only some |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
258 ;; difference regions, those that satisfy certain conditions and to ignore |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
259 ;; all others. The commands `#f' and `#h' let the user specify regular |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
260 ;; expressions to control the way Ediff skips to the next or previous |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
261 ;; difference. Typing `#f' lets one specify a pair of regular expressions, |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
262 ;; regexp-A and regexp-B. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
263 ;; Ediff will then start stepping only through those difference regions where |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
264 ;; the region in buffer A matches regexp-A and the region in buffer B |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
265 ;; matches regexp-B. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
266 ;; Similarly, using `#h', one specifies expressions that match difference |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
267 ;; regions to be ignored while stepping through the differences. That is, if |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
268 ;; the buf A part matches regexp-A and the buf B part matches regexp B then |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
269 ;; the region will be ignored by ediff-next-difference and |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
270 ;; ediff-previous-difference commands. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
271 ;; |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
272 ;; Hitting `#f' and `#h' toggles this feature on/off. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
273 ;; |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
274 ;; Note that selective browsing affects only ediff-next-difference and |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
275 ;; ediff-previous-difference, i.e., the commands invoked by typing n/SPC |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
276 ;; and p/DEL. You can still jump directly (using `j' or `ga/gb') to any |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
277 ;; numbered difference. Also, it should be understood, that #f and #h do |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
278 ;; not change the position of the point in the buffers. The effect of these |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
279 ;; commands is seen only when the user types `n' or `p', i.e., when |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
280 ;; Ediff is told to jump to the next or previous difference. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
281 ;; |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
282 ;; Users can supply their own functions that specify how Ediff should do |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
283 ;; selective browsing. To change the default Ediff function, add a function to |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
284 ;; ediff-load-hooks which will do the following assignments: |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
285 ;; |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
286 ;; (fset ediff-hide-regexp-matches 'your-hide-function) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
287 ;; (fset ediff-focus-on-regexp-matches 'your-focus-function) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
288 ;; |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
289 ;; Useful hints: To specify a regexp that matches everything, don't simply |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
290 ;; type RET in response to a prompt. Typing RET tells Ediff to accept the |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
291 ;; default value, which may not be what you want. Instead, one should enter |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
292 ;; something like `^' or `$' --- which would match every line. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
293 ;; |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
294 ;; If the user doesn't remember if selective browsing is in effect and |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
295 ;; which regexps are being used, the status command, `i', will supply |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
296 ;; the requisite information. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
297 ;; |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
298 ;; In addition to the ability to ignore regions that match regular |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
299 ;; expressions, Ediff can be ordered to start skipping over certain |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
300 ;; `inessential' regions. This is controlled by the variable |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
301 ;; |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
302 ;; ediff-ignore-similar-regions |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
303 ;; |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
304 ;; which, if set to t, will cause Ediff to skip over difference regions |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
305 ;; that has been found similar, i.e., where the only differences are those |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
306 ;; in the white space and newlines. |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
307 ;; |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
308 ;; Note: In order for this feature to work, auto-refining of difference |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
309 ;; regions must be on, since otherwise Ediff won't know if there are no |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
310 ;; fine differences between regions. Under X, auto-refining is a default, |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
311 ;; but it is nixed on a dumb terminal or in an Xterm window. Therefore, in |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
312 ;; a non-windowing environment, the user must explicitly turn |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
313 ;; auto-refining on (e.g., by typing `@'). |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
314 ;; |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
315 ;; CAUTION: If many inessential regions appear in a row, Ediff may take a |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
316 ;; long time to jump to the next region because it has to compute fine |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
317 ;; differences of all intermediate regions. |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
318 ;; |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
319 ;; |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
320 ;; Highlighting difference regions |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
321 ;; ------------------------------- |
7267 | 322 ;; The second group of Ediff variables that could be changed, if you so |
323 ;; wish, is: | |
324 ;; | |
325 ;; ediff-before-flag-eol | |
326 ;; ediff-after-flag-eol | |
327 ;; ediff-before-flag-mol | |
328 ;; ediff-after-flag-mol | |
329 ;; | |
330 ;; ediff-current-diff-face-A | |
331 ;; ediff-current-diff-face-B | |
7424 | 332 ;; ediff-fine-diff-face-A |
333 ;; ediff-fine-diff-face-B | |
7267 | 334 ;; ediff-even-diff-face-A |
335 ;; ediff-even-diff-face-B | |
336 ;; ediff-odd-diff-face-A | |
337 ;; ediff-odd-diff-face-B | |
338 ; | |
339 ;; The first four are ASCII strings that mark the beginning and the end of | |
340 ;; the differences found in file-A and file-B. Ediff uses different flags | |
341 ;; to highlight regions that begin/end at the beginning of a line or in a | |
342 ;; middle of a line. | |
343 | |
344 ;; The rest are the faces used to highlight text on X displays. On X | |
345 ;; displays, Ediff uses ediff-current-diff-face-A and | |
346 ;; ediff-current-diff-face-B to highlight the current difference regions. | |
7424 | 347 ;; The faces ediff-fine-diff-face-A and ediff-fine-diff-face-B |
348 ;; are used to show the fine differences between the current differences | |
349 ;; regions in buffer A and B. | |
7267 | 350 ;; Other (non-current) difference regions are displayed in alternating |
7391 | 351 ;; faces: ediff-even/odd-diff-face-A/B. The odd and the even |
7267 | 352 ;; faces are actually identical on monochrome displays, because it is |
7424 | 353 ;; rather poor in what you can do on such a display. So, I chose to use |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
354 ;; italics to highlight other differences. Any ideas would be welcome. |
7267 | 355 ;; There are two ways to change the default setting for highlighting faces: |
356 ;; either change the variables, as in | |
357 ;; | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
358 ;; (setq ediff-current-diff-face-A 'bold-italic) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
359 ;; |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
360 ;; or |
7267 | 361 ;; |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
362 ;; (setq ediff-current-diff-face-A |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
363 ;; (copy-face 'bold-italic 'ediff-current-diff-face-A)) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
364 ;; |
7267 | 365 ;; or by selectively modifying the defaults: |
366 ;; | |
367 ;; (add-hook 'ediff-load-hooks | |
368 ;; (function (lambda () | |
369 ;; (set-face-foreground ediff-current-diff-face-B "blue") | |
370 ;; (set-face-background ediff-current-diff-face-B "red") | |
371 ;; (make-face-italic ediff-current-diff-face-B)))) | |
372 ;; | |
373 ;; You may also want to take a look at how the above faces are defined in | |
374 ;; Ediff. | |
375 ;; | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
376 ;; Note: it is not recommended to use `internal-get-face' (or `get-face' in |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
377 ;; Lucid) when defining faces for Ediff, since this may cause |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
378 ;; problems when there are several frames with different font sizes. |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
379 ;; Instead, use copy-face or set/make-face-* as shown above. |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
380 ;; |
7424 | 381 ;; The last group of variables in this group, |
7267 | 382 ;; |
383 ;; ediff-want-faces | |
7424 | 384 ;; ediff-highlight-all-diffs |
385 ;; ediff-want-default-menus | |
7267 | 386 ;; |
387 ;; indicate whether---on a window system---you want differences to be | |
388 ;; marked using ASCII strings (like on a dumb terminal) or using colors and | |
389 ;; highlighting. If ediff-want-faces is t, then highlighting with faces is | |
390 ;; used. Normally, Ediff highlights all differences, but the selected | |
7424 | 391 ;; difference is highlighted more visibly. You can cycle through various |
392 ;; modes of highlighting by hitting `h'. By default, Ediff starts in the | |
393 ;; mode where all difference regions are highlighted. If you prefer to | |
394 ;; start in the mode where unselected differences are not highlighted, you | |
395 ;; should set ediff-highlight-all-diffs to nil. | |
396 ;; You will still be able to turn on highlighting of all differences by | |
397 ;; hitting `h'. | |
398 ;; The variable `ediff-want-default-menus', if true, will cause Ediff to | |
399 ;; set up a pair of menues in the menu bar, so you can invoke it from there. | |
400 ;; If you don't like the look of the default menus, set this variable to | |
401 ;; nil and design your own menus. | |
7267 | 402 ;; |
403 ;; If you plan on changing these variables, they must be set | |
404 ;; BEFORE ediff.el is loaded. | |
405 ;; | |
406 ;; Note: Ediff lets you switch between the two types of highlighting. That | |
407 ;; is you can switch, interactively, from highlighting using faces to | |
408 ;; highlighting using ASCII flags, and back. Of course, toggling has | |
409 ;; effect only on a window system. On a dumb terminal or in an xterm | |
410 ;; window, the only available option is highlighting with ASCII flags. | |
411 ;; | |
7424 | 412 ;; Refining difference regions |
413 ;; --------------------------- | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
414 ;; Ediff has variables that control the way fine differences are |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
415 ;; highlighted. This feature lets the user highlight the exact words that |
7424 | 416 ;; make the difference regions in buffer A and B different. This process |
417 ;; ignores spaces, tabs, and newlines. | |
418 ;; | |
419 ;; ediff-auto-refine | |
420 ;; ediff-auto-refine-limit | |
421 ;; | |
422 ;; By default, `ediff-auto-refine' is `'on', which means that fine differences | |
423 ;; within regions will be highlighted automatically. On a slow system, this | |
424 ;; feature may be undesirable. In any case, the user can always toggle | |
425 ;; auto-refining on/off/nix by hitting `@'. When auto-refining is off, fine | |
426 ;; differences will be shown only for regions for which these differences | |
427 ;; have been computed and saved before. If auto-refining is nixed, fine | |
428 ;; differences will not be shown at all. Hitting `*' will compute and | |
429 ;; display fine differences for the current difference region regardless of | |
430 ;; whether auto-refining is on, off, or nixed. | |
431 ;; If auto-refining is on, the variable `ediff-auto-refine-limit' limits | |
432 ;; the size of the regions to be auto-refined. This variable guards against | |
433 ;; possible slow-down that may be caused by an extraordinary large | |
434 ;; difference region. However, the user can always force refining by | |
435 ;; hitting `*'. | |
436 ;; | |
437 ;; ediff-fine-diff-program | |
438 ;; ediff-fine-diff-options | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
439 ;; ediff-forward-word-function |
7424 | 440 ;; |
441 ;; These variables let the user control how fine differences are computed. | |
442 ;; `ediff-fine-diff-program' is diff, by default. However, you can use | |
443 ;; any function as long as it produces output consistent with diff. | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
444 ;; `ediff-forward-word-function' is a lisp function that determines how the |
7424 | 445 ;; current difference region is split into words. (Fine diferences are |
446 ;; computed by first splitting the current difference region into words and | |
447 ;; then passing this along to `ediff-fine-diff-program'. For the default | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
448 ;; wordify function, `ediff-forward-word', a word is a string consisting of |
7424 | 449 ;; letters, `-', or `_', or a string consisting of symbols that are neither |
450 ;; space, nor a letter.) | |
451 ;; | |
452 ;; Patch and diff programs | |
453 ;; ----------------------- | |
454 ;; The next group of variables determines the programs to be used for | |
455 ;; applying patches and for computing the main difference regions (not the | |
456 ;; fine difference regions): | |
7267 | 457 ;; |
458 ;; ediff-patch-program | |
459 ;; ediff-patch-options | |
460 ;; ediff-diff-program | |
461 ;; ediff-diff-options | |
462 ;; | |
463 ;; These specify the functions that produce differences and do patching. | |
464 ;; The *-options variables specify which options to pass to these programs. | |
465 ;; It is unlikely that you would want to change these. One possible | |
466 ;; exception is when you may want to generate differences with context | |
467 ;; lines in order to send a patch file through email. Then, you might want | |
468 ;; to set ediff-diff-options to '-c'. Sometimes, you may also want to tell | |
7391 | 469 ;; diff to ignore spaces and such. Use the option '-w' for that. Diff |
7267 | 470 ;; has several other useful options (type 'man diff' to find out). |
471 ;; | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
472 ;; The output from diff is found in *ediff-diff* buffer, which you can save. |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
473 ;; However, using Ediff for producing a diff output makes sense only if you |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
474 ;; also intend to use Ediff to browse through the diff'ed files before |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
475 ;; sending the patch. This is because diff.el, which also comes with |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
476 ;; Emacs, is much faster in yielding the output of diff (Ediff is a big |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
477 ;; gun, if used for this simple purpose). |
7267 | 478 ;; |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
479 ;; Mode line |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
480 ;; --------- |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
481 ;; |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
482 ;; When Ediff is running, the mode line of Ediff Control Panel buffer |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
483 ;; displays the current difference being displayed and the total number of |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
484 ;; difference regions in the two files. |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
485 ;; |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
486 ;; The mode line of the buffers being compared displays the type of the |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
487 ;; buffer (`A:' or `B:') and (usually) the file name. Ediff is trying to be |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
488 ;; intelligent in choosing mode line buffer identification. In particular, |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
489 ;; it works well with uniquify.el and mode-line.el packages (which improve |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
490 ;; on the default way in which Emacs displays buffer identification). |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
491 ;; If you don't like the way Ediff identifies its buffers, there is always |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
492 ;; ediff-prepare-buffer-hooks, which can be used to modify the mode line. |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
493 ;; |
7424 | 494 ;; Miscellaneous |
495 ;; ------------- | |
7267 | 496 ;; The last set of variables that can be modified is |
497 ;; | |
498 ;; ediff-split-window-function | |
499 ;; ediff-use-last-dir | |
7424 | 500 ;; ediff-no-help-in-control-buffer |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
501 ;; ediff-toggle-read-only-function |
7267 | 502 ;; |
503 ;; ediff-split-window-function controls the way you want the window be | |
504 ;; split between file-A and file-B. It defaults to vertical split, but you | |
505 ;; can set it to 'split-window-horizontally, if you want. Ediff lets you | |
506 ;; toggle the way windows are split, so you can try different settings | |
507 ;; interactively. Note: if file-A and file-B are in different frames, | |
508 ;; windows are not split, regardless of the value | |
509 ;; ediff-split-window-function. Instead, other windows on these frames are | |
510 ;; deleted and Ediff starts displaying file-A and file-B using these two | |
511 ;; frames, one file per frame. You can then switch to one-frame mode | |
512 ;; simply by hiding the file-A/B buffer that is displayed on a frame other | |
513 ;; than the control-window frame. | |
514 ;; | |
515 ;; Note that if Ediff sees that the two buffers it compares are residing in | |
516 ;; separate frames, it assumes that the user wants them to be so displayed | |
517 ;; and stops splitting windows. Instead, it will arrange each buffer to | |
518 ;; occupy its own frame (possibly shared with Ediff's help window). | |
519 ;; | |
520 ;; The variable ediff-use-last-dir controls the way Ediff presents the | |
521 ;; default directory when it prompts the user for files to compare. If nil, | |
522 ;; Ediff will use the default directory of the current buffer when it | |
523 ;; prompts the user for file names. Otherwise, it will use the | |
524 ;; directories it had previously used for file-A and file-B. | |
525 ;; | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
526 ;; The variable ediff-no-help-in-control-buffer, if set to t, makes C-h |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
527 ;; behave like the DEL key, i.e., it will move you back to the previous |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
528 ;; difference rather than invoking help. This is useful when, in an xterm |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
529 ;; window or on a dumb terminal, the Backspace key is bound to C-h and is |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
530 ;; positioned more conveniently than the DEL key. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
531 ;; |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
532 ;; The variable ediff-toggle-read-only-function can be used to change the |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
533 ;; way Ediff toggles the read-only property in its buffers. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
534 ;; By default, Ediff uses toggle-read-only. For files under version |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
535 ;; control, Ediff first tries to check the files out. |
7267 | 536 |
537 | |
538 ;;; Commands | |
539 ;; -------- | |
540 | |
541 ;; All Ediff commands are displayed in a help window, unless you hit '?' to | |
542 ;; shrink it to just one line. You can redisplay the help window by hitting | |
543 ;; '?' again. | |
544 ;; | |
545 ;; Many Ediff commands take numeric prefix arguments. For instance, if you | |
7424 | 546 ;; hit a number, N, and then 'j' (ediff-jump-to-difference), Ediff will |
547 ;; take you to Nth difference. Hitting a number, N, and then 'ab' | |
7419 | 548 ;; (ediff-diff-to-diff) will copy Nth difference from buffer A to buffer B. |
7267 | 549 ;; Hitting 'ba' does copying in the other direction. |
7424 | 550 ;; Likewise, a number, N, followed by 'ra' will restore the Nth difference |
7267 | 551 ;; region in buffer A (if it was previously saved as a result of copying |
552 ;; from B to A). | |
553 ;; | |
554 ;; Without the prefix argument, all commands operate on the current | |
555 ;; difference region. | |
556 ;; | |
557 ;; The total number of differences and the current difference number are | |
558 ;; always displayed in the mode line of the control window. | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
559 ;; |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
560 ;; If, after making changes to buffers A and B, you decide to save them, it |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
561 ;; is recommended to use `ediff-save-buffer', which is bound to `wa' and |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
562 ;; `wb' (`wa will save buffer A and `wb' saves buffer B). |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
563 ;; |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
564 ;; Typing `wf' will also save the diff output in a file. |
7267 | 565 |
566 ;;; Display Modes | |
567 ;; ------------- | |
568 | |
569 ;; Ediff can display files in one frame, stacked side-by-side or one on top | |
570 ;; of another; or it can display the files in different frames. When you | |
571 ;; start Ediff, it assumes a 1-frame mode. You can toggle the side-by-side | |
572 ;; and one-on-top-of-another displays by simply hitting 's'. | |
573 ;; | |
574 ;; Ediff switches to the multi-frame mode when: | |
575 ;; | |
576 ;; 1. file-A and file-B are in different frames (you have to put them into | |
577 ;; different frames manually); or | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
578 ;; 2. Ediff Control Panel is visible in one frame and one other file (A |
7267 | 579 ;; or B) is visible in another frame. If, say, fileA is visible in a |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
580 ;; different frame than Ediff Control Panel, fileB doesn't have to be |
7267 | 581 ;; visible. If it is, Ediff will continue displaying fileB in the frame |
582 ;; where it was visible before. If it isn't then Ediff will arrange for | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
583 ;; fileB to share a frame with Ediff Control Panel. |
7267 | 584 ;; |
585 ;; If all three buffers are in separate frames, Ediff will switch to a | |
586 ;; 3-frame mode. If Ediff buffers are currently visible only in two | |
587 ;; frames, Ediff will work in a 2-frame mode. In this mode, one of the | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
588 ;; frames will be shared by Ediff Control Panel and file-A or file-B |
7267 | 589 ;; (whichever is appropriate). |
590 | |
591 | |
592 ;;; Bugs: | |
593 ;; ---- | |
594 | |
595 ;; 1. The undo command doesn't restore deleted regions well. That is, if | |
596 ;; you delete all characters in a difference region and then invoke | |
597 ;; `undo', the reinserted text will most likely be reinserted outside of | |
7424 | 598 ;; what Ediff thinks is the current difference region. (This problem |
599 ;; doesn't seem to exist with Lucid Emacs.) | |
600 ;; | |
601 ;; If at any point you feel that difference regions are no longer correct, | |
602 ;; you can hit '!' to recompute the differences. | |
603 | |
604 ;; 2. Emacs 19.xx, where xx < 23, has several bugs related to overlays and | |
605 ;; faces. Somethimes, these may cause highlighting of the refinements or | |
606 ;; of the unselected differences to disappear. Hitting `!' will bring them | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
607 ;; back. In version 19.23 and later, these problems no longer occur. |
7424 | 608 |
609 ;; 3. On a monochrome display, the repertoire of faces with which to | |
610 ;; highlight fine differences is limited. By default, Ediff is using | |
611 ;; underlining. However, if the region is already underlied by some other | |
612 ;; overlays, there is no simple way to temporarily remove that residual | |
613 ;; underlining. This problem occurs when a buffer is highlighted with | |
614 ;; hilit19.el or font-lock.el packages. If this residual highlighting gets | |
615 ;; in the way, you can do the following. Both font-lock.el and hilit19.el | |
616 ;; provide commands for unhighlighting buffers. You can either place these | |
617 ;; commands in `ediff-prepare-buffer-hooks' (which will unhighlight every | |
618 ;; buffer used by Ediff) or you can execute them interactively, at any time | |
619 ;; and on any buffer. | |
620 | |
621 ;; 4. In Lucid Emacs (statically linked with Motif libraries), emerge.el | |
622 ;; and hence ediff.el won't start, unless you set (setq scrollbar-width 0). | |
623 ;; This is a Motif-related bug, I was told. | |
7267 | 624 |
625 | |
626 ;;; Change Log: | |
627 ;; ---------- | |
628 | |
629 ;; Thu Feb 3, 1994 | |
630 | |
631 ;; Added ediff-read-file-name, which is a stub that takes care of Lemacs | |
632 ;; versions of Emerge. (Thanks to Alastair Burt <burt@dfki.uni-kl.de>.) | |
633 ;; | |
634 ;; Fixed a bug in ediff-setup-windows that caused control window to | |
635 ;; appear in a wrong place when split-window-keep-point is nil | |
636 ;; (Thanks to Kevin Broadey <KevinB@bartley.demon.co.uk>.) | |
637 ;; | |
638 ;; Added mechanism for using faces instead of before/after flags. This | |
639 ;; looks much better on an X display, especially on a color one. | |
640 ;; (Thanks to Boris Goldowsky <boris@cs.rochester.edu> for the code | |
641 ;; that led to ediff-highlight-diff. | |
642 ;; Also, thanks to Kevin Esler <esler@ch.hp.com> for suggestions | |
643 ;; regarding highlighting differences on X displays.) | |
644 ;; | |
645 ;; Added functions to apply patches. | |
646 ;; (Thanks to Kevin Broadey <KevinB@bartley.demon.co.uk> for this | |
647 ;; suggestion.) | |
648 | |
649 ;; Fri Feb 4, 1994 | |
650 | |
651 ;; Added mechanism for toggling vertical/horizontal window split. | |
652 ;; (Inspired by a suggestion from Allan Gottlieb | |
653 ;; <gottlieb@allan.ultra.nyu.edu> -- thanks.) | |
654 ;; | |
655 ;; Added mechanism for toggling between highlighting using faces and | |
656 ;; highlighting using ASCII flags. | |
657 ;; | |
658 ;; Fixed a problem with undo. Now, Ediff has smartened up and doesn't | |
659 ;; keep undo info on ASCII flags inserted in buffer-A and buffer-B. | |
660 ;; So, if you edit the files while browsing through them, undo behaves | |
661 ;; as you would expect, i.e., faces/flags don't get in the way. | |
662 | |
663 ;; Sun Feb 6, 1994 | |
664 | |
665 ;; Added horizontal scrolling. Added ediff-position-region to ensure | |
666 ;; that difference regions in buffer-A and buffer-B are aligned with | |
667 ;; each other. Disabled ediff-toggle-split when buffers are displayed | |
668 ;; in different frames. | |
669 | |
670 ;; Mon Feb 7, 1994 | |
671 | |
672 ;; Added toggle-window help (Suggested by Boris Goldowsky | |
673 ;; <boris@cs.rochester.edu>.) | |
674 ;; Added functions to copy differences from one buffer to another and to | |
675 ;; recover old differences. | |
676 ;; Added prefix arguments to ediff-next-difference and | |
677 ;; ediff-previous-difference. | |
678 | |
679 ;; Tue Feb 8, 1994 | |
680 | |
681 ;; Replaced text properties with overlays. Fixed ediff-setup-windows. | |
682 ;; Added ediff-save-buffer to local-write-file-hooks to prevent user | |
683 ;; from saving corrupted states. (Thanks to <boris@cs.rochester.edu> | |
684 ;; for suggestion.) Instead, Ediff now has a pair of functions for | |
685 ;; safe saving of buffers. | |
686 ;; Changed ediff-read-file-name to be more intuitive on ediff-files. | |
687 ;; Added ediff-prepare-buffer-hooks. (Thanks to Kevin Esler | |
688 ;; <esler@ch.hp.com> for the idea.) | |
689 | |
690 ;; Wed Feb 9, 1994 | |
691 | |
692 ;; Cleanups in ediff-patch-file. Protected ediff-copy-diff against | |
693 ;; a bug that Emacs has in kill-region. | |
694 | |
695 ;; Thu Feb 10, 1994 | |
696 | |
697 ;; Added support for Lemacs. (Thanks to Alastair Burt | |
698 ;; <burt@dfki.uni-kl.de> for coercing Ediff into working under Lemacs.) | |
699 ;; Added ediff-kill-buffer-carefully and other suggestions by Boris | |
700 ;; Goldowsky <boris@cs.rochester.edu>. | |
701 ;; Refined the protection against interference with highlighting caused | |
702 ;; by Hilit19. Added the variable ediff-third-party-highlighting. | |
703 ;; Added mechanisn for unhighlighting regions highlighted with Hilit19 | |
704 ;; before hightlighting them with Ediff's overlays. (And for | |
705 ;; rehighlighting them with Hilit19, when the current difference moves on.) | |
706 | |
707 ;; Sun Feb 13, 1994 | |
708 | |
709 ;; Added ediff-place-flags-in-buffer and ediff-remote-exit, which are | |
710 ;; modifications of Emerge's similar functions. The difference is that | |
711 ;; in Ediff they make ediff-before-flag and ediff-after-flag into | |
712 ;; read-only regions, so the user can't change them by mistake. | |
713 ;; | |
714 ;; Adopted a suggestion by Boris Goldowsky <boris@cs.rochester.edu> | |
715 ;; that led to a more elegant treatment of faces. | |
716 ;; | |
717 ;; Added protection against interference with Font-Lock highlighting | |
718 ;; similar to that of Hilit19's protection. | |
719 | |
720 ;; Tue Feb 15, 1994 | |
721 | |
722 ;; Deleted spurious (auto-save-mode 1) in ediff-control-buffer, which | |
723 ;; was causing this buffer to be auto-saved for no good reason. | |
724 ;; Added read-only protection to ediff-before/after-flags in Lemacs. | |
725 ;; (Thanks to Alastair Burt <burt@dfki.uni-kl.de> for help in testing.) | |
726 | |
727 ;; Wed Feb 16, 1994 | |
728 | |
729 ;; Further fixes in the Lemacs part. Changed highlighted region in | |
730 ;; ediff-highlight-diff so that an extra character will be highlighted | |
731 ;; only if a difference is empty (thereby allowing the user to see where an | |
732 ;; insertion or a deletion has taken place). | |
733 ;; | |
734 ;; Simplified interaction with other highlighting packages by giving | |
735 ;; Ediff overlays the highest priority. (Taking a cue from | |
736 ;; ediff-highlight-diff-lemacs written by Alastair Burt | |
737 ;; <burt@dfki.uni-kl.de>.) Zapped ediff-third-party-highlighting | |
738 ;; variable and hooks that were previously used to | |
739 ;; unhighlight/rehighlight buffers when hilit19/font-lock are on. | |
740 | |
741 ;; Fri Feb 18, 1994 | |
742 | |
743 ;; Added a bit more sophistication to ediff-read-file-name. Now, | |
744 ;; ediff-files remembers both, the file-A and the file-B directories. | |
745 ;; They are offered as defaults when ediff-use-last-dir is set to t. | |
746 | |
747 ;; Fri Feb 22, 1994 | |
748 | |
749 ;; Added ediff-before-change-guard to remove ASCII highlighting when | |
750 ;; the user attempts to change buffer-A/B. This is needed because | |
751 ;; otherwise the undo info may become screwed up in those buffers. | |
752 ;; Hitting 'h' (ediff-toggle-hilit) on a dumb terminal will toggle | |
753 ;; between ASCII highlighting and no highlighting. | |
754 | |
755 ;; Fri Feb 24, 1994 | |
756 | |
757 ;; Fixed problems with multiple Ediff sessions running simultaneously. | |
758 | |
759 ;; Tue Mar 1, 1994 | |
760 | |
761 ;; Added vc-ediff, the Ediff interface to vc.el. (Thanks to Eric | |
762 ;; Freudenthal <freudent@jan.ultra.nyu.edu> for contributing this | |
763 ;; function.) | |
764 | |
765 ;; Sun Mar 6, 1994 | |
766 | |
767 ;; Added rcs-ediff, an Ediff interface to RCS via rcs.el. (Thanks to | |
768 ;; Alastair Burt <burt@dfki.uni-kl.de>.) | |
769 ;; Some minor improvements. | |
770 | |
771 ;; Tue March 15, 1994 | |
772 | |
773 ;; Fixed a buglet in defining ediff-current-diff-face-A/B. | |
774 ;; (Thanks to Job Ganzevoort <Job.Ganzevoort@cwi.nl>.) | |
775 | |
776 ;; Tue March 22, 1994 | |
777 | |
778 ;; Fixed a bug with ediffing narrowed buffers, reported by Kevin | |
779 ;; Broadey <KevinB@bartley.demon.co.uk>. | |
780 ;; Made Ediff to work with files that have incomplete last line. | |
7391 | 781 ;; Made Ediff execute diff and patch using Bourne Shell, which |
7267 | 782 ;; should eliminate problems with $prompt that some people had. |
783 | |
784 ;; Thu March 24, 1994 | |
785 | |
786 ;; Achieved quadratic speedup in the size of the file by replacing the | |
787 ;; slow goto-line by forward-line. Ediff is now *much* faster than | |
788 ;; Emerge on large files. Converted demarkation of difference regions | |
789 ;; from markers to overlays. This will later allow us to highlight all | |
790 ;; diffs, not just the current one. | |
791 | |
792 ;; Wed March 30, 1994 | |
793 | |
794 ;; Under X, Ediff now highlights all differences in dim colors and the | |
795 ;; current difference in bright colors. Improved Lucid Emacs support. | |
796 | |
797 ;; Thu March 31, 1994 | |
798 | |
799 ;; Changed toggle hilit to cycle through 3 states: highlighting all | |
800 ;; diffs, highlighting only the current diff, and highlighting using | |
801 ;; ASCII flags. | |
802 ;; Added support for difference regions that are not full lines. | |
803 | |
804 ;; Fri April 1, 1994 | |
805 | |
806 ;; Fixed bugs related to writing buffers A and B. | |
807 ;; Added commands 'ga', 'gb' to jump directly to the closest diff in | |
808 ;; buffer A and B, respectively. | |
809 | |
7424 | 810 ;; Fri April 11, 1994 |
811 | |
812 ;; Added `ediff-recompute-diffs', a function that lets the user recompute | |
813 ;; difference regions after extensive editing done to buffers A and B | |
814 ;; (bound to `!'). | |
815 | |
816 ;; Wed April 13, 1994 | |
817 | |
818 ;; Added the new feature: refining the current difference region. | |
819 ;; This would highlight the precise differences between the regions in | |
820 ;; buffer A and B. (A way to implement this was suggested by Boris | |
821 ;; Goldowsky <boris@cs.rochester.edu>.) | |
822 ;; | |
823 ;; Fixed Ediff to be immune to several different versions of rcs.el | |
824 ;; that are currently in distribution. | |
825 | |
826 ;; Thu April 14, 1994 | |
827 | |
828 ;; Ediff now respects X resources for the faces it uses. It no longer | |
829 ;; barks when the colormap has no colors it is using; or when face | |
830 ;; fonts can't be italicized, etc. | |
831 | |
832 ;; Fri April 15, 1994 | |
833 | |
834 ;; Changed `ediff-setup-windows' to minimize the need to delete and | |
835 ;; create windows. Now jumps faster from diff to diff. | |
836 | |
837 ;; Sat April 16, 1994 | |
838 | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
839 ;; Added Ediff to the File menu on the menu bar (FSF's version). |
7424 | 840 |
841 ;; Mon April 18, 1994 | |
842 | |
843 ;; Fixed to work with OS/2's PM-Emacs. | |
844 | |
845 ;; Thu April 21, 1994 | |
846 | |
847 ;; Lemacs' menus added (thanks to Alastair Burt for the help). | |
848 | |
849 ;; Wed April 28, 1994 | |
850 | |
851 ;; Fixed ediff-leave-window-config (thanks to Norbert Kiesel | |
852 ;; <norbert@i3.informatik.rwth-aachen.de>), ediff-shell and | |
853 ;; ediff-protect-metachars (thanks to Richard Stanton | |
854 ;; <stanton@haas.berkeley.edu>). Made access to difference | |
855 ;; overlays structure-independent, making it less bug-prone. | |
856 ;; Patched ediff-read-file-name to work more intuitively with directory | |
857 ;; names (thanks to Kevin Broadey <KevinB@bartley.demon.co.uk>). | |
858 | |
859 ;; Mon May 2, 1994 | |
860 | |
861 ;; Added `ediff-frame-has-menubar' to guard against the possibility that | |
862 ;; the current frame has no menu bar. | |
863 | |
864 ;; Fri May 6, 1994 | |
865 | |
866 ;; Fixed buglet in vc-ediff (thanks to Ray Nickson <nickson@cs.uq.oz.au>). | |
867 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
868 ;; Wed May 18, 1994 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
869 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
870 ;; Modified ediff-read-file-name to not put long file names in the |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
871 ;; default prompt area, as suggested by KevinB@bartley.demon.co.uk. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
872 ;; Applied patch supplied by burt@dfki.uni-kl.de, fixing a problem with |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
873 ;; ediff-diff-to-diff in Lemacs. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
874 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
875 ;; Tue May 31, 1994 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
876 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
877 ;; Added ediff-forward-word-function (as suggested by Job Ganzevoort |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
878 ;; <Job.Ganzevoort@cwi.nl>). Modified ediff-default-quit-hook so it |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
879 ;; will clean things up in a more satisfactory way. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
880 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
881 ;; Thu Jun 2, 1994 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
882 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
883 ;; Added `ediff-toggle-regexp-match', which allows the user to step |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
884 ;; through only those difference regions that match some regexp; or, |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
885 ;; vice versa, to skip over regions that match a regexp. (This feature |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
886 ;; was suggested by Andy Scott <ascott@pcocd2.intel.com>.) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
887 ;; Added ediff-eval-in-buffer, which is a modified emerge-eval-in-buffer. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
888 ;; The function ediff-status-info, bound to `i', now replaces and extends |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
889 ;; ediff-file-names and ediff-line-numbers, which were bound to `f' |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
890 ;; and `i', respectively. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
891 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
892 ;; Wed Jun 8, 1994 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
893 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
894 ;; Made `ediff-frame-has-menubar' into a function; copied |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
895 ;; `emerge-defvar-local' and turned it into `ediff-defvar-local' |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
896 ;; This is supposed to make the same ediff.elc file work for both Emacs |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
897 ;; and Lucid Emacs, at least, if compiled under Lucid Emacs. (Thanks |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
898 ;; to Eric Eide <eeide@asylum.cs.utah.edu>.) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
899 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
900 ;; Wed Jun 10, 1994 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
901 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
902 ;; Improved `ediff-read-file-name' and `ediff-buffers' so they are now |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
903 ;; providing more intuitive defaults. Modified `ediff-read-file-name' |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
904 ;; so it won't cause problems under OS/2. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
905 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
906 ;; Fri Jun 24, 1994 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
907 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
908 ;; Modified ediff-find-file, ediff-files-internal, and made |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
909 ;; emerge-verify-file-buffer into ediff-verify-file-buffer so that |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
910 ;; Ediff will work correctly with remote and compressed |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
911 ;; files. (Suggested by Sandy Rutherford <sandy@ibm550.sissa.it>.) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
912 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
913 ;; Fri Jun 28, 1994 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
914 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
915 ;; Fixed ediff-patch-files to work with remote and compressed files. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
916 |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
917 ;; Wed July 20, 1994 |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
918 |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
919 ;; Changed menu bar items per RMS's suggestion. Changed odd/even faces |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
920 ;; in Lemacs to italic. Changed ediff-*-face-* variables so that they |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
921 ;; will contain names of faces instead of the face internal |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
922 ;; representation. (Copy-face works better with face names than with |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
923 ;; face internal representation. With face internal representation, if |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
924 ;; a face vector mentions a font explicitly, copy-face may attempt to |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
925 ;; copy this font, which would cause an error if the font has a wrong |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
926 ;; size for one of the existing frames.) Improved the way |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
927 ;; mode-line-buffer-identification is set in ediff-setup so that Ediff |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
928 ;; will accommodate the way buffers are identified in mode-line.el and |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
929 ;; uniquify.el. |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
930 |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
931 ;; Fri August 5, 1994 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
932 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
933 ;; Ediff can now automatically skip over regions that differ only in |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
934 ;; the white space and line breaks. This is controled with the variable |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
935 ;; `ediff-ignore-similar-regions' and can be toggled on/off by typing |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
936 ;; `##'. |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
937 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
938 ;; Mon August 8, 1994 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
939 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
940 ;; If ediff-save-buffer is invoked with `wf', it'll save the diff |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
941 ;; output in a file. |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
942 |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
943 ;; Wed August 24, 1994 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
944 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
945 ;; Fixed ediff-toggle-read-only and ediff-patch-file so that they will |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
946 ;; check out version-controled files before modifying them. This will |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
947 ;; permit checking the modified versions back in. In earlier |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
948 ;; versions, such modifications could be lost, unless the user takes |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
949 ;; special care of preserving them. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
950 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
951 ;; Tue August 30, 1994 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
952 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
953 ;; Added ediff-submit-report. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
954 ;; Introduced ediff-revision as a uniform way of calling vc.el and |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
955 ;; rcs.el. This is controled by ediff-version-control-package |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
956 ;; variable. Functions vc-ediff, rcs-ediff are replaced by their |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
957 ;; internal versions. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
958 ;; Added ediff-find-file-name-handler function to smooth out the |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
959 ;; transition from Emacs 19.22/Lucid 19.9 to 19.23/19/10 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
960 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
961 ;; Thus September 1, 1994 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
962 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
963 ;; Made ediff-overlay-put and ediff-move-overlay into bona fide |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
964 ;; functions (rather than fset symbols). These now check if overlay's |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
965 ;; buffer is alive. If not, overlay is deleted. This overcomes some of |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
966 ;; the problems with Lemacs. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
967 |
7424 | 968 |
969 ;;; Acknowledgements: | |
970 | |
971 ;; Special thanks to Alastair Burt <burt@dfki.uni-kl.de>, Kevin Esler | |
972 ;; <esler@ch.hp.com>, Kevin Broadey <KevinB@bartley.demon.co.uk>, | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
973 ;; Harald Boegeholz <hwb@machnix.mathematik.uni-stuttgart.de>, |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
974 ;; Robert Estes <estes@ece.ucdavis.edu>, Eric Eide <eeide@asylum.cs.utah.edu>, |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
975 ;; Eric Freudenthal <freudent@jan.ultra.nyu.edu>, Job Ganzevoort |
7424 | 976 ;; <Job.Ganzevoort@cwi.nl>, Boris Goldowsky <boris@cs.rochester.edu>, |
977 ;; Allan Gottlieb <gottlieb@allan.ultra.nyu.edu>, Xiaoli Huang | |
978 ;; <hxl@epic.com>, irvine@lks.csi.com, jaffe@chipmunk.cita.utoronto.ca, | |
979 ;; David Karr, <dkarr@nmo.gtegsc.com>, Norbert Kiesel | |
980 ;; <norbert@i3.informatik.rwth-aachen.de>, Heinz Knutzen | |
981 ;; <hk@informatik.uni-kiel.d400.de>, Martin Maechler | |
982 ;; <maechler@stat.math.ethz.ch>, Richard Mlynarik <mly@adoc.xerox.com>, | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
983 ;; Eyvind Ness <Eyvind.Ness@hrp.no>, Ray Nickson <nickson@cs.uq.oz.au>, |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
984 ;; Sandy Rutherford <sandy@ibm550.sissa.it>, Andy Scott |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
985 ;; <ascott@pcocd2.intel.com>, Richard Stallman <rms@gnu.ai.mit.edu>, |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
986 ;; Richard Stanton, <stanton@haas.berkeley.edu>, Peter Stout |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
987 ;; <Peter_Stout@cs.cmu.edu> for contributing ideas, patches, and bug reports. |
7424 | 988 ;; |
989 ;; Thanks also to many others who felt obliged to drop a thanks note. | |
990 | |
991 | |
7267 | 992 |
993 ;;; Code: | |
994 | |
7424 | 995 (require 'emerge) ;; Ediff uses some functions defined in emerge.el |
7267 | 996 |
997 | |
998 ;;; Macros | |
999 (defmacro ediff-if-lucid () | |
1000 (` (string-match "Lucid" emacs-version))) | |
7424 | 1001 |
7267 | 1002 (defmacro ediff-odd-p (arg) |
1003 (` (eq (logand (, arg) 1) 1))) | |
7424 | 1004 |
7267 | 1005 (defmacro ediff-buffer-live-p (buf) |
1006 (` (and (, buf) (get-buffer (, buf)) (buffer-name (get-buffer (, buf)))))) | |
1007 | |
7424 | 1008 (defmacro ediff-get-buffer (arg) |
1009 (` (cond ((eq (, arg) 'A) ediff-A-buffer) | |
1010 ((eq (, arg) 'B) ediff-B-buffer) | |
1011 ) | |
1012 )) | |
1013 | |
1014 (defmacro ediff-char-to-buftype (arg) | |
1015 (` (cond ((eq (, arg) ?a) 'A) | |
1016 ((eq (, arg) ?b) 'B) | |
1017 ) | |
1018 )) | |
1019 | |
1020 (defmacro ediff-get-difference (n) | |
1021 (` (aref ediff-difference-vector (, n)))) | |
1022 | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1023 ;; tell if it has been previously found that the region doesn't |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1024 ;; contain diffs other than the white space and newlines |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1025 ;; The argument, N, is the diff region number used by Ediff to index the |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1026 ;; diff vector. It is 1 less than the number seen by the user. |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1027 (defmacro ediff-no-fine-diffs (n) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1028 (` (aref (ediff-get-difference n) 3))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1029 |
7424 | 1030 (defmacro ediff-get-diff-overlay-from-vector (vec buf-type) |
1031 (` (aref (, vec) | |
1032 (cond ((eq (, buf-type) 'A) 0) | |
1033 ((eq (, buf-type) 'B) 1) | |
1034 ) | |
1035 ))) | |
1036 | |
1037 (defmacro ediff-get-diff-overlay (n buf-type) | |
1038 (` (ediff-get-diff-overlay-from-vector | |
1039 (ediff-get-difference (, n)) | |
1040 (, buf-type)))) | |
1041 | |
1042 (defmacro ediff-get-fine-diff-vector-from-vec (current-diff-vec) | |
1043 (` (aref (, current-diff-vec) 2))) | |
1044 | |
1045 (defmacro ediff-set-fine-diff-vector (n fine-vec) | |
1046 (` (aset (ediff-get-difference (, n)) 2 (, fine-vec)))) | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1047 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1048 ;; if flag is t, puts a mark on diff region saying that |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1049 ;; the differences are in white space only. If flag is nil, |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1050 ;; the region is marked as essential (i.e., differences are |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1051 ;; not just in the white space and newlines.) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1052 (defmacro ediff-mark-diff-as-space-only (n flag) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1053 (` (aset (ediff-get-difference (, n)) 3 (, flag)))) |
7424 | 1054 |
1055 (defmacro ediff-get-fine-diff-vector (n) | |
1056 (` (ediff-get-fine-diff-vector-from-vec (ediff-get-difference (, n))))) | |
1057 | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1058 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1059 (defmacro ediff-defvar-local (var value doc) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1060 "Defines SYMBOL as an advertised local variable. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1061 Performs a defvar, then executes `make-variable-buffer-local' on |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1062 the variable. Also sets the `preserved' (Emacs) or `permanent-local' (Lucid) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1063 property, so that `kill-all-local-variables' (called by major-mode setting |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1064 commands) won't destroy Ediff control variables. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1065 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1066 This is a merge of `emerge-defvar-local' for Emacs and Lucid Emacs. It is |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1067 needed to make the same ediff.elc work under both Emacsen." |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1068 (` (progn |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1069 (defvar (, var) (, value) (, doc)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1070 (make-variable-buffer-local '(, var)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1071 (put '(, var) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1072 (if (ediff-if-lucid) 'permanent-local 'preserved) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1073 t)))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1074 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1075 (defmacro ediff-eval-in-buffer (buffer &rest forms) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1076 "Macro to switch to BUFFER, evaluate FORMS, returns to original buffer. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1077 Differs from `save-excursion' in that it doesn't save the point and mark. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1078 This is essentially `emerge-eval-in-buffer' with the test for live buffers." |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1079 (` (let ((StartBuffer (current-buffer))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1080 (if (ediff-buffer-live-p (, buffer)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1081 (unwind-protect |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1082 (progn |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1083 (set-buffer (, buffer)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1084 (,@ forms)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1085 (set-buffer StartBuffer)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1086 (beep 1) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1087 (message "You seem to have killed an essential Ediff buffer---quit!")) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1088 ))) |
7424 | 1089 |
1090 | |
1091 ;;; Functions | |
7267 | 1092 |
1093 (defun ediff-mode () | |
1094 "Ediff mode is used by the Ediff file-difference package. | |
1095 It is entered only through one of the following commands: | |
7419 | 1096 `ediff' |
1097 `ediff-files' | |
1098 `ediff-buffers' | |
1099 `epatch' | |
1100 `ediff-patch-file' | |
1101 `ediff-patch-buffer' | |
7424 | 1102 `epatch-buffer' |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1103 `ediff-revision' |
7267 | 1104 |
1105 Commands: | |
1106 \\{ediff-mode-map}" | |
1107 (interactive) | |
1108 (kill-all-local-variables) | |
1109 (setq major-mode 'ediff-mode) | |
1110 (setq mode-name "Ediff")) | |
1111 | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1112 (defun ediff-version () |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1113 "Return string describing the version of Ediff. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1114 When called interactively, displays the version." |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1115 (interactive) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1116 (if (interactive-p) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1117 (message (ediff-version)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1118 (format "Ediff %s of %s" ediff-version ediff-date))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1119 |
7267 | 1120 |
1121 ;; Hook variables | |
1122 | |
1123 (defvar ediff-before-setup-windows-hooks nil | |
7424 | 1124 "*Hooks to run before Ediff sets its own window config. |
1125 This can be used to save the previous window config, which can be restored | |
1126 on ediff-quit or ediff-suspend.") | |
7267 | 1127 (defvar ediff-startup-hooks nil |
1128 "*Hooks to run in the control buffer after Ediff has been set up.") | |
1129 (defvar ediff-select-hooks nil | |
1130 "*Hooks to run after a difference has been selected.") | |
1131 (defvar ediff-unselect-hooks nil | |
1132 "*Hooks to run after a difference has been unselected.") | |
1133 (defvar ediff-prepare-buffer-hooks nil | |
1134 "*Hooks called after buffers A and B are set up.") | |
1135 (defvar ediff-load-hooks nil | |
7419 | 1136 "*Hook run after Ediff is loaded. Can be used to change defaults.") |
7267 | 1137 |
7424 | 1138 (defvar ediff-suspend-hooks (list 'ediff-default-suspend-hook) |
7419 | 1139 "*Hooks to run in the Ediff control buffer when Ediff is suspended.") |
7424 | 1140 (defvar ediff-quit-hooks (list 'ediff-default-quit-hook) |
7419 | 1141 "*Hooks to run in the Ediff control buffer after finishing Ediff.") |
7267 | 1142 |
1143 (make-variable-buffer-local 'local-write-file-hooks) | |
1144 (make-variable-buffer-local 'before-change-function) | |
1145 | |
1146 ;; Help messages | |
1147 | |
1148 (defconst ediff-help-message-long | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1149 " Moving around | Toggling features | Miscellaneous |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1150 =======================|===========================|=========================== |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1151 p,DEL -previous diff | s -vert/horiz split | ab/ba -copy diff A->B/B->A |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1152 n,SPC -next diff | h -hiliting | ra/rb -restore diff in A/B |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1153 j -jump to diff | @ -auto-refining | * -refine diff |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1154 ga/gb -to point in A/B |---------------------------| ! -recompute diffs |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1155 c -recenter | ## -skip whitespace |--------------------------- |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1156 v/V -scroll up/down | #f/#h -focus/hide regions | wa/wb -save buf A/B |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1157 </> -scroll lft/rght | A/B -read-only buf A/B | wf -save diff output |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1158 =======================|===========================|=========================== |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1159 | bug -submit bug report | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1160 i -status info | ? -toggle help window | z/q -suspend/quit Ediff" |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1161 ) |
7267 | 1162 |
1163 (defconst ediff-help-message-short | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1164 " ? - toggle help window") |
7267 | 1165 |
1166 (defvar ediff-help-message ediff-help-message-long | |
7419 | 1167 "*The actual help message.") |
7267 | 1168 |
7424 | 1169 ;; diff stuff. |
7267 | 1170 (defvar ediff-diff-program "diff" |
7419 | 1171 "*Name of the program that compares two files.") |
7267 | 1172 (defvar ediff-diff-options "" |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1173 "*Options to pass to `ediff-diff-program'. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1174 If diff\(1\) is used as `ediff-diff-program', then the most useful options are |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1175 `-w', to ignore space, and `-i', to ignore case of letters.") |
7267 | 1176 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1177 ;; Fine differences |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1178 (defvar ediff-forward-word-function 'ediff-forward-word |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1179 "*Function to call to move to the next word. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1180 Used for splitting difference regions into individual words.") |
7424 | 1181 |
1182 (defvar ediff-fine-diff-program "diff" | |
1183 "*Name of the program that compares the current diff regions for fine differences. | |
1184 | |
1185 This program should produce output in the format of diff. One could | |
1186 possibly use `spiff' here if appropriate options are set.") | |
1187 | |
1188 (defvar ediff-fine-diff-options "" | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1189 "*Options to pass to `ediff-fine-diff-program'. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1190 If diff\(1\) is used as `ediff-diff-program', then the most useful options are |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1191 `-w', to ignore space, and `-i', to ignore case of letters.") |
7424 | 1192 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1193 (defvar ediff-whitespace " \n\t\C-j" |
7424 | 1194 "*White space. Used to split strings into words.") |
1195 | |
1196 (defvar ediff-word-1 "a-zA-Z---_`'.?!:" | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1197 "*Characters matching this regexp constitute words of type 1. |
7424 | 1198 |
1199 Ediff is using a very simple schema for splitting text into words, which is | |
1200 used to determine fine differences between regions. There are two types of | |
1201 words. One consists entirely out of characters in `ediff-word-1' and | |
1202 another out of characters matching `ediff-word-1'.") | |
1203 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1204 (defvar ediff-word-2 "^a-zA-Z---_`'.?!: \t\n\C-j" |
7424 | 1205 "*Characters matching this regexp constitute words of type 2. |
1206 See `ediff-word-1' for more details.") | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1207 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1208 ;; Selective browsing |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1209 |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1210 (ediff-defvar-local ediff-skip-diff-region-function 'ediff-show-all-diffs |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1211 "Function that determines the next/previous diff region to show. |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1212 Should return t for regions to be ignored and nil otherwise. |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1213 This function gets a region number as an argument. The region number |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1214 is the one used internally by Ediff. It is 1 less than the number seen |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1215 by the user.") |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1216 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1217 (ediff-defvar-local ediff-regexp-focus-A "" |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1218 "Regexp that determines buf A regions to focus on when skipping to diff.") |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1219 (ediff-defvar-local ediff-regexp-focus-B "" |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1220 "Regexp that determines buf B regions to focus on when skipping to diff.") |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1221 |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1222 (ediff-defvar-local ediff-regexp-hide-A "" |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1223 "Regexp that determines buf A regions to ignore when skipping to diff.") |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1224 (ediff-defvar-local ediff-regexp-hide-B "" |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1225 "Regexp that determines buf B regions to ignore when skipping to diff.") |
7424 | 1226 |
7267 | 1227 |
1228 ;; Support for patches | |
1229 | |
1230 (defvar ediff-patch-program "patch" | |
7419 | 1231 "*Name of the program that applies patches.") |
7267 | 1232 (defvar ediff-patch-options "" |
7419 | 1233 "*Options to pass to ediff-patch-program.") |
7267 | 1234 |
7424 | 1235 (defvar ediff-shell (cond ((eq system-type 'emx) "cmd") ;; OS/2 |
1236 (t "sh")) ;; unix | |
1237 "*The shell used to run diff and patch. If user's .profile or | |
1238 .cshrc files are set up correctly, any shell will do. However, some people | |
1239 set $prompt or other things incorrectly, which leads to undesirable output | |
1240 messages. These may cause Ediff to fail. In such a case, set ediff-shell | |
1241 to a shell that you are not using or, better, fix your shell's startup file.") | |
1242 | |
7267 | 1243 (defvar ediff-diff-ok-lines-regexp |
1244 "^\\([0-9,]+[acd][0-9,]+$\\|[<>] \\|---\\|Warning:\\)" | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1245 "Regexp that matches normal output lines from `ediff-diff-program'. |
7267 | 1246 This is mostly lifted from Emerge, except that Ediff also considers the |
1247 'Missing newline' message to be 'normal output.' | |
1248 Lines that do not match are assumed to be error messages.") | |
1249 | |
7424 | 1250 (defvar ediff-fine-diff-ok-lines-regexp |
1251 "^\\([0-9,]+[acd][0-9,]+$\\|[<>] \\|---\\|Warning:\\)" | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1252 "Regexp that matches normal output lines from `ediff-fine-diff-program'. |
7424 | 1253 This is mostly lifted from Emerge, except that Ediff also considers the |
1254 'Missing newline' message to be 'normal output.' | |
1255 Lines that do not match are assumed to be error messages.") | |
1256 | |
7267 | 1257 (defvar ediff-match-diff-line (let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)")) |
1258 (concat "^" x "\\([acd]\\)" x "$")) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1259 "Pattern to match lines produced by diff that describe differences.") |
7267 | 1260 |
1261 (defvar ediff-patch-buf nil | |
1262 "The buffer of the patch file.") | |
1263 (defvar ediff-patch-diagnostics nil | |
7391 | 1264 "The buffer where patch would display its diagnostics.") |
7267 | 1265 |
1266 | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1267 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1268 ;; Copying difference regions between buffers. |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1269 (ediff-defvar-local ediff-killed-diffs-alist nil |
7424 | 1270 "A list of killed diffs. |
7419 | 1271 A diff is saved here if it is replaced by a diff |
7267 | 1272 from another buffer. This alist has the form: |
7639 | 1273 \((num (A . diff) (B . diff)) ...), |
7419 | 1274 where A or B parts may be missing.") |
7267 | 1275 |
1276 | |
1277 ;; Highlighting | |
1278 (defvar ediff-before-flag-bol | |
1279 ;"vvvvvvvvvvvvvvvv---- ediff ----vvvvvvvvvvvvvvv\n" | |
1280 ">>--->>>\n" | |
7424 | 1281 "*Flag placed above the highlighted block of differences. |
1282 Must end with newline. Must be set before Ediff is loaded.") | |
7267 | 1283 (defvar ediff-after-flag-bol |
1284 ;"^^^^^^^^^^^^^^^^---- ediff ----^^^^^^^^^^^^^^^\n" | |
1285 "<<<---<<\n" | |
7419 | 1286 "*Flag placed below the highlighted block of differences. |
7424 | 1287 Must end with newline. Must be set before Ediff is loaded.") |
7267 | 1288 |
1289 (defvar ediff-before-flag-mol ">>--->>>" | |
7419 | 1290 "*Like ediff-before-flag, used when a difference starts in mid-line.") |
7267 | 1291 (defvar ediff-after-flag-mol "<<<---<<" |
7419 | 1292 "*Like ediff-after-flag, used when a difference starts in mid-line.") |
7267 | 1293 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1294 (ediff-defvar-local ediff-before-flag-A nil |
7267 | 1295 "This is the actual ASCII before-flag in effect in buffer A. |
1296 It is either `ediff-before-flag-mol' or `ediff-before-flag-bol' depending | |
1297 on whether the selected difference region starts in the middle of a line | |
1298 or at the beginning of a line.") | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1299 (ediff-defvar-local ediff-after-flag-A nil |
7267 | 1300 "This is the actual ASCII after-flag in effect in buffer A. |
1301 It is either `ediff-before-flag-mol' or `ediff-before-flag-bol' depending | |
1302 on whether the selected difference region starts in the middle of a line | |
1303 or at the beginning of a line.") | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1304 (ediff-defvar-local ediff-before-flag-B nil |
7267 | 1305 "This is the actual ASCII before-flag in effect in buffer B. |
1306 It is either `ediff-before-flag-mol' or `ediff-before-flag-bol' depending | |
1307 on whether the selected difference region starts in the middle of a line | |
1308 or at the beginning of a line.") | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1309 (ediff-defvar-local ediff-after-flag-B nil |
7267 | 1310 "This is the actual ASCII after-flag in effect in buffer B. |
1311 It is either `ediff-before-flag-mol' or `ediff-before-flag-bol' depending | |
1312 on whether the selected difference region starts in the middle of a line | |
1313 or at the beginning of a line.") | |
1314 | |
1315 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1316 (ediff-defvar-local ediff-want-faces t |
7419 | 1317 "If t, differences are highlighted using faces on a window system. |
1318 If nil, they are highlighted using ASCII flags, ediff-before-flag | |
7267 | 1319 and ediff-after-flag. On a non-window system, differences are always |
1320 highlighted using ASCII flags. | |
1321 | |
7424 | 1322 This variable can be set either in .emacs or toggled interactively, using |
1323 ediff-toggle-hilit.") | |
1324 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1325 (ediff-defvar-local ediff-want-default-menus t |
7424 | 1326 "If t, Ediff will set up menus in the menu bar. |
1327 This variable must be set before Ediff is loaded. If you don't like the | |
1328 look of the default menus, set this variable to nil and make your own | |
1329 menus.") | |
1330 | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1331 (ediff-defvar-local ediff-auto-refine (if window-system 'on 'nix) |
7424 | 1332 "If `'on', Ediff auto-highlights fine diffs for the current diff region. |
1333 If `off', auto-highlighting is not used. If `'nix', no fine diffs are shown | |
1334 at all, unless the user force-refines the region by hitting `*'. | |
1335 | |
1336 This variable can be set either in .emacs or toggled interactively, using | |
1337 ediff-toggle-hilit.") | |
1338 | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1339 (ediff-defvar-local ediff-ignore-similar-regions nil |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1340 "*If t, skip over difference regions that differ only in the white space and line breaks.") |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1341 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1342 (ediff-defvar-local ediff-auto-refine-limit 700 |
7424 | 1343 "Auto-refine only those regions that are smaller than this number of bytes.") |
1344 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1345 (ediff-defvar-local ediff-highlight-all-diffs t |
7424 | 1346 "If nil, only the selected differences are highlighted. |
1347 This variable can be set either in .emacs or toggled interactively, using | |
1348 ediff-toggle-hilit.") | |
7267 | 1349 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1350 (ediff-defvar-local ediff-highlighting-style nil |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1351 "A var local to each control panel buffer. |
7419 | 1352 Indicates highlighting style in effect for this buffer: `face', `ascii', |
1353 nil -- temporarily unhighlighted, `off' -- turned off \(on a dumb | |
1354 terminal only\).") | |
7267 | 1355 |
1356 | |
1357 | |
1358 ;; Variables that control each Ediff session. They are local to the | |
1359 ;; control buffer. | |
1360 | |
1361 ;; Mode variables | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1362 (ediff-defvar-local ediff-A-buffer nil |
7267 | 1363 "The buffer in which the A variant is stored.") |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1364 (ediff-defvar-local ediff-B-buffer nil |
7267 | 1365 "The buffer in which the B variant is stored.") |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1366 (ediff-defvar-local ediff-control-buffer nil |
7267 | 1367 "The control buffer of ediff. ") |
1368 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1369 ;(ediff-defvar-local ediff-control-buffer-suffix nil |
7424 | 1370 ; "The suffix of the control buffer name. ") |
7267 | 1371 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1372 (ediff-defvar-local ediff-control-window nil |
7267 | 1373 "The control window.") |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1374 (ediff-defvar-local ediff-window-config-saved "" |
7424 | 1375 "Ediff's window configuration. |
1376 Used to minimize the need to rearrange windows.") | |
7267 | 1377 |
1378 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1379 (ediff-defvar-local ediff-A-buffer-values nil |
7267 | 1380 "Keeps working values of ediff-saved-variables for ediff-A-buffer.") |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1381 (ediff-defvar-local ediff-B-buffer-values nil |
7267 | 1382 "Keeps working values of ediff-saved-variables for ediff-B-buffer.") |
1383 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1384 (ediff-defvar-local ediff-A-buffer-values-setup nil |
7267 | 1385 "Remembers ediff-saved-variables for ediff-A-buffer as they were at setup.") |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1386 (ediff-defvar-local ediff-B-buffer-values-setup nil |
7267 | 1387 "Remembers ediff-saved-variables for ediff-B-buffer as they were at setup.") |
1388 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1389 (ediff-defvar-local ediff-difference-vector nil |
7424 | 1390 "Vector of differences between the variants. |
7419 | 1391 Each difference is represented by a vector of two overlays. The first |
7424 | 1392 overlays the difference section in the A buffer and the second overlays the |
1393 diff in the B buffer. If a difference section is empty, the corresponding | |
1394 overlay's endpoints coincide. ") | |
7267 | 1395 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1396 (ediff-defvar-local ediff-current-difference -1 |
7267 | 1397 "The difference that is currently selected.") |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1398 (ediff-defvar-local ediff-number-of-differences nil |
7267 | 1399 "Number of differences found.") |
1400 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1401 (ediff-defvar-local ediff-diff-buffer nil |
7424 | 1402 "Buffer containing the output of diff, which is used by Ediff to step |
1403 through files.") | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1404 (ediff-defvar-local ediff-fine-diff-buffer nil |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1405 "Buffer used for diff-style fine differences between regions.") |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1406 (ediff-defvar-local ediff-tmp-buffer nil |
7424 | 1407 "Temporary buffer used for computing fine differences.") |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1408 (ediff-defvar-local ediff-error-buffer nil |
7424 | 1409 "Buffer containing the output of diff when diff returns errors.") |
1410 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1411 (ediff-defvar-local ediff-this-buffer-control-sessions nil |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1412 "List of ediff control panels associated with each buffer A/B.") |
7267 | 1413 |
1414 (defvar ediff-disturbed-overlays nil | |
7419 | 1415 "List of difference overlays disturbed by working with the current diff.") |
7267 | 1416 |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1417 (defvar ediff-shaded-overlay-priority 100 |
7267 | 1418 "Priority of non-selected overlays.") |
1419 | |
1420 | |
1421 (if (ediff-if-lucid) | |
1422 (progn | |
1423 (fset 'ediff-overlayp (symbol-function 'extentp)) | |
1424 (fset 'ediff-make-overlay (symbol-function 'make-extent)) | |
1425 (fset 'ediff-delete-overlay (symbol-function 'delete-extent)) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1426 ;;(fset 'ediff-overlay-put (symbol-function 'set-extent-property)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1427 ;;(fset 'ediff-move-overlay (symbol-function 'set-extent-endpoints)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1428 (fset 'ediff-overlay-buffer (symbol-function 'extent-buffer)) |
7267 | 1429 (fset 'ediff-overlay-start (symbol-function 'extent-start-position)) |
1430 (fset 'ediff-overlay-end (symbol-function 'extent-end-position)) | |
1431 (fset 'ediff-overlay-get (symbol-function 'extent-property))) | |
1432 (fset 'ediff-overlayp (symbol-function 'overlayp)) | |
1433 (fset 'ediff-make-overlay (symbol-function 'make-overlay)) | |
1434 (fset 'ediff-delete-overlay (symbol-function 'delete-overlay)) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1435 ;;(fset 'ediff-overlay-put (symbol-function 'overlay-put)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1436 ;;(fset 'ediff-move-overlay (symbol-function 'move-overlay)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1437 (fset 'ediff-overlay-buffer (symbol-function 'overlay-buffer)) |
7267 | 1438 (fset 'ediff-overlay-start (symbol-function 'overlay-start)) |
1439 (fset 'ediff-overlay-end (symbol-function 'overlay-end)) | |
1440 (fset 'ediff-overlay-get (symbol-function 'overlay-get))) | |
1441 | |
1442 (if window-system | |
1443 (if (ediff-if-lucid) | |
1444 (progn | |
1445 (fset 'ediff-select-frame (symbol-function 'select-screen)) | |
1446 (fset 'ediff-window-frame (symbol-function 'window-screen)) | |
1447 (fset 'ediff-display-color-p (symbol-function 'x-color-display-p)) | |
7424 | 1448 (fset 'ediff-valid-color-p (symbol-function 'x-valid-color-name-p)) |
7267 | 1449 (fset 'ediff-get-face (symbol-function 'get-face))) |
1450 (fset 'ediff-window-frame (symbol-function 'window-frame)) | |
1451 (fset 'ediff-select-frame (symbol-function 'select-frame)) | |
1452 (fset 'ediff-display-color-p (symbol-function 'x-display-color-p)) | |
7424 | 1453 |
1454 ;; This is a temporary fix for OS/2 users | |
1455 ;; pm-win.el in PM-Emacs should be fixed. | |
1456 (if (eq window-system 'pm) | |
1457 (fset 'ediff-valid-color-p | |
1458 (function (lambda (color) (assoc color pm-color-alist)))) | |
1459 (fset 'ediff-valid-color-p (symbol-function 'x-color-defined-p)) | |
1460 ) | |
1461 | |
7267 | 1462 (fset 'ediff-get-face (symbol-function 'internal-get-face))) |
1463 ;; not a window system | |
1464 (fset 'ediff-window-frame (function (lambda (wind) (if wind 1 nil)) )) | |
1465 (fset 'ediff-select-frame (symbol-function 'identity)) | |
1466 (fset 'ediff-make-current-diff-overlay (function (lambda (type) nil))) | |
1467 (fset 'ediff-unhighlight-diffs-totally (function (lambda () nil)))) | |
1468 | |
1469 | |
1470 (if (not window-system) | |
1471 () | |
7424 | 1472 (defun ediff-set-face (ground face color) |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1473 "Sets face foreground/background." |
7424 | 1474 (if (ediff-valid-color-p color) |
1475 (if (eq ground 'foreground) | |
1476 (set-face-foreground face color) | |
1477 (set-face-background face color)) | |
1478 (cond ((memq face | |
1479 '(ediff-current-diff-face-A ediff-current-diff-face-B)) | |
1480 (copy-face 'highlight face)) | |
1481 ((memq face | |
1482 '(ediff-fine-diff-face-A ediff-fine-diff-face-B)) | |
1483 (copy-face 'secondary-selection face) | |
1484 (set-face-underline-p face t)) | |
1485 ((memq face | |
1486 '(ediff-odd-diff-face-A ediff-odd-diff-face-B | |
1487 ediff-even-diff-face-A ediff-even-diff-face-B)) | |
1488 (copy-face 'secondary-selection face))))) | |
1489 | |
7267 | 1490 (defvar ediff-current-diff-face-A |
1491 (progn | |
1492 (make-face 'ediff-current-diff-face-A) | |
7424 | 1493 (or (face-differs-from-default-p 'ediff-current-diff-face-A) |
1494 (cond ((ediff-display-color-p) | |
1495 (ediff-set-face | |
1496 'foreground 'ediff-current-diff-face-A "firebrick") | |
1497 (ediff-set-face | |
1498 'background 'ediff-current-diff-face-A "pale green")) | |
1499 (t | |
1500 (if (ediff-if-lucid) | |
1501 (copy-face 'modeline 'ediff-current-diff-face-A) | |
1502 (copy-face 'highlight 'ediff-current-diff-face-A)) | |
1503 ))) | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1504 'ediff-current-diff-face-A) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1505 ;;(ediff-get-face 'ediff-current-diff-face-A)) |
7424 | 1506 "Face for highlighting the selected difference in buffer A.") |
7267 | 1507 |
1508 (defvar ediff-current-diff-face-B | |
1509 (progn | |
1510 (make-face 'ediff-current-diff-face-B) | |
7424 | 1511 (or (face-differs-from-default-p 'ediff-current-diff-face-B) |
1512 (cond ((ediff-display-color-p) | |
1513 (ediff-set-face | |
1514 'foreground 'ediff-current-diff-face-B "DarkOrchid") | |
1515 (ediff-set-face | |
1516 'background 'ediff-current-diff-face-B "Yellow")) | |
1517 (t | |
1518 (if (ediff-if-lucid) | |
1519 (copy-face 'modeline 'ediff-current-diff-face-B) | |
1520 (copy-face 'highlight 'ediff-current-diff-face-B)) | |
1521 ))) | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1522 'ediff-current-diff-face-B) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1523 ;;(ediff-get-face 'ediff-current-diff-face-B)) |
7424 | 1524 "Face for highlighting the selected difference in buffer B.") |
1525 | |
1526 (defvar ediff-fine-diff-face-A | |
1527 (progn | |
1528 (make-face 'ediff-fine-diff-face-A) | |
1529 (or (face-differs-from-default-p 'ediff-fine-diff-face-A) | |
1530 (cond ((ediff-display-color-p) | |
1531 (ediff-set-face 'foreground 'ediff-fine-diff-face-A | |
1532 "Navy") | |
1533 (ediff-set-face 'background 'ediff-fine-diff-face-A | |
1534 "sky blue")) | |
1535 (t (set-face-underline-p 'ediff-fine-diff-face-A t)))) | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1536 'ediff-fine-diff-face-A) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1537 ;;(ediff-get-face 'ediff-fine-diff-face-A)) |
7424 | 1538 "Face for highlighting the refinement of the selected diff in buffer A.") |
1539 | |
1540 (defvar ediff-fine-diff-face-B | |
1541 (progn | |
1542 (make-face 'ediff-fine-diff-face-B) | |
1543 (or (face-differs-from-default-p 'ediff-fine-diff-face-B) | |
1544 (cond ((ediff-display-color-p) | |
1545 (ediff-set-face 'foreground 'ediff-fine-diff-face-B "Black") | |
1546 (ediff-set-face 'background 'ediff-fine-diff-face-B "cyan")) | |
1547 (t (set-face-underline-p 'ediff-fine-diff-face-B t)))) | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1548 'ediff-fine-diff-face-B) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1549 ;;(ediff-get-face 'ediff-fine-diff-face-B)) |
7424 | 1550 "Face for highlighting the refinement of the selected diff in buffer B.") |
1551 | |
7267 | 1552 |
1553 (defvar ediff-even-diff-face-A | |
1554 (progn | |
1555 (make-face 'ediff-even-diff-face-A) | |
7424 | 1556 (or (face-differs-from-default-p 'ediff-even-diff-face-A) |
1557 (cond ((ediff-display-color-p) | |
1558 (ediff-set-face | |
1559 'foreground 'ediff-even-diff-face-A "black") | |
1560 (ediff-set-face | |
1561 'background 'ediff-even-diff-face-A "light grey")) | |
1562 (t | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1563 (copy-face 'italic 'ediff-even-diff-face-A)))) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1564 'ediff-even-diff-face-A) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1565 ;;(ediff-get-face 'ediff-even-diff-face-A)) |
7267 | 1566 "Face used to highlight even-numbered differences in buffer A.") |
1567 | |
1568 (defvar ediff-even-diff-face-B | |
1569 (progn | |
1570 (make-face 'ediff-even-diff-face-B) | |
7424 | 1571 (or (face-differs-from-default-p 'ediff-even-diff-face-B) |
1572 (cond ((ediff-display-color-p) | |
1573 (ediff-set-face | |
1574 'foreground 'ediff-even-diff-face-B "White") | |
1575 (ediff-set-face | |
1576 'background 'ediff-even-diff-face-B "Gray")) | |
1577 (t | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1578 (copy-face 'italic 'ediff-even-diff-face-B)))) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1579 'ediff-even-diff-face-B) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1580 ;;(ediff-get-face 'ediff-even-diff-face-B)) |
7267 | 1581 "Face used to highlight even-numbered differences in buffer B.") |
7424 | 1582 |
7267 | 1583 (defvar ediff-odd-diff-face-A |
1584 (progn | |
1585 (make-face 'ediff-odd-diff-face-A) | |
7424 | 1586 (or (face-differs-from-default-p 'ediff-odd-diff-face-A) |
1587 (cond ((ediff-display-color-p) | |
1588 (ediff-set-face | |
1589 'foreground 'ediff-odd-diff-face-A "White") | |
1590 (ediff-set-face | |
1591 'background 'ediff-odd-diff-face-A "Gray")) | |
1592 (t | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1593 (copy-face 'italic 'ediff-odd-diff-face-A)))) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1594 'ediff-odd-diff-face-A) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1595 ;;(ediff-get-face 'ediff-odd-diff-face-A)) |
7267 | 1596 "Face used to highlight odd-numbered differences in buffer A.") |
1597 | |
1598 (defvar ediff-odd-diff-face-B | |
1599 (progn | |
1600 (make-face 'ediff-odd-diff-face-B) | |
7424 | 1601 (or (face-differs-from-default-p 'ediff-odd-diff-face-B) |
1602 (cond ((ediff-display-color-p) | |
1603 (ediff-set-face | |
1604 'foreground 'ediff-odd-diff-face-B "Black") | |
1605 (ediff-set-face | |
1606 'background 'ediff-odd-diff-face-B "light grey")) | |
1607 (t | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1608 (copy-face 'italic 'ediff-odd-diff-face-B)))) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1609 'ediff-odd-diff-face-B) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1610 ;;(ediff-get-face 'ediff-odd-diff-face-B)) |
7267 | 1611 "Face used to highlight odd-numbered differences in buffer B.") |
7424 | 1612 |
7267 | 1613 ;; Create *-var faces. These are the actual faces used to highlight |
1614 ;; odd-numbered difference regions. | |
1615 ;; They are used as follows: when highlighting is turned on, | |
1616 ;; ediff-odd/even-diff-face-A/B are copied | |
1617 ;; into ediff-odd/even-diff-face-A/B-var, and all odd/even overlays become | |
1618 ;; highlighted. When highlighting is turned off, then the face 'default is | |
1619 ;; copied into ediff-odd/even-diff-face-A/B-var, thereby unhighlighting all | |
1620 ;; difference regions. | |
1621 (make-face 'ediff-even-diff-face-A-var) | |
1622 (make-face 'ediff-even-diff-face-B-var) | |
1623 (make-face 'ediff-odd-diff-face-A-var) | |
1624 (make-face 'ediff-odd-diff-face-B-var) | |
1625 | |
1626 ;; initialize *-var faces | |
1627 (defun ediff-init-var-faces () | |
7424 | 1628 (copy-face (if (and ediff-want-faces ediff-highlight-all-diffs) |
7267 | 1629 ediff-even-diff-face-A 'default) |
1630 'ediff-even-diff-face-A-var) | |
7424 | 1631 (copy-face (if (and ediff-want-faces ediff-highlight-all-diffs) |
7267 | 1632 ediff-even-diff-face-B 'default) |
1633 'ediff-even-diff-face-B-var) | |
7424 | 1634 (copy-face (if (and ediff-want-faces ediff-highlight-all-diffs) |
7267 | 1635 ediff-odd-diff-face-A 'default) |
1636 'ediff-odd-diff-face-A-var) | |
7424 | 1637 (copy-face (if (and ediff-want-faces ediff-highlight-all-diffs) |
7267 | 1638 ediff-odd-diff-face-B 'default) |
1639 'ediff-odd-diff-face-B-var)) | |
1640 | |
1641 | |
1642 ;;; Overlays | |
1643 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1644 (ediff-defvar-local ediff-current-diff-overlay-A nil |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1645 "Overlay specifying the current difference region in buffer A.") |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1646 (ediff-defvar-local ediff-current-diff-overlay-B nil |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1647 "Overlay specifying the current difference region in buffer B.") |
7267 | 1648 |
1649 (defun ediff-make-current-diff-overlay (type) | |
1650 (let ((overlay (if (eq type 'A) | |
1651 'ediff-current-diff-overlay-A | |
1652 'ediff-current-diff-overlay-B)) | |
7424 | 1653 (buffer (ediff-get-buffer type)) |
7267 | 1654 (face (if (eq type 'A) |
1655 (face-name ediff-current-diff-face-A) | |
1656 (face-name ediff-current-diff-face-B)))) | |
1657 (set overlay (ediff-make-overlay (point-max) (point-max) buffer)) | |
1658 (ediff-overlay-put (eval overlay) 'face face) | |
1659 (ediff-overlay-put (eval overlay) 'ediff ediff-control-buffer) | |
1660 )) | |
1661 | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1662 ;; Compute priority of ediff overlay. |
7267 | 1663 (defun ediff-highest-priority (start end buffer) |
1664 (let ((pos (max 1 (1- start))) | |
1665 ovr-list) | |
1666 (if (ediff-if-lucid) | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1667 (1+ ediff-shaded-overlay-priority) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1668 (ediff-eval-in-buffer |
7267 | 1669 buffer |
1670 (while (< pos (min (point-max) (1+ end))) | |
1671 (setq ovr-list (append (overlays-at pos) ovr-list)) | |
1672 (setq pos (next-overlay-change pos))) | |
1673 (1+ (eval | |
1674 (cons '+ | |
1675 (mapcar (function | |
1676 (lambda (ovr) | |
1677 (if ovr | |
1678 (or (ediff-overlay-get ovr 'priority) 0) | |
1679 0))) | |
1680 ovr-list) | |
1681 ))) | |
1682 )))) | |
1683 | |
1684 ) ; end of window-system-only code. | |
1685 | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1686 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1687 ;; Ediff toggle read-only stuff |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1688 (defvar ediff-toggle-read-only-function nil |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1689 "*Specifies the function to be used to toggle read-only. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1690 If nil, Ediff tries to deduce the function from the binding of C-x C-q. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1691 Normally, this is the `toggle-read-only' function, but, if version |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1692 control is used, it could be `vc-toggle-read-only' or `rcs-toggle-read-only'.") |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1693 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1694 (ediff-defvar-local ediff-local-checkout-flag nil |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1695 "If t, indicates that buffer has been already checked out.") |
7267 | 1696 |
1697 | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1698 |
7267 | 1699 ;;; Misc |
1700 | |
1701 (defvar ediff-split-window-function 'split-window-vertically | |
7419 | 1702 "*The function to split the main window between buffer-A and buffer-B. |
1703 You can set it to be split horizontally instead of the | |
7424 | 1704 default vertical split by setting this variable to |
7267 | 1705 'split-window-horizontally. You can also have your own function for fancy |
1706 splits. This variable has no effect when buffer-A and buffer-B are shown in | |
1707 different frames. In this case, Ediff will use those frames to display | |
1708 these buffers.") | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1709 |
7267 | 1710 |
1711 (defconst ediff-saved-variables | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1712 '(;;buffer-read-only |
7267 | 1713 buffer-auto-save-file-name) |
7419 | 1714 "Buffer-local variables saved and restored during an Ediff session.") |
7267 | 1715 |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1716 ;;(defconst ediff-working-values '(nil nil) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1717 (defconst ediff-working-values '(nil) |
7419 | 1718 "Values to be assigned to `ediff-saved-variables' during diff.") |
7267 | 1719 |
1720 (defvar ediff-use-last-dir nil | |
7419 | 1721 "*If t, Ediff uses previous directory as default when reading file name.") |
7267 | 1722 |
7457
315fb6386b54
(ediff-no-help-in-control-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
7424
diff
changeset
|
1723 (defvar ediff-no-help-in-control-buffer nil |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1724 "*Non-nil means C-h should not invoke Emacs help in control buffer. |
7419 | 1725 Instead, C-h jumps to previous difference.") |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1726 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1727 (defvar ediff-version-control-package 'vc |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1728 "Version control package used. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1729 Currently, Ediff supports vc.el and rcs.el.") |
7267 | 1730 |
1731 (defvar ediff-temp-file-prefix | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1732 (let ((env (or (getenv "TMPDIR") |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1733 (getenv "TMP") |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1734 (getenv "TEMP"))) |
7267 | 1735 d) |
1736 (setq d (if (and env (> (length env) 0)) | |
1737 env | |
1738 "/tmp")) | |
1739 (if (= (aref d (1- (length d))) ?/) | |
1740 (setq d (substring d 0 -1))) | |
1741 (concat d "/ediff")) | |
1742 "*Prefix to put on Ediff temporary file names. | |
1743 Do not start with `~/' or `~user-name/'.") | |
1744 | |
1745 (defvar ediff-temp-file-mode 384 ; u=rw only | |
1746 "*Mode for Ediff temporary files.") | |
1747 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1748 (ediff-defvar-local ediff-temp-file-A nil |
7424 | 1749 "Temporary file used for refining difference regions in buffer B.") |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1750 (ediff-defvar-local ediff-temp-file-B nil |
7424 | 1751 "Temporary file used for refining difference regions in buffer B.") |
1752 | |
7267 | 1753 (defvar ediff-last-dir-A nil |
1754 "Last directory used by an Ediff command for file-A.") | |
1755 (defvar ediff-last-dir-B nil | |
1756 "Last directory used by an Ediff command for file-B.") | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1757 (defvar ediff-last-dir-patch nil |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1758 "Last directory used by an Ediff command for file to patch.") |
7267 | 1759 |
1760 ;; Build keymaps | |
1761 | |
1762 (defvar ediff-mode-map nil | |
1763 "Local keymap used in Ediff mode.") | |
7424 | 1764 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1765 (defun ediff-frame-has-menubar () |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1766 (if (ediff-if-lucid) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1767 current-menubar |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1768 (< 0 (cdr (assq 'menu-bar-lines (frame-parameters (selected-frame))))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1769 )) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1770 |
7495
266bf374a7bf
Move menu bar defines to top level
Richard M. Stallman <rms@gnu.org>
parents:
7457
diff
changeset
|
1771 ;;; This is split in three parts to avoid |
266bf374a7bf
Move menu bar defines to top level
Richard M. Stallman <rms@gnu.org>
parents:
7457
diff
changeset
|
1772 ;;; making a line in loaddefs.el that is too long for patch. |
266bf374a7bf
Move menu bar defines to top level
Richard M. Stallman <rms@gnu.org>
parents:
7457
diff
changeset
|
1773 ;;; Note that autoload.el currently looks for cookies |
266bf374a7bf
Move menu bar defines to top level
Richard M. Stallman <rms@gnu.org>
parents:
7457
diff
changeset
|
1774 ;;; only at top level in the file. |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1775 ;;; So I moved these to top level. But the conditionals on |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1776 ;;; purify-flag make these no-ops when you load ediff. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1777 ;;; They only do something in loaddefs.el. |
7495
266bf374a7bf
Move menu bar defines to top level
Richard M. Stallman <rms@gnu.org>
parents:
7457
diff
changeset
|
1778 ;;;###autoload |
8524
ad46c69956cd
Undo change in condition for defining the menu bar items.
Richard M. Stallman <rms@gnu.org>
parents:
8503
diff
changeset
|
1779 (if purify-flag |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1780 (progn |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1781 (defvar menu-bar-epatch-menu (make-sparse-keymap "Epatch")) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1782 (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1783 (defvar menu-bar-ediff-menu (make-sparse-keymap "Ediff")) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1784 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)))) |
7495
266bf374a7bf
Move menu bar defines to top level
Richard M. Stallman <rms@gnu.org>
parents:
7457
diff
changeset
|
1785 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1786 |
7495
266bf374a7bf
Move menu bar defines to top level
Richard M. Stallman <rms@gnu.org>
parents:
7457
diff
changeset
|
1787 ;;;###autoload |
8524
ad46c69956cd
Undo change in condition for defining the menu bar items.
Richard M. Stallman <rms@gnu.org>
parents:
8503
diff
changeset
|
1788 (if purify-flag |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1789 (progn |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1790 (define-key menu-bar-ediff-menu [ediff-revision] |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1791 '("File with a version ..." . ediff-revision)) |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1792 (define-key menu-bar-ediff-menu [ediff-buffers] |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1793 '("Buffers ..." . ediff-buffers)) |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1794 (define-key menu-bar-ediff-menu [ediff-files] |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1795 '("Files ..." . ediff-files)))) |
7495
266bf374a7bf
Move menu bar defines to top level
Richard M. Stallman <rms@gnu.org>
parents:
7457
diff
changeset
|
1796 |
266bf374a7bf
Move menu bar defines to top level
Richard M. Stallman <rms@gnu.org>
parents:
7457
diff
changeset
|
1797 ;;;###autoload |
8524
ad46c69956cd
Undo change in condition for defining the menu bar items.
Richard M. Stallman <rms@gnu.org>
parents:
8503
diff
changeset
|
1798 (if purify-flag |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1799 (progn |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1800 (define-key menu-bar-epatch-menu [ediff-patch-buffer] |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1801 '("To a Buffer ..." . ediff-patch-buffer)) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1802 (define-key menu-bar-epatch-menu [ediff-patch-file] |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1803 '("To a File ..." . ediff-patch-file)))) |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1804 |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1805 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1806 (if (and window-system ediff-want-default-menus (ediff-frame-has-menubar)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1807 (cond ((ediff-if-lucid) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1808 (defvar ediff-menu |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1809 '("" |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1810 ["Files ..." ediff-files t] |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1811 ["Buffers ..." ediff-buffers t] |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1812 ["File with a version ..." ediff-revision t])) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1813 (defvar epatch-menu |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1814 '("" |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1815 ["To a file ..." ediff-patch-file t] |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1816 ["To a buffer ..." ediff-patch-buffer t])) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1817 (add-menu '("File") "Compare" |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1818 ediff-menu |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1819 "New Screen") |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1820 (add-menu '("File") "Apply Patch" |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1821 epatch-menu |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1822 "New Screen") |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1823 ;; Display a solid horizontal line |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1824 (add-menu-item '("File") "---" nil nil "New Screen")) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1825 (t ;; FSF Emacs |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1826 (define-key menu-bar-file-menu [epatch] |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1827 '("Apply Patch" . menu-bar-epatch-menu)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1828 (define-key menu-bar-file-menu [ediff] |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1829 '("Compare" . menu-bar-ediff-menu))))) |
7267 | 1830 |
1831 | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
1832 |
7267 | 1833 (defun ediff-setup-keymap () |
1834 "Set up the keymap used in the control buffer of Ediff." | |
1835 (setq ediff-mode-map (make-sparse-keymap)) | |
1836 (suppress-keymap ediff-mode-map) | |
1837 | |
1838 (define-key ediff-mode-map "p" 'ediff-previous-difference) | |
1839 (define-key ediff-mode-map "\C-?" 'ediff-previous-difference) | |
7424 | 1840 (define-key ediff-mode-map "\C-h" (if ediff-no-help-in-control-buffer |
7267 | 1841 'ediff-previous-difference nil)) |
1842 (define-key ediff-mode-map "n" 'ediff-next-difference) | |
1843 (define-key ediff-mode-map " " 'ediff-next-difference) | |
1844 (define-key ediff-mode-map "j" 'ediff-jump-to-difference) | |
1845 (define-key ediff-mode-map "g" nil) | |
1846 (define-key ediff-mode-map "ga" 'ediff-jump-to-difference-at-point) | |
1847 (define-key ediff-mode-map "gb" 'ediff-jump-to-difference-at-point) | |
1848 (define-key ediff-mode-map "q" 'ediff-quit) | |
1849 (define-key ediff-mode-map "z" 'ediff-suspend) | |
1850 (define-key ediff-mode-map "c" 'ediff-recenter) | |
1851 (define-key ediff-mode-map "s" 'ediff-toggle-split) | |
1852 (define-key ediff-mode-map "h" 'ediff-toggle-hilit) | |
7424 | 1853 (define-key ediff-mode-map "@" 'ediff-toggle-autorefine) |
7267 | 1854 (define-key ediff-mode-map "v" 'ediff-scroll-up) |
1855 (define-key ediff-mode-map "\C-v" 'ediff-scroll-up) | |
1856 (define-key ediff-mode-map "^" 'ediff-scroll-down) | |
1857 (define-key ediff-mode-map "\M-v" 'ediff-scroll-down) | |
1858 (define-key ediff-mode-map "V" 'ediff-scroll-down) | |
1859 (define-key ediff-mode-map "<" 'ediff-scroll-left) | |
1860 (define-key ediff-mode-map ">" 'ediff-scroll-right) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1861 (define-key ediff-mode-map "i" 'ediff-status-info) |
7267 | 1862 (define-key ediff-mode-map "?" 'ediff-toggle-help) |
7424 | 1863 (define-key ediff-mode-map "!" 'ediff-recompute-diffs) |
1864 (define-key ediff-mode-map "*" 'ediff-make-fine-diffs) | |
7267 | 1865 (define-key ediff-mode-map "a" nil) |
1866 (define-key ediff-mode-map "ab" 'ediff-diff-to-diff) | |
1867 (define-key ediff-mode-map "b" nil) | |
1868 (define-key ediff-mode-map "ba" 'ediff-diff-to-diff) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1869 (define-key ediff-mode-map "bug" 'ediff-submit-report) |
7267 | 1870 (define-key ediff-mode-map "r" nil) |
1871 (define-key ediff-mode-map "ra" 'ediff-restore-diff) | |
1872 (define-key ediff-mode-map "rb" 'ediff-restore-diff) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1873 (define-key ediff-mode-map "#" nil) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1874 (define-key ediff-mode-map "#h" 'ediff-toggle-regexp-match) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1875 (define-key ediff-mode-map "#f" 'ediff-toggle-regexp-match) |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1876 (define-key ediff-mode-map "##" 'ediff-toggle-skip-similar) |
7267 | 1877 (define-key ediff-mode-map "o" nil) |
1878 (define-key ediff-mode-map "A" 'ediff-toggle-read-only) | |
1879 (define-key ediff-mode-map "B" 'ediff-toggle-read-only) | |
1880 (define-key ediff-mode-map "w" nil) | |
1881 (define-key ediff-mode-map "wa" 'ediff-save-buffer) | |
1882 (define-key ediff-mode-map "wb" 'ediff-save-buffer) | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1883 (define-key ediff-mode-map "wf" 'ediff-save-buffer) |
7267 | 1884 (define-key ediff-mode-map "k" nil) |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1885 (define-key ediff-mode-map "kkk" 'ediff-reload-keymap) ;; for debugging |
7267 | 1886 ;; Allow ediff-mode-map to be referenced indirectly |
1887 (fset 'ediff-mode-map ediff-mode-map)) | |
1888 | |
1889 | |
1890 ;;; Setup functions | |
1891 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1892 (defun ediff-find-file (file-var buffer &optional last-dir hooks-var) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1893 "Visit FILE and arrange its buffer to Ediff's liking. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1894 FILE is actually a variables symbol that must contain a true file name. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1895 BUFFER is a variable symbol, which will get the buffer object into which |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1896 FILE is read. LAST-DIR is the directory variable symbol where FILE's |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1897 directory name should be returned. HOOKS is a variable symbol that will be |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1898 assigned the hook to be executed after `ediff-strartup' is finished. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1899 `ediff-find-file' arranges that the temp files it might create will be |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1900 deleted. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1901 Arguments: (file buffer &optional last-dir hooks)" |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1902 (let* ((file (eval file-var)) |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1903 (file-magic (ediff-find-file-name-handler file))) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1904 (if (not (file-readable-p file)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1905 (error "File `%s' does not exist or is not readable" file)) |
7267 | 1906 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1907 ;; Record the directory of the file |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1908 (if last-dir |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1909 (set last-dir (expand-file-name (file-name-directory file)))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1910 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1911 ;; Setup the buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1912 (set buffer (find-file-noselect file)) |
7267 | 1913 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1914 (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1915 (eval buffer) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1916 (widen) ;; Make sure the entire file is seen |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1917 (cond (file-magic ;; file has handler, such as jka-compr-handler or |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1918 ;; ange-ftp-hook-function--arrange for temp file |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1919 (ediff-verify-file-buffer 'magic) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1920 (setq file (ediff-make-temp-file)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1921 (set hooks-var (cons (` (lambda () (delete-file (, file)))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1922 (eval hooks-var)))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1923 ;; file processed via auto-mode-alist, a la uncompress.el |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1924 ((not (equal (file-truename file) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
1925 (file-truename (buffer-file-name)))) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1926 (setq file (ediff-make-temp-file)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1927 (set hooks-var (cons (` (lambda () (delete-file (, file)))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1928 (eval hooks-var)))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1929 (t ;; plain file---just check that the file matches the buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1930 (ediff-verify-file-buffer)))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1931 (set file-var file))) |
7267 | 1932 |
1933 (defun ediff-files-internal (file-A file-B &optional startup-hooks) | |
1934 (let (buffer-A buffer-B) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1935 (message "Reading file %s ... " file-A)(sit-for 0) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1936 (ediff-find-file 'file-A 'buffer-A 'ediff-last-dir-A 'startup-hooks) |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1937 (message "Reading file %s ... " file-B)(sit-for 0) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1938 (ediff-find-file 'file-B 'buffer-B 'ediff-last-dir-B 'startup-hooks) |
7267 | 1939 (ediff-setup buffer-A file-A buffer-B file-B startup-hooks))) |
1940 | |
1941 (defun ediff-get-patch-buffer (dir) | |
1942 "Obtain patch buffer. If patch is already in a buffer---use it. | |
1943 Else, read patch file into a new buffer." | |
1944 (if (y-or-n-p "Is the patch file already in a buffer? ") | |
1945 (setq ediff-patch-buf | |
1946 (get-buffer (read-buffer "Patch buffer name: " nil t))) ;must match | |
1947 (setq ediff-patch-buf | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1948 (find-file-noselect (read-file-name "Patch file name: " dir)))) |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1949 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1950 ;; secure the patch buffer against accidental changes |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1951 (ediff-eval-in-buffer |
7267 | 1952 ediff-patch-buf |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1953 (setq buffer-read-only t)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1954 |
7267 | 1955 (setq ediff-patch-diagnostics |
1956 (get-buffer-create "*ediff patch diagnostics*")) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1957 (ediff-eval-in-buffer |
7267 | 1958 ediff-patch-diagnostics |
1959 (insert-buffer ediff-patch-buf)) | |
1960 ) | |
1961 | |
1962 ;; Start up Ediff on two files | |
1963 (defun ediff-setup (buffer-A file-A buffer-B file-B startup-hooks) | |
1964 (setq file-A (expand-file-name file-A)) | |
1965 (setq file-B (expand-file-name file-B)) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1966 (let* ((control-buffer-name |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1967 (emerge-unique-buffer-name "Ediff Control Panel" "")) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1968 (control-buffer (ediff-eval-in-buffer |
7267 | 1969 buffer-A |
1970 (get-buffer-create control-buffer-name)))) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1971 (ediff-eval-in-buffer |
7267 | 1972 control-buffer |
1973 (ediff-mode) ;; in control buffer only | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
1974 (setq buffer-read-only nil) ;; in control buffer only |
7267 | 1975 (setq ediff-A-buffer buffer-A) |
1976 (setq ediff-B-buffer buffer-B) | |
1977 (setq ediff-control-buffer control-buffer) | |
7424 | 1978 ; (setq ediff-control-buffer-suffix |
1979 ; (if (string-match "<[0-9]*>" control-buffer-name) | |
1980 ; (substring control-buffer-name | |
1981 ; (match-beginning 0) (match-end 0)) | |
1982 ; "<1>")) | |
1983 (setq ediff-error-buffer (get-buffer-create (emerge-unique-buffer-name | |
1984 "*ediff-errors" "*"))) | |
7267 | 1985 (ediff-remember-buffer-characteristics t) ;; remember at setup |
1986 | |
1987 (ediff-set-keys) | |
7424 | 1988 (setq ediff-difference-vector (ediff-setup-diff-regions file-A file-B)) |
7267 | 1989 (setq ediff-number-of-differences (length ediff-difference-vector)) |
1990 (setq ediff-current-difference -1) | |
1991 (ediff-make-current-diff-overlay 'A) | |
1992 (ediff-make-current-diff-overlay 'B) | |
1993 (if window-system | |
1994 (ediff-init-var-faces)) | |
1995 (run-hooks 'ediff-before-setup-windows-hooks) | |
1996 (ediff-setup-windows buffer-A buffer-B control-buffer t) | |
1997 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
1998 ;; all these must be inside ediff-eval-in-buffer control-buffer, |
7267 | 1999 ;; since these vars are local to control-buffer |
2000 ;; These won't run if there are errors in diff | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2001 (ediff-eval-in-buffer |
7267 | 2002 ediff-A-buffer |
2003 (add-hook 'local-write-file-hooks 'ediff-block-write-file) | |
2004 (setq before-change-function 'ediff-before-change-guard) | |
2005 ;; add control-buffer to the list of sessions | |
2006 (or (memq control-buffer ediff-this-buffer-control-sessions) | |
2007 (setq ediff-this-buffer-control-sessions | |
2008 (cons control-buffer ediff-this-buffer-control-sessions))) | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2009 (setq mode-line-buffer-identification |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2010 (cons "A: " |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2011 (if (string-match "\\(^ \\|^[^ \t]*: \\)" |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2012 (car mode-line-buffer-identification)) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2013 (cons (substring (car mode-line-buffer-identification) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2014 (match-end 0)) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2015 (cdr mode-line-buffer-identification)) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2016 mode-line-buffer-identification))) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2017 (run-hooks 'ediff-prepare-buffer-hooks)) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2018 (ediff-eval-in-buffer |
7267 | 2019 ediff-B-buffer |
2020 (add-hook 'local-write-file-hooks 'ediff-block-write-file) | |
2021 (setq before-change-function 'ediff-before-change-guard) | |
2022 ;; add control-buffer to the list of sessions | |
2023 (or (memq control-buffer ediff-this-buffer-control-sessions) | |
2024 (setq ediff-this-buffer-control-sessions | |
2025 (cons control-buffer ediff-this-buffer-control-sessions))) | |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2026 (setq mode-line-buffer-identification |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2027 (cons "B: " |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2028 (if (string-match "\\(^ \\|^[^ \t]*: \\)" |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2029 (car mode-line-buffer-identification)) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2030 (cons (substring (car mode-line-buffer-identification) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2031 (match-end 0)) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2032 (cdr mode-line-buffer-identification)) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2033 mode-line-buffer-identification))) |
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
2034 (run-hooks 'ediff-prepare-buffer-hooks)) |
7267 | 2035 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2036 (ediff-eval-in-buffer control-buffer |
7267 | 2037 (run-hooks 'startup-hooks 'ediff-startup-hooks) |
2038 (setq buffer-read-only t))))) | |
2039 | |
7424 | 2040 ;; Generate the difference vector and overlays for the two files |
2041 ;; With optional arg `refine', create refining difference regions | |
2042 (defun ediff-setup-diff-regions (file-A file-B | |
2043 &optional use-old refine-region | |
2044 diff-program diff-options | |
2045 diff-ok-lines-regexp) | |
2046 | |
2047 (setq diff-program (or diff-program ediff-diff-program) | |
2048 diff-options (or diff-options ediff-diff-options) | |
2049 diff-ok-lines-regexp | |
2050 (or diff-ok-lines-regexp ediff-diff-ok-lines-regexp)) | |
2051 | |
2052 (or use-old (setq ediff-diff-buffer | |
2053 (get-buffer-create | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2054 (emerge-unique-buffer-name "*ediff-diff" "*")) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2055 ediff-fine-diff-buffer |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2056 (get-buffer-create |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2057 (emerge-unique-buffer-name "*ediff-fine-diff" "*")) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2058 )) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2059 (ediff-eval-in-buffer |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2060 (if refine-region ediff-fine-diff-buffer ediff-diff-buffer) |
7267 | 2061 (erase-buffer) |
2062 ;; shell-command tends to display old shell command buffers even when it | |
2063 ;; puts output in another buffer---probably an Emacs bug. | |
2064 (ediff-kill-buffer-carefully "*Shell Command Output*") | |
2065 (let ((shell-file-name ediff-shell)) | |
7424 | 2066 (if refine-region |
2067 (message "Refining difference region %d ..." (1+ refine-region)) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2068 (message "Computing differences ...")(sit-for 0)) |
7267 | 2069 (shell-command |
2070 (format "%s %s %s %s" | |
7424 | 2071 diff-program diff-options |
2072 (ediff-protect-metachars file-A) | |
2073 (ediff-protect-metachars file-B)) | |
7267 | 2074 t) |
2075 )) | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2076 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2077 |
7424 | 2078 (if refine-region |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2079 (progn |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2080 (ediff-prepare-error-list diff-ok-lines-regexp ediff-fine-diff-buffer) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2081 (message "Refining difference region %d ... Done." (1+ refine-region)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2082 (ediff-convert-diffs-to-overlays-refine |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2083 ediff-A-buffer ediff-B-buffer |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2084 (ediff-extract-diffs ediff-fine-diff-buffer) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2085 refine-region)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2086 (ediff-prepare-error-list diff-ok-lines-regexp ediff-diff-buffer) |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2087 (message "Computing differences ... Done.")(sit-for 0) |
7424 | 2088 (ediff-convert-diffs-to-overlays |
2089 ediff-A-buffer ediff-B-buffer | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2090 (ediff-extract-diffs ediff-diff-buffer |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2091 ediff-A-buffer ediff-B-buffer)))) |
7424 | 2092 |
7267 | 2093 |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2094 (defun ediff-prepare-error-list (ok-regexp diff-buff) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2095 (ediff-eval-in-buffer |
7424 | 2096 ediff-error-buffer |
7267 | 2097 (erase-buffer) |
2098 (insert-buffer diff-buff) | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2099 (delete-matching-lines ok-regexp))) |
7267 | 2100 |
2101 ;;; Function to start Ediff by patching a file | |
2102 | |
2103 ;;;###autoload | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2104 (defun ediff-patch-file (source-filename &optional startup-hooks) |
7424 | 2105 "Run Ediff by patching FILE-TP-PATCH." |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2106 (interactive |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2107 (list (ediff-read-file-name "File to patch" |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2108 (if ediff-use-last-dir |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2109 ediff-last-dir-patch |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2110 default-directory) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2111 nil))) |
7267 | 2112 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2113 (ediff-get-patch-buffer (file-name-directory source-filename)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2114 (let* ((backup-extension |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2115 ;; if the user specified a -b option, extract the backup |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2116 ;; extension from there; else use `.orig' |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2117 (substring ediff-patch-options |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2118 (if (string-match "-b[ \t]+" ediff-patch-options) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2119 (match-end 0) 0) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2120 (if (string-match "-b[ \t]+[^ \t]+" ediff-patch-options) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2121 (match-end 0) 0))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2122 (backup-extension (if (string= backup-extension "") |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2123 "orig" backup-extension)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2124 (shell-file-name ediff-shell) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2125 ;; ediff-find-file may use a temp file to do the patch |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2126 ;; so, we save source-filename and true-source-filename as a var |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2127 ;; that initially is source-filename but may be changed to a temp |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2128 ;; file for the purpose of patching. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2129 (true-source-filename source-filename) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2130 (target-filename source-filename) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2131 target-buf buf-to-patch file-name-magic-p) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2132 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2133 ;; Make a temp file, if source-filename has a magic file handler (or if |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2134 ;; it is handled via auto-mode-alist and similar magic). |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2135 ;; Check if there is a buffer visiting source-filename and if they are in |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2136 ;; synch; arrange for the deletion of temp file. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2137 (ediff-find-file 'true-source-filename 'buf-to-patch |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2138 'ediff-last-dir-patch 'startup-hooks) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2139 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2140 ;; Check if source file name has triggered black magic, such as file name |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2141 ;; handlers or auto mode alist, and make a note of it. |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2142 (setq file-name-magic-p (not (equal (file-truename true-source-filename) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2143 (file-truename source-filename)))) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2144 |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2145 ;; Checkout orig file, if necessary so that the patched file could be |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2146 ;; checked back in. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2147 (ediff-toggle-read-only buf-to-patch) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2148 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2149 (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2150 ediff-patch-diagnostics |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2151 (message "Applying patch ... ")(sit-for 0) |
7424 | 2152 ;; always pass patch the -f option, so it won't ask any questions |
7267 | 2153 (shell-command-on-region |
2154 (point-min) (point-max) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2155 (format "%s -f %s %s" |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2156 ediff-patch-program ediff-patch-options |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2157 (expand-file-name true-source-filename)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2158 t)) |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2159 (message "Applying patch ... Done.")(sit-for 0) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2160 (switch-to-buffer ediff-patch-diagnostics) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2161 (sit-for 0) ;; synchronize |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2162 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2163 (or (file-exists-p (concat true-source-filename "." backup-extension)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2164 (error "Patch failed or didn't modify the original file.")) |
7267 | 2165 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2166 ;; If black magic is involved, apply patch to a temp copy of the |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2167 ;; file. Otherwise, apply patch to the orig copy. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2168 ;; If patch is applied to temp copy, we name the result |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2169 ;; ***.patched. The orig file name isn't changed, and the temp copy of |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2170 ;; the original is later deleted. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2171 ;; Without magic, the original file is renamed (usually into |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2172 ;; old-name.orig) and the result of patching will have the |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2173 ;; same name as the original. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2174 (if (not file-name-magic-p) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2175 (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2176 buf-to-patch |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2177 (set-visited-file-name (concat source-filename "." backup-extension)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2178 (set-buffer-modified-p nil)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2179 (setq target-filename (concat true-source-filename ".patched")) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2180 (rename-file true-source-filename target-filename t) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2181 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2182 ;; arrange that the temp copy of orig will be deleted |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2183 (rename-file (concat true-source-filename "." backup-extension) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2184 true-source-filename t)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2185 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2186 ;; make orig buffer read-only |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2187 (setq startup-hooks |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2188 (cons 'ediff-toggle-read-only-patch-orig startup-hooks)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2189 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2190 ;; set up a buf for the patched file |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2191 (ediff-eval-in-buffer |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2192 (setq target-buf (find-file-noselect target-filename)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2193 ;; files to be patched are always checked out first |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2194 (setq ediff-local-checkout-flag t)) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2195 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2196 (ediff-buffers buf-to-patch target-buf startup-hooks) |
7267 | 2197 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2198 (bury-buffer ediff-patch-diagnostics) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2199 (message "Patch diagnostics available in buffer %s." |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2200 (buffer-name ediff-patch-diagnostics)))) |
7267 | 2201 |
2202 (defalias 'epatch 'ediff-patch-file) | |
7424 | 2203 (defalias 'epatch-buffer 'ediff-patch-buffer) |
7267 | 2204 |
2205 ;;; Function to start Ediff on files | |
2206 | |
2207 ;;;###autoload | |
2208 (defun ediff-files (file-A file-B &optional startup-hooks) | |
2209 "Run Ediff on a pair files, FILE-A and FILE-B." | |
2210 (interactive | |
2211 (let (f) | |
2212 (list (setq f (ediff-read-file-name "File A to compare" | |
2213 (if ediff-use-last-dir | |
2214 ediff-last-dir-A | |
2215 default-directory) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2216 nil)) |
7267 | 2217 (ediff-read-file-name "File B to compare" |
2218 (if ediff-use-last-dir | |
2219 ediff-last-dir-B nil) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2220 f) |
7267 | 2221 ))) |
7424 | 2222 (ediff-files-internal file-A |
2223 (if (file-directory-p file-B) | |
2224 (expand-file-name | |
2225 (file-name-nondirectory file-A) file-B) | |
2226 file-B) | |
2227 startup-hooks)) | |
7267 | 2228 |
2229 | |
2230 (defalias 'ediff 'ediff-files) | |
2231 | |
2232 | |
2233 ;;; Function to start Ediff on buffers | |
2234 | |
2235 ;;;###autoload | |
2236 (defun ediff-buffers (buffer-A buffer-B &optional startup-hooks) | |
2237 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B." | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2238 (interactive |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2239 (list (read-buffer "Buffer A to compare: " (current-buffer) t) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2240 (read-buffer "Buffer B to compare: " |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2241 (progn |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2242 ;; realign buffers so that two visible bufs will be |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2243 ;; at the top |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2244 (save-window-excursion (other-window 1)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2245 (other-buffer (current-buffer) t)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2246 t))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2247 (if (not (ediff-buffer-live-p buffer-A)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2248 (error "Buffer %S doesn't exist." buffer-A)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2249 (if (not (ediff-buffer-live-p buffer-B)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2250 (error "Buffer %S doesn't exist." buffer-B)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2251 |
7424 | 2252 (let (file-A file-B) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2253 (ediff-eval-in-buffer |
7267 | 2254 buffer-A |
7424 | 2255 (setq file-A (ediff-make-temp-file))) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2256 (ediff-eval-in-buffer |
7267 | 2257 buffer-B |
7424 | 2258 (setq file-B (ediff-make-temp-file))) |
2259 (ediff-setup (get-buffer buffer-A) file-A | |
2260 (get-buffer buffer-B) file-B | |
7267 | 2261 (cons (` (lambda () |
7424 | 2262 (delete-file (, file-A)) |
2263 (delete-file (, file-B)))) | |
7267 | 2264 startup-hooks) |
2265 ))) | |
2266 | |
7709
d88d94461e5d
(ediff-patch-buffer): Fix autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
7639
diff
changeset
|
2267 ;;;###autoload |
7267 | 2268 (defun ediff-patch-buffer (buffer-name &optional startup-hooks) |
2269 "Run Ediff by patching BUFFER-NAME." | |
2270 (interactive "bBuffer to patch: ") | |
2271 | |
2272 (let* ((file-buffer (get-buffer buffer-name)) | |
2273 (file-name (if file-buffer (buffer-file-name file-buffer)))) | |
2274 (if (not file-name) | |
2275 (error "Buffer %s doesn't exist or doesn't visit any file. Why patch?" | |
2276 file-name)) | |
2277 | |
2278 (ediff-patch-file file-name startup-hooks))) | |
2279 | |
2280 | |
2281 ;;; Versions Control functions | |
2282 | |
2283 ;;;###autoload | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2284 (defun ediff-revision (revision) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2285 "Call `vc.el' or `rcs.el' depending on `ediff-version-control-package'. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2286 This function is introduced to provide a uniform interface to version |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2287 control packages from Ediff." |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2288 (interactive "sVersion to Ediff with (default is the latest version): ") |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2289 (funcall |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2290 (intern (format "%S-ediff-internal" ediff-version-control-package)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2291 revision)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2292 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2293 (defun vc-ediff-internal (rev) |
7424 | 2294 ;; Note: this function will work only with Emacs 19.22 and higher. |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2295 "Run Ediff on version REV of the current buffer in another window. |
7267 | 2296 If the current buffer is named `F', the version is named `F.~REV~'. |
7391 | 2297 If `F.~REV~' already exists, it is used instead of being re-created." |
7267 | 2298 (or (featurep 'vc) |
2299 (if (locate-library "vc") ;; if vc.el is available | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2300 (require 'vc-hooks) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2301 (error "The vc.el package is apparently not installed"))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2302 (define-key vc-prefix-map "=" 'ediff-revision) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2303 (let ((newvers (current-buffer))) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2304 (vc-version-other-window rev) |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2305 ;; current-buffer is supposed to contain the old version |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2306 ;; in another window |
7424 | 2307 (ediff-buffers newvers (current-buffer)) |
7267 | 2308 )) |
2309 | |
2310 (defun rcs-ediff-view-revision (&optional rev) | |
7424 | 2311 "View previous RCS revision of current file. |
7267 | 2312 With prefix argument, prompts for a revision name." |
2313 (interactive (list (if current-prefix-arg | |
2314 (read-string "Revision: ")))) | |
2315 (let* ((filename (buffer-file-name (current-buffer))) | |
2316 (switches (append '("-p") | |
2317 (if rev (list (concat "-r" rev)) nil))) | |
2318 (buff (concat (file-name-nondirectory filename) ".~" rev "~"))) | |
2319 (message "Working...") | |
2320 (setq filename (expand-file-name filename)) | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2321 (with-output-to-temp-buffer buff |
7424 | 2322 (let ((output-buffer (ediff-rcs-get-output-buffer filename buff))) |
7267 | 2323 (delete-windows-on output-buffer) |
2324 (save-excursion | |
2325 (set-buffer output-buffer) | |
2326 (apply 'call-process "co" nil t nil | |
2327 ;; -q: quiet (no diagnostics) | |
2328 (append switches rcs-default-co-switches | |
2329 (list "-q" filename))))) | |
2330 (message "") | |
2331 buff))) | |
7424 | 2332 |
2333 (defun ediff-rcs-get-output-buffer (file name) | |
2334 ;; Get a buffer for RCS output for FILE, make it writable and clean it up. | |
2335 ;; Optional NAME is name to use instead of `*RCS-output*'. | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2336 ;; This is a modified version from rcs.el v1.1. I use it here to make |
7424 | 2337 ;; Ediff immune to changes in rcs.el |
2338 (let* ((default-major-mode 'fundamental-mode);; no frills! | |
2339 (buf (get-buffer-create name))) | |
2340 (save-excursion | |
2341 (set-buffer buf) | |
2342 (setq buffer-read-only nil | |
2343 default-directory (file-name-directory (expand-file-name file))) | |
2344 (erase-buffer)) | |
2345 buf)) | |
7267 | 2346 |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2347 (defun rcs-ediff-internal (rev) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2348 "Run Ediff on the current buffer, comparing it with previous RCS revision." |
7267 | 2349 (or (featurep 'rcs) |
2350 (if (locate-library "rcs") | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2351 (require 'rcs) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2352 (error "The rcs.el package is apparently not installed"))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2353 (global-set-key "\C-cD" 'ediff-revision) |
7267 | 2354 (let ((newvers (current-buffer)) |
2355 (oldvers (rcs-ediff-view-revision rev))) | |
2356 (ediff-buffers newvers oldvers) | |
2357 )) | |
2358 | |
2359 | |
2360 | |
2361 | |
2362 ;; Select the lowest window on the frame. | |
2363 (defun ediff-select-lowest-window () | |
2364 (let* ((lowest-window (selected-window)) | |
2365 (bottom-edge (car (cdr (cdr (cdr (window-edges)))))) | |
2366 (last-window (previous-window)) | |
2367 (window-search t)) | |
2368 (while window-search | |
2369 (let* ((this-window (next-window)) | |
2370 (next-bottom-edge (car (cdr (cdr (cdr | |
2371 (window-edges this-window))))))) | |
2372 (if (< bottom-edge next-bottom-edge) | |
2373 (progn | |
2374 (setq bottom-edge next-bottom-edge) | |
2375 (setq lowest-window this-window))) | |
2376 | |
2377 (select-window this-window) | |
2378 (if (eq last-window this-window) | |
2379 (progn | |
2380 (select-window lowest-window) | |
2381 (setq window-search nil))))))) | |
2382 | |
2383 ;;; Common setup routines | |
2384 | |
2385 ;; Set up the window configuration. If POS is given, set the points to | |
2386 ;; the beginnings of the buffers. | |
2387 (defun ediff-setup-windows (buffer-A buffer-B control-buffer &optional pos) | |
2388 ;; Make sure we are not in the minibuffer window when we try to delete | |
2389 ;; all other windows. | |
2390 (if (eq (selected-window) (minibuffer-window)) | |
2391 (other-window 1)) | |
7424 | 2392 (or (ediff-leave-window-config control-buffer) |
2393 (progn | |
2394 (delete-other-windows) | |
2395 (switch-to-buffer control-buffer) | |
2396 (ediff-refresh-mode-line) | |
7267 | 2397 |
7424 | 2398 (ediff-arrange-buffer buffer-A buffer-B (current-buffer) pos) |
2399 (ediff-arrange-buffer buffer-B buffer-A (current-buffer) pos) | |
2400 ;; ediff-arrange-buffer always leaves in ctl buffer | |
2401 ;; setup ctl wind if it is not set. | |
2402 (ediff-setup-control-window) | |
7267 | 2403 |
7424 | 2404 ;; If diff reports errors, show them then quit. |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2405 (if (/= 0 (ediff-eval-in-buffer ediff-error-buffer (buffer-size))) |
7424 | 2406 (let ((diff-output-buf ediff-diff-buffer)) |
2407 (switch-to-buffer ediff-error-buffer) | |
2408 (ediff-kill-buffer-carefully control-buffer) | |
2409 (error "Errors found in diff output. Diff output buffer is %s" | |
2410 diff-output-buf)))))) | |
7267 | 2411 |
2412 | |
2413 ;; Arranges goal-buf on the screen. | |
2414 (defun ediff-arrange-buffer (goal-buf other-buf ctl-buf &optional pos) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2415 (let* ((ctl-wind (ediff-get-visible-buffer-window ctl-buf)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2416 (goal-wind (ediff-get-visible-buffer-window goal-buf)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2417 (other-wind (ediff-get-visible-buffer-window other-buf)) |
7267 | 2418 (ctl-frame (ediff-window-frame ctl-wind)) |
2419 (goal-frame (if goal-wind (ediff-window-frame goal-wind))) | |
2420 (other-frame (if other-wind (ediff-window-frame other-wind))) | |
2421 (ctl-frame-shared (or (eq ctl-frame goal-frame) | |
2422 (eq ctl-frame other-frame)))) | |
2423 | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2424 (cond ((and goal-frame |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2425 (not (eq goal-wind other-wind))) |
7267 | 2426 ;; goal buffer is visible and we are not comparing file |
2427 ;; against itself (by mistake). | |
2428 ;; Note: goal-frame != ctl-frame, as we deleted other | |
2429 ;; windows on ctl-frame. | |
2430 (ediff-select-frame goal-frame) | |
2431 (select-window goal-wind) | |
2432 (delete-other-windows)) | |
2433 | |
2434 ;; goal-buf invisible, ctl-frame has only ctl-buf | |
2435 ;; then put goal-buf on ctl-frame | |
2436 ((null ctl-frame-shared) | |
2437 (ediff-select-frame ctl-frame) | |
2438 (split-window-vertically) | |
2439 (ediff-select-lowest-window) | |
2440 (setq ctl-wind (selected-window)) | |
2441 (switch-to-buffer ctl-buf) | |
2442 (ediff-setup-control-window) | |
2443 (other-window 1) | |
2444 (switch-to-buffer goal-buf)) ; goal-buf set | |
2445 ;; goal-buf invisible, ctl-frame has ctl-buf and other-buf | |
2446 ;; So, put everything in one frame | |
2447 (other-frame ;; share with the other buf | |
2448 (ediff-select-frame ctl-frame) | |
2449 (select-window other-wind) | |
2450 (funcall ediff-split-window-function) | |
2451 (other-window 1) | |
2452 (switch-to-buffer goal-buf)) | |
2453 (t ;; debug | |
2454 (error "Funny window combination (Ediff bug?)"))) | |
2455 | |
2456 (if pos | |
2457 (goto-char (point-min))) | |
2458 | |
2459 (ediff-select-frame ctl-frame) | |
2460 (select-window ctl-wind) | |
2461 (switch-to-buffer ctl-buf))) | |
2462 | |
2463 ;; This function assumes that we are in the window where control buffer is | |
2464 ;; to reside. | |
2465 (defun ediff-setup-control-window () | |
2466 "Set up window for control buffer." | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2467 (let ((window-min-height 2)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2468 (erase-buffer) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2469 (insert ediff-help-message) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2470 (shrink-window-if-larger-than-buffer) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2471 (setq ediff-control-window (selected-window)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2472 (setq ediff-window-config-saved |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2473 (format "%S%S%S%S" |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2474 ediff-control-window |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2475 (ediff-get-visible-buffer-window ediff-A-buffer) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2476 (ediff-get-visible-buffer-window ediff-B-buffer) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2477 ediff-split-window-function)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2478 (goto-char (point-min)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2479 (skip-chars-forward ediff-whitespace))) |
7424 | 2480 |
2481 (defun ediff-leave-window-config (control-buf) | |
2482 (and (eq control-buf (current-buffer)) | |
2483 (/= (buffer-size) 0) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2484 (ediff-eval-in-buffer |
7424 | 2485 control-buf |
2486 (string= ediff-window-config-saved | |
2487 (format "%S%S%S%S" | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2488 (ediff-get-visible-buffer-window ediff-control-buffer) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2489 (ediff-get-visible-buffer-window ediff-A-buffer) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2490 (ediff-get-visible-buffer-window ediff-B-buffer) |
7424 | 2491 ediff-split-window-function))))) |
7267 | 2492 |
2493 | |
2494 ;; Set up the keymap in the control buffer | |
2495 (defun ediff-set-keys () | |
2496 "Set up Ediff keymap, if necessary." | |
2497 (if (null ediff-mode-map) | |
2498 (ediff-setup-keymap)) | |
2499 (use-local-map ediff-mode-map)) | |
2500 | |
2501 ;; Reload Ediff keymap. For debugging only. | |
2502 (defun ediff-reload-keymap () | |
2503 (interactive) | |
2504 (setq ediff-mode-map nil) | |
2505 (ediff-set-keys)) | |
2506 | |
2507 (defun ediff-before-change-guard (start end) | |
7419 | 2508 "If buffer is highlighted with ASCII flags, remove highlighting. |
2509 Arguments, START and END are not used, but are provided | |
2510 because this is required by `before-change-function'." | |
7424 | 2511 (let (rehighlight-key) |
7267 | 2512 (save-window-excursion |
2513 (mapcar | |
2514 (function | |
2515 (lambda (buf) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2516 (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2517 buf |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2518 (if (eq ediff-highlighting-style 'ascii) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2519 (progn |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2520 (ediff-unselect-and-select-difference |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2521 ediff-current-difference |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2522 'unselect-only 'no-recenter) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2523 (setq rehighlight-key |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2524 (substitute-command-keys "\\[ediff-recenter]")) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2525 ))))) |
7267 | 2526 ediff-this-buffer-control-sessions) |
7424 | 2527 (if rehighlight-key |
2528 (error | |
2529 "ASCII flags removed. You can edit now. Hit %S to rehighlight." | |
2530 rehighlight-key)) | |
7267 | 2531 ))) |
7424 | 2532 |
2533 (defun ediff-recompute-diffs () | |
2534 "Recompute difference regions in buffers A and B." | |
2535 (interactive) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2536 (let ((point-A (ediff-eval-in-buffer ediff-A-buffer (point))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2537 (point-B (ediff-eval-in-buffer ediff-B-buffer (point))) |
7424 | 2538 file-A file-B) |
2539 (ediff-unselect-and-select-difference -1) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2540 (ediff-eval-in-buffer |
7424 | 2541 ediff-A-buffer |
2542 (setq file-A (ediff-make-temp-file))) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2543 (ediff-eval-in-buffer |
7424 | 2544 ediff-B-buffer |
2545 (setq file-B (ediff-make-temp-file))) | |
2546 (ediff-clear-diff-vector ediff-difference-vector 'fine-diffs-also) | |
2547 (setq ediff-killed-diffs-alist nil) ; saved kills will no longer be valid | |
2548 ; after recompute | |
2549 (setq ediff-difference-vector | |
2550 (ediff-setup-diff-regions file-A file-B 'use-old)) | |
2551 (setq ediff-number-of-differences (length ediff-difference-vector)) | |
2552 (delete-file file-A) | |
2553 (delete-file file-B) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2554 (ediff-eval-in-buffer ediff-A-buffer (goto-char point-A)) |
7424 | 2555 (ediff-jump-to-difference (ediff-diff-at-point 'A)) |
2556 (beep 1) | |
2557 (if (y-or-n-p | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2558 "Ediff is at last posn in buff A. Stay (or goto last posn in B)? ") |
7424 | 2559 () |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2560 (ediff-eval-in-buffer ediff-B-buffer (goto-char point-B)) |
7424 | 2561 (ediff-jump-to-difference (ediff-diff-at-point 'B))) |
2562 (message "") | |
2563 )) | |
7267 | 2564 |
2565 (defun ediff-remember-buffer-characteristics (&optional arg) | |
2566 "Record certain properties of the buffers being compared. | |
7419 | 2567 Must be called in the control buffer. Saves `read-only', `modified', |
2568 and `auto-save' properties in buffer local variables. Turns off | |
2569 `auto-save-mode'. These properties are restored via a call to | |
2570 `ediff-restore-buffer-characteristics'." | |
7267 | 2571 |
2572 ;; remember and alter buffer characteristics | |
2573 (set (if arg 'ediff-A-buffer-values-setup 'ediff-A-buffer-values) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2574 (ediff-eval-in-buffer |
7267 | 2575 ediff-A-buffer |
2576 (prog1 | |
2577 (emerge-save-variables ediff-saved-variables) | |
2578 (emerge-restore-variables ediff-saved-variables | |
2579 ediff-working-values)))) | |
2580 (set (if arg 'ediff-B-buffer-values-setup 'ediff-B-buffer-values) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2581 (ediff-eval-in-buffer |
7267 | 2582 ediff-B-buffer |
2583 (prog1 | |
2584 (emerge-save-variables ediff-saved-variables) | |
2585 (emerge-restore-variables ediff-saved-variables | |
2586 ediff-working-values))))) | |
2587 | |
2588 (defun ediff-restore-buffer-characteristics (&optional arg) | |
7419 | 2589 "Restores properties saved by `ediff-remember-buffer-characteristics'." |
7267 | 2590 (let ((A-values (if arg ediff-A-buffer-values-setup ediff-A-buffer-values)) |
2591 (B-values (if arg ediff-B-buffer-values-setup ediff-B-buffer-values))) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2592 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2593 (ediff-eval-in-buffer ediff-A-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2594 (emerge-restore-variables ediff-saved-variables |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2595 A-values)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2596 (ediff-eval-in-buffer ediff-B-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2597 (emerge-restore-variables ediff-saved-variables |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2598 B-values)))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2599 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2600 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2601 ;; If optional A-buffer and B-buffer are given, then construct a vector of |
7424 | 2602 ;; diff using point values. Otherwise, use line offsets. |
2603 (defun ediff-extract-diffs (diff-buffer &optional A-buffer B-buffer) | |
7267 | 2604 (let (diff-list |
2605 (a-prev 1) ;; this is needed to set the first diff line correctly | |
2606 (b-prev 1)) | |
7424 | 2607 |
2608 (if (and A-buffer B-buffer) | |
2609 (progn ;; reset point in buffers A and B | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2610 (ediff-eval-in-buffer |
7424 | 2611 A-buffer |
2612 (goto-char (point-min))) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2613 (ediff-eval-in-buffer |
7424 | 2614 B-buffer |
2615 (goto-char (point-min))))) | |
2616 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2617 (ediff-eval-in-buffer |
7267 | 2618 diff-buffer |
2619 (goto-char (point-min)) | |
2620 (while (re-search-forward ediff-match-diff-line nil t) | |
2621 (let* ((a-begin (string-to-int (buffer-substring (match-beginning 1) | |
2622 (match-end 1)))) | |
2623 (a-end (let ((b (match-beginning 3)) | |
2624 (e (match-end 3))) | |
2625 (if b | |
2626 (string-to-int (buffer-substring b e)) | |
2627 a-begin))) | |
2628 (diff-type (buffer-substring (match-beginning 4) (match-end 4))) | |
2629 (b-begin (string-to-int (buffer-substring (match-beginning 5) | |
2630 (match-end 5)))) | |
2631 (b-end (let ((b (match-beginning 7)) | |
2632 (e (match-end 7))) | |
2633 (if b | |
2634 (string-to-int (buffer-substring b e)) | |
2635 b-begin))) | |
2636 a-begin-pt a-end-pt b-begin-pt b-end-pt) | |
2637 ;; fix the beginning and end numbers, because diff is somewhat | |
2638 ;; strange about how it numbers lines | |
2639 (if (string-equal diff-type "a") | |
2640 (setq b-end (1+ b-end) | |
2641 a-begin (1+ a-begin) | |
2642 a-end a-begin) | |
2643 (if (string-equal diff-type "d") | |
2644 (setq a-end (1+ a-end) | |
2645 b-begin (1+ b-begin) | |
2646 b-end b-begin) | |
2647 ;; (string-equal diff-type "c") | |
2648 (setq a-end (1+ a-end) | |
2649 b-end (1+ b-end)))) | |
7424 | 2650 (if (and A-buffer B-buffer) |
2651 (progn ;; computing main diff vector | |
2652 ;; convert to relative line numbers | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2653 (ediff-eval-in-buffer |
7424 | 2654 A-buffer |
2655 (forward-line (- a-begin a-prev)) | |
2656 (setq a-begin-pt (point)) | |
2657 (forward-line (- a-end a-begin)) | |
2658 (setq a-end-pt (point) | |
2659 a-prev a-end)) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2660 (ediff-eval-in-buffer |
7424 | 2661 B-buffer |
2662 (forward-line (- b-begin b-prev)) | |
2663 (setq b-begin-pt (point)) | |
2664 (forward-line (- b-end b-begin)) | |
2665 (setq b-end-pt (point) | |
2666 b-prev b-end)) | |
2667 (setq diff-list | |
2668 (nconc diff-list (list (vector a-begin-pt a-end-pt | |
2669 b-begin-pt b-end-pt))))) | |
2670 ;; computing refinement vector | |
2671 (setq diff-list | |
2672 (nconc diff-list (list (vector (- a-begin a-prev) | |
2673 (- a-end a-begin) | |
2674 (- b-begin b-prev) | |
2675 (- b-end b-begin)))) | |
2676 a-prev a-end | |
2677 b-prev b-end)) | |
2678 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2679 ))) ;; end ediff-eval-in-buffer |
7267 | 2680 diff-list |
2681 )) | |
2682 | |
2683 (defun ediff-convert-diffs-to-overlays (A-buffer B-buffer diff-list) | |
2684 (let* ((current-diff -1) | |
2685 (total-diffs (length diff-list)) | |
7424 | 2686 ; (control-buffer-suffix ediff-control-buffer-suffix) |
7267 | 2687 diff-overlay-list list-element |
2688 a-begin a-end b-begin b-end | |
2689 a-overlay b-overlay) | |
2690 | |
2691 (while diff-list | |
2692 (setq current-diff (1+ current-diff) | |
2693 list-element (car diff-list) | |
2694 a-begin (aref list-element 0) | |
2695 a-end (aref list-element 1) | |
2696 b-begin (aref list-element 2) | |
2697 b-end (aref list-element 3)) | |
2698 | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2699 ;; Put overlays at appropriate places in buffers |
7267 | 2700 (setq a-overlay (ediff-make-overlay a-begin a-end A-buffer)) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2701 ;; Priorities of overlays should be equal in all ediff control |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2702 ;; panels buffers. Otherwise it won't work due to Emacs |
7424 | 2703 ;; bug---insert-in-front-hooks will be called |
7267 | 2704 ;; only on behalf of the buffer with higher priority. |
2705 (ediff-overlay-put a-overlay 'priority ediff-shaded-overlay-priority) | |
2706 (ediff-overlay-put a-overlay 'ediff-diff-num current-diff) | |
2707 (ediff-overlay-put a-overlay | |
2708 'insert-in-front-hooks '(ediff-insert-in-front)) | |
7424 | 2709 ; (ediff-overlay-put a-overlay |
2710 ; 'ediff-control-buffer control-buffer-suffix) | |
7267 | 2711 (ediff-overlay-put a-overlay |
2712 'face (if (ediff-odd-p current-diff) ;; odd diff | |
2713 'ediff-odd-diff-face-A-var | |
2714 'ediff-even-diff-face-A-var)) | |
2715 | |
2716 (setq b-overlay (ediff-make-overlay b-begin b-end B-buffer)) | |
2717 (ediff-overlay-put b-overlay 'priority ediff-shaded-overlay-priority) | |
2718 (ediff-overlay-put b-overlay 'ediff-diff-num current-diff) | |
2719 (ediff-overlay-put b-overlay | |
2720 'insert-in-front-hooks '(ediff-insert-in-front)) | |
7424 | 2721 ; (ediff-overlay-put b-overlay |
2722 ; 'ediff-control-buffer control-buffer-suffix) | |
7267 | 2723 (ediff-overlay-put b-overlay |
2724 'face (if (ediff-odd-p current-diff) ;; odd diff | |
2725 'ediff-odd-diff-face-B-var | |
2726 'ediff-even-diff-face-B-var)) | |
2727 | |
2728 (if (ediff-if-lucid) ;; chars inserted at end will be inside extent | |
2729 (progn | |
2730 (ediff-overlay-put a-overlay | |
2731 'ediff-marker | |
2732 (move-marker (make-marker) a-begin A-buffer)) | |
2733 (ediff-overlay-put b-overlay | |
2734 'ediff-marker | |
2735 (move-marker (make-marker) b-begin B-buffer)) | |
2736 (ediff-overlay-put a-overlay 'end-open nil) | |
2737 (ediff-overlay-put b-overlay 'end-open nil))) | |
2738 | |
2739 ;; record all overlays for this difference | |
2740 (setq diff-overlay-list | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2741 (nconc diff-overlay-list |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2742 (list (vector a-overlay b-overlay nil nil))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2743 diff-list |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2744 (cdr diff-list)) |
7424 | 2745 (message "Processing diff region %d of %d" |
7267 | 2746 current-diff total-diffs) |
2747 ) ;; while | |
2748 ;; this is just to avoid confusing the user with diff num < total-diffs | |
7424 | 2749 (message "Processing diff region %d of %d" |
7267 | 2750 (1+ current-diff) total-diffs) |
2751 ;; convert the list of difference information into a vector for | |
2752 ;; fast access | |
7424 | 2753 (apply 'vector diff-overlay-list))) |
7267 | 2754 |
2755 | |
2756 | |
2757 ;;; Commands | |
2758 | |
2759 (defun ediff-recenter (&optional no-rehighlight) | |
2760 "Bring the highlighted region of all buffers A and B into view. | |
2761 Reestablish the default three-window display." | |
2762 (interactive) | |
2763 (setq ediff-disturbed-overlays nil) ;; clear after use | |
2764 (let (buffer-read-only) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2765 (if (and (ediff-buffer-live-p ediff-A-buffer) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2766 (ediff-buffer-live-p ediff-B-buffer)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2767 (ediff-setup-windows |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2768 ediff-A-buffer ediff-B-buffer ediff-control-buffer))) |
7267 | 2769 ;; Redisplay whatever buffers are showing, if there is a selected difference |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2770 (if (and (ediff-buffer-live-p ediff-A-buffer) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2771 (ediff-buffer-live-p ediff-B-buffer) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2772 (>= ediff-current-difference 0) |
7267 | 2773 (< ediff-current-difference ediff-number-of-differences)) |
2774 (let* ( ;; context must be saved before switching to windows A/B | |
2775 (buffer-A ediff-A-buffer) | |
2776 (buffer-B ediff-B-buffer) | |
2777 (wind (selected-window)) | |
2778 (control-buf ediff-control-buffer) | |
2779 (before-flag-shift-A (if (eq ediff-highlighting-style 'ascii) | |
2780 (1- (length ediff-before-flag-A)) | |
2781 0)) | |
2782 (after-flag-shift-A (if (eq ediff-highlighting-style 'ascii) | |
2783 (1- (length ediff-after-flag-A)) | |
2784 0)) | |
2785 (before-flag-shift-B (if (eq ediff-highlighting-style 'ascii) | |
2786 (1- (length ediff-before-flag-B)) | |
2787 0)) | |
2788 (after-flag-shift-B (if (eq ediff-highlighting-style 'ascii) | |
2789 (1- (length ediff-after-flag-B)) | |
2790 0)) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2791 (window-A (ediff-get-visible-buffer-window buffer-A)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2792 (window-B (ediff-get-visible-buffer-window buffer-B))) |
7267 | 2793 |
2794 (or no-rehighlight | |
2795 (ediff-operate-on-flags 'insert)) | |
2796 | |
2797 (if window-A (progn | |
2798 (select-window window-A) | |
2799 (ediff-position-region | |
2800 (- (ediff-get-diff-posn 'A 'beg nil control-buf) | |
2801 before-flag-shift-A) | |
2802 (+ (ediff-get-diff-posn 'A 'end nil control-buf) | |
2803 after-flag-shift-A) | |
2804 (ediff-get-diff-posn 'A 'beg nil control-buf)))) | |
2805 (if window-B (progn | |
2806 (select-window window-B) | |
2807 (ediff-position-region | |
2808 (- (ediff-get-diff-posn 'B 'beg nil control-buf) | |
2809 before-flag-shift-B) | |
2810 (+ (ediff-get-diff-posn 'B 'end nil control-buf) | |
2811 after-flag-shift-B) | |
2812 (ediff-get-diff-posn 'B 'beg nil control-buf)))) | |
2813 (select-window wind)))) | |
2814 | |
2815 (defun ediff-toggle-split () | |
2816 "Toggle vertical/horizontal window split. | |
2817 Does nothing if file-A and file-B are in different frames." | |
2818 (interactive) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2819 (let* ((wind-A (ediff-get-visible-buffer-window ediff-A-buffer)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2820 (wind-B (ediff-get-visible-buffer-window ediff-B-buffer)) |
7267 | 2821 (frame-A (if wind-A (ediff-window-frame wind-A))) |
2822 (frame-B (if wind-B (ediff-window-frame wind-B)))) | |
2823 (if (eq frame-A frame-B) | |
2824 (setq ediff-split-window-function | |
2825 (if (eq ediff-split-window-function 'split-window-vertically) | |
2826 'split-window-horizontally | |
2827 'split-window-vertically)) | |
7424 | 2828 (message "No splitting: Buffers A and B are in different frames.")) |
7267 | 2829 (ediff-recenter 'no-rehighlight))) |
2830 | |
2831 (defun ediff-toggle-hilit () | |
2832 "Switch between highlighting using ASCII flags and highlighting using faces. | |
2833 On a dumb terminal, switches between ASCII highlighting and no highlighting." | |
2834 (interactive) | |
2835 (if (not window-system) | |
2836 (if (eq ediff-highlighting-style 'ascii) | |
2837 (progn | |
2838 (message "ASCII highlighting flags removed.") | |
2839 (ediff-unselect-and-select-difference ediff-current-difference | |
2840 'unselect-only) | |
2841 (setq ediff-highlighting-style 'off)) | |
2842 (ediff-unselect-and-select-difference ediff-current-difference | |
2843 'select-only)) | |
2844 (ediff-unselect-and-select-difference ediff-current-difference | |
2845 'unselect-only) | |
2846 ;; cycle through highlighting | |
7424 | 2847 (cond ((and ediff-want-faces ediff-highlight-all-diffs) |
2848 (message "Unhighlighting unselected difference regions.") | |
2849 (setq ediff-highlight-all-diffs nil)) | |
7267 | 2850 (ediff-want-faces |
7424 | 2851 (message "Highlighting with ASCII flags.") |
7267 | 2852 (setq ediff-want-faces nil)) |
2853 (t | |
7424 | 2854 (message "Re-highlighting all difference regions.") |
7267 | 2855 (setq ediff-want-faces t |
7424 | 2856 ediff-highlight-all-diffs t))) |
7267 | 2857 |
7424 | 2858 (if (and ediff-want-faces ediff-highlight-all-diffs) |
7267 | 2859 (if (not (face-differs-from-default-p 'ediff-odd-diff-face-A-var)) |
2860 (progn | |
2861 (copy-face ediff-odd-diff-face-A 'ediff-odd-diff-face-A-var) | |
2862 (copy-face ediff-odd-diff-face-B 'ediff-odd-diff-face-B-var) | |
2863 (copy-face ediff-even-diff-face-A 'ediff-even-diff-face-A-var) | |
2864 (copy-face ediff-even-diff-face-B 'ediff-even-diff-face-B-var))) | |
2865 (copy-face 'default 'ediff-odd-diff-face-A-var) | |
2866 (copy-face 'default 'ediff-odd-diff-face-B-var) | |
2867 (copy-face 'default 'ediff-even-diff-face-A-var) | |
2868 (copy-face 'default 'ediff-even-diff-face-B-var)) | |
2869 | |
2870 (ediff-unselect-and-select-difference | |
2871 ediff-current-difference 'select-only)) | |
2872 (ediff-operate-on-flags 'insert) | |
2873 ) | |
2874 | |
7424 | 2875 (defun ediff-toggle-autorefine () |
2876 "Toggle auto-refine mode." | |
2877 (interactive) | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2878 (cond ((eq ediff-auto-refine 'nix) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2879 (setq ediff-auto-refine 'on) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2880 (ediff-make-fine-diffs ediff-current-difference 'noforce) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2881 (message "Auto-refining is ON.")) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2882 ((eq ediff-auto-refine 'on) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2883 (message "Auto-refining is OFF.") |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2884 (setq ediff-auto-refine 'off)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2885 (t |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2886 (ediff-set-fine-diff-properties ediff-current-difference 'default) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2887 (message "Refinements are HIDDEN.") |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2888 (setq ediff-auto-refine 'nix)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
2889 )) |
7424 | 2890 |
7267 | 2891 (defun ediff-toggle-help () |
2892 "Toggle short/long help message." | |
2893 (interactive) | |
2894 (let (buffer-read-only) | |
2895 (erase-buffer) | |
2896 (if (string= ediff-help-message ediff-help-message-long) | |
2897 (setq ediff-help-message ediff-help-message-short) | |
2898 (setq ediff-help-message ediff-help-message-long))) | |
7424 | 2899 (setq ediff-window-config-saved "") ;; force redisplay |
7267 | 2900 (ediff-recenter 'no-rehighlight)) |
2901 | |
2902 | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2903 (defun ediff-toggle-read-only-patch-orig () |
7267 | 2904 "Used as a startup hook to set `.orig' patch file read-only." |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2905 (ediff-toggle-read-only ediff-A-buffer)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2906 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2907 (defun ediff-toggle-read-only (&optional buff) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2908 "Toggles read-only in buffers A and B. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2909 If buffer is under version control and locked, check it out first." |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2910 (interactive) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2911 ;; Optional argument, BUF, is passed only in a startup hook. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2912 (or buff (ediff-recenter)) |
7267 | 2913 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
2914 (ediff-eval-in-buffer |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2915 (or buff (if (eq last-command-char ?A) ediff-A-buffer ediff-B-buffer)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2916 (let* ((file (buffer-file-name (current-buffer))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2917 (file-writable (and file (file-writable-p file))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2918 (toggle-ro-cmd (cond (ediff-toggle-read-only-function) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2919 (ediff-local-checkout-flag |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2920 (if (and file (not file-writable)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2921 (progn |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2922 (beep 1) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2923 (message "Warning: file %s is read-only." |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2924 (abbreviate-file-name file)))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2925 'toggle-read-only) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2926 (file-writable 'toggle-read-only) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2927 (t (key-binding "\C-x\C-q"))))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2928 (if (and toggle-ro-cmd |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2929 (string-match "toggle-read-only" (symbol-name toggle-ro-cmd))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2930 (save-window-excursion |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2931 (setq ediff-local-checkout-flag t) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2932 (or buff |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2933 (select-window |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2934 (ediff-get-visible-buffer-window (current-buffer)))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2935 (command-execute toggle-ro-cmd)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2936 (error "Don't know how to toggle read-only in buffer %S" |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2937 (current-buffer)))))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2938 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2939 |
7267 | 2940 |
2941 ;;; Window scrolling operations | |
2942 | |
7424 | 2943 ;; Perform some operation on the two file windows (if they are showing). |
7267 | 2944 ;; Catches all errors on the operation in the A and B windows. |
2945 ;; Usually, errors come from scrolling off the | |
2946 ;; beginning or end of the buffer, and this gives nice nice error messages. | |
2947 (defun ediff-operate-on-windows (operation arg) | |
2948 (let* ((buffer-A ediff-A-buffer) | |
2949 (buffer-B ediff-B-buffer) | |
2950 (wind (selected-window)) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2951 (window-A (ediff-get-visible-buffer-window buffer-A)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2952 (window-B (ediff-get-visible-buffer-window buffer-B))) |
7267 | 2953 (if window-A (progn |
2954 (select-window window-A) | |
2955 (condition-case nil | |
2956 (funcall operation arg) | |
2957 (error)))) | |
2958 (if window-B (progn | |
2959 (select-window window-B) | |
2960 (condition-case nil | |
2961 (funcall operation arg) | |
2962 (error)))) | |
2963 (select-window wind) | |
2964 )) | |
2965 | |
2966 (defun ediff-scroll-up (&optional arg) | |
2967 "Scroll up buffers A and B, if they are in windows. | |
2968 With optional argument ARG, scroll ARG lines; otherwise scroll by nearly | |
2969 the height of window-A." | |
2970 (interactive "P") | |
2971 (ediff-operate-on-windows | |
2972 'scroll-up | |
2973 ;; calculate argument to scroll-up | |
2974 ;; if there is an explicit argument | |
2975 (if (and arg (not (equal arg '-))) | |
2976 ;; use it | |
2977 (prefix-numeric-value arg) | |
2978 ;; if not, see if we can determine a default amount (the window height) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2979 (let* ((window-A (ediff-get-visible-buffer-window ediff-A-buffer)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
2980 (window-B (ediff-get-visible-buffer-window ediff-B-buffer)) |
7267 | 2981 default-amount) |
2982 (if (or (null window-A) (null window-B)) | |
2983 (setq default-amount 0) | |
2984 (setq default-amount | |
2985 (- (min (window-height window-A) (window-height window-B)) | |
2986 1 next-screen-context-lines))) | |
2987 ;; the window was found | |
2988 (if arg | |
2989 ;; C-u as argument means half of default amount | |
2990 (/ default-amount 2) | |
2991 ;; no argument means default amount | |
2992 default-amount))))) | |
2993 | |
2994 (defun ediff-scroll-down (&optional arg) | |
2995 "Scroll down buffers A and B, if they are in windows. | |
2996 With optional argument ARG, scroll ARG lines; otherwise scroll by nearly | |
2997 the height of window-A." | |
2998 (interactive "P") | |
2999 (ediff-operate-on-windows | |
3000 'scroll-down | |
3001 ;; calculate argument to scroll-down | |
3002 ;; if there is an explicit argument | |
3003 (if (and arg (not (equal arg '-))) | |
3004 ;; use it | |
3005 (prefix-numeric-value arg) | |
3006 ;; if not, see if we can determine a default amount (the window height) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3007 (let* ((window-A (ediff-get-visible-buffer-window ediff-A-buffer)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3008 (window-B (ediff-get-visible-buffer-window ediff-B-buffer)) |
7267 | 3009 default-amount) |
3010 (if (or (null window-A) (null window-B)) | |
3011 (setq default-amount 0) | |
3012 (setq default-amount | |
3013 (- (min (window-height window-A) (window-height window-B)) | |
3014 1 next-screen-context-lines))) | |
3015 ;; the window was found | |
3016 (if arg | |
3017 ;; C-u as argument means half of default amount | |
3018 (/ default-amount 2) | |
3019 ;; no argument means default amount | |
3020 default-amount))))) | |
3021 | |
3022 (defun ediff-scroll-left (&optional arg) | |
3023 "Scroll left buffer-A and buffer-B, if they are in windows. | |
3024 If an argument is given, that is how many columns are scrolled, else nearly | |
3025 the width of the A and B windows." | |
3026 (interactive "P") | |
3027 (ediff-operate-on-windows | |
3028 'scroll-left | |
3029 ;; calculate argument to scroll-left | |
3030 ;; if there is an explicit argument | |
3031 (if (and arg (not (equal arg '-))) | |
3032 ;; use it | |
3033 (prefix-numeric-value arg) | |
3034 ;; if not, see if we can determine a default amount | |
3035 ;; (half the window width) | |
3036 (if (null ediff-control-window) | |
3037 ;; no control window, use nil | |
3038 nil | |
3039 (let ((default-amount | |
3040 (- (/ (window-width ediff-control-window) 2) 3))) | |
3041 ;; the window was found | |
3042 (if arg | |
3043 ;; C-u as argument means half of default amount | |
3044 (/ default-amount 2) | |
3045 ;; no argument means default amount | |
3046 default-amount)))))) | |
3047 | |
3048 (defun ediff-scroll-right (&optional arg) | |
3049 "Scroll right buffer-A and buffer-B, if they are in windows. | |
3050 If an argument is given, that is how many columns are scrolled, else nearly | |
3051 the width of the A and B windows." | |
3052 (interactive "P") | |
3053 (ediff-operate-on-windows | |
3054 'scroll-right | |
3055 ;; calculate argument to scroll-right | |
3056 ;; if there is an explicit argument | |
3057 (if (and arg (not (equal arg '-))) | |
3058 ;; use it | |
3059 (prefix-numeric-value arg) | |
3060 ;; if not, see if we can determine a default amount | |
3061 ;; (half the window width) | |
3062 (if (null ediff-control-window) | |
3063 ;; no control window, use nil | |
3064 nil | |
3065 (let ((default-amount | |
3066 (- (/ (window-width ediff-control-window) 2) 3))) | |
3067 ;; the window was found | |
3068 (if arg | |
3069 ;; C-u as argument means half of default amount | |
3070 (/ default-amount 2) | |
3071 ;; no argument means default amount | |
3072 default-amount)))))) | |
3073 | |
3074 (defun ediff-position-region (beg end pos) | |
7424 | 3075 "This is a variation on `emerge-position-region'. |
7267 | 3076 The difference is that it always tries to align difference regions in |
3077 buffer-A and buffer-B, so that it will be easier to compare them." | |
3078 (set-window-start (selected-window) beg) | |
3079 (if (pos-visible-in-window-p end) | |
3080 ;; Determine the number of lines that the region occupies | |
3081 (let ((lines 0)) | |
3082 (while (> end (progn | |
3083 (move-to-window-line lines) | |
3084 (point))) | |
3085 (setq lines (1+ lines))) | |
3086 ;; And position the beginning on the right line | |
3087 (goto-char beg) | |
3088 (recenter (/ (1+ (max (- (1- (window-height (selected-window))) | |
3089 lines) | |
3090 1) | |
3091 ) | |
3092 2)))) | |
3093 (goto-char pos) | |
3094 ) | |
3095 | |
3096 | |
7424 | 3097 (defun ediff-next-difference (&optional arg) |
7267 | 3098 "Advance to the next difference. |
3099 With a prefix argument, go back that many differences." | |
3100 (interactive "P") | |
3101 (if (< ediff-current-difference ediff-number-of-differences) | |
3102 (let ((n (min ediff-number-of-differences | |
3103 (+ ediff-current-difference (if arg arg 1)))) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3104 buffer-read-only) |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3105 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3106 (while (and (< n ediff-number-of-differences) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3107 (funcall ediff-skip-diff-region-function n)) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3108 (setq n (1+ n))) |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3109 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3110 (ediff-unselect-and-select-difference n) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3111 ;; possibly skip inessential difference regions |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3112 (while (and ediff-ignore-similar-regions |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3113 (< n ediff-number-of-differences) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3114 (ediff-no-fine-diffs n)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3115 (setq n (1+ n)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3116 (ediff-unselect-and-select-difference n)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3117 ) ;; let |
7267 | 3118 (error "At end of the difference list."))) |
3119 | |
7424 | 3120 (defun ediff-previous-difference (&optional arg) |
7267 | 3121 "Go to the previous difference. |
3122 With a prefix argument, go back that many differences." | |
3123 (interactive "P") | |
3124 (if (> ediff-current-difference -1) | |
3125 (let ((n (max -1 (- ediff-current-difference (if arg arg 1)))) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3126 buffer-read-only) |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3127 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3128 (while (and (funcall ediff-skip-diff-region-function n) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3129 (> n -1)) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3130 (setq n (1- n))) |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3131 (ediff-unselect-and-select-difference n) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3132 ;; possibly skip inessential difference regions |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3133 (while (and ediff-ignore-similar-regions |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3134 (> n -1) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3135 (ediff-no-fine-diffs n)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3136 (setq n (1- n)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3137 (ediff-unselect-and-select-difference n)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3138 ) ;; let |
7267 | 3139 (error "At beginning of the difference list."))) |
3140 | |
3141 (defun ediff-jump-to-difference (difference-number) | |
3142 "Go to the difference specified as a prefix argument." | |
3143 (interactive "p") | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3144 (let (buffer-read-only) |
7267 | 3145 (setq difference-number (1- difference-number)) |
3146 (if (and (>= difference-number -1) | |
3147 (< difference-number (1+ ediff-number-of-differences))) | |
3148 (ediff-unselect-and-select-difference difference-number) | |
3149 (error "Bad difference number")))) | |
3150 | |
3151 (defun ediff-jump-to-difference-at-point () | |
3152 "Go to the difference closest to the point in buffer A or B. | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3153 If this command is invoked via `\\[ediff-jump-to-difference-at-point]' |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3154 then the point in buffer B is used. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3155 Otherwise, buffer A's point is used." |
7267 | 3156 (interactive) |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3157 (let ((buf-type (ediff-char-to-buftype last-command-char)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3158 buffer-read-only) |
7267 | 3159 (ediff-jump-to-difference (ediff-diff-at-point buf-type)))) |
3160 | |
3161 | |
3162 ;; find region "most related to the current point position | |
3163 | |
3164 (defun ediff-diff-at-point (buf-type) | |
7424 | 3165 (let ((buffer (ediff-get-buffer buf-type)) |
7267 | 3166 (ctl-buffer ediff-control-buffer) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3167 (max-dif-num (1- ediff-number-of-differences)) |
7267 | 3168 (diff-no -1) |
3169 (prev-beg 0) | |
7424 | 3170 (prev-end 0) |
3171 (beg 0) | |
3172 (end 0)) | |
7267 | 3173 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3174 (ediff-eval-in-buffer |
7267 | 3175 buffer |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3176 (while (and (or (< (point) prev-beg) (> (point) beg)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3177 (< diff-no max-dif-num)) |
7267 | 3178 (setq diff-no (1+ diff-no)) |
7424 | 3179 (setq prev-beg beg |
3180 prev-end end) | |
3181 (setq beg (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer) | |
3182 end (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer)) | |
3183 ) | |
7267 | 3184 |
7424 | 3185 (if (< (abs (- (point) prev-end)) |
7267 | 3186 (abs (- (point) beg))) |
3187 diff-no | |
3188 (1+ diff-no)) ;; jump-to-diff works with diff nums higher by 1 | |
3189 ))) | |
3190 | |
3191 ;;; Copying diffs. | |
3192 | |
3193 (defun ediff-diff-to-diff (arg) | |
3194 "Copy buffer-A'th diff to buffer B. | |
3195 If numerical prefix argument, copy this diff specified in the arg. | |
7419 | 3196 Otherwise, copy the difference given by `ediff-current-difference'." |
7267 | 3197 (interactive "P") |
3198 (if arg | |
3199 (ediff-jump-to-difference arg)) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3200 (let* ((key1 (aref (this-command-keys) 0)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3201 (key2 (aref (this-command-keys) 1)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3202 (char1 (if (ediff-if-lucid) (event-key key1) key1)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3203 (char2 (if (ediff-if-lucid) (event-key key2) key2))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3204 (ediff-copy-diff ediff-current-difference |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3205 (ediff-char-to-buftype char1) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3206 (ediff-char-to-buftype char2)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3207 (ediff-recenter 'no-rehighlight))) |
7267 | 3208 |
3209 | |
7424 | 3210 (defun ediff-copy-diff (n from-buf-type to-buf-type) |
3211 "Copy diff N from FROM-BUF-TYPE \(given as 'A or 'B\) to TO-BUF-TYPE." | |
3212 (let* ((to-buf (ediff-get-buffer to-buf-type)) | |
3213 (from-buf (ediff-get-buffer from-buf-type)) | |
7267 | 3214 (ctrl-buf ediff-control-buffer) |
3215 reg-to-copy reg-to-delete | |
3216 reg-to-delete-beg reg-to-delete-end) | |
3217 | |
3218 (ediff-operate-on-flags 'remove) | |
3219 (setq reg-to-delete-beg | |
7424 | 3220 (ediff-get-diff-posn to-buf-type 'beg n ctrl-buf)) |
7267 | 3221 (setq reg-to-delete-end |
7424 | 3222 (ediff-get-diff-posn to-buf-type 'end n ctrl-buf)) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3223 (setq reg-to-copy (ediff-eval-in-buffer |
7424 | 3224 from-buf |
7267 | 3225 (buffer-substring (ediff-get-diff-posn |
7424 | 3226 from-buf-type 'beg n ctrl-buf) |
7267 | 3227 (ediff-get-diff-posn |
7424 | 3228 from-buf-type 'end n ctrl-buf)))) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3229 (setq reg-to-delete (ediff-eval-in-buffer |
7424 | 3230 to-buf |
7267 | 3231 (buffer-substring reg-to-delete-beg |
3232 reg-to-delete-end))) | |
3233 (setq ediff-disturbed-overlays nil) ;; clear before use | |
3234 | |
3235 (if (string= reg-to-delete reg-to-copy) | |
3236 (progn | |
3237 (ding) | |
3238 (message | |
7424 | 3239 "Diff regions %d are identical in buffers %S and %S. Nothing copied." |
3240 (1+ n) from-buf-type to-buf-type)) | |
7267 | 3241 |
3242 ;; seems ok to copy | |
7424 | 3243 (if (ediff-test-save-region n to-buf-type) |
7267 | 3244 (condition-case conds |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3245 (progn |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3246 (ediff-eval-in-buffer |
7424 | 3247 to-buf |
7267 | 3248 ;; to prevent flags from interfering if buffer is writable |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3249 (let ((inhibit-read-only (null buffer-read-only)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3250 before-change-function) |
7267 | 3251 (goto-char reg-to-delete-end) |
3252 (insert-before-markers reg-to-copy) | |
3253 (if (ediff-if-lucid) | |
3254 (progn | |
3255 (ediff-collect-extents-lucid reg-to-delete-beg) | |
3256 (if (> reg-to-delete-end reg-to-delete-beg) | |
3257 (progn | |
3258 (kill-region reg-to-delete-beg | |
3259 reg-to-delete-end) | |
3260 (if (string= reg-to-copy "") | |
3261 (ediff-adjust-disturbed-extents-lucid | |
3262 reg-to-delete-beg))))) | |
3263 (if (> reg-to-delete-end reg-to-delete-beg) | |
3264 (kill-region reg-to-delete-beg reg-to-delete-end) | |
3265 (ediff-move-disturbed-overlays reg-to-delete-beg))) | |
3266 )) | |
7424 | 3267 (ediff-save-diff-region n to-buf-type reg-to-delete)) |
7267 | 3268 (error (message "%s %s" |
3269 (car conds) | |
3270 (mapconcat 'prin1-to-string (cdr conds) " ")) | |
3271 (beep 1)))) | |
3272 ) | |
3273 (ediff-operate-on-flags 'insert) | |
3274 )) | |
3275 | |
3276 (defun ediff-save-diff-region (n buf-type reg) | |
7419 | 3277 "Save Nth diff of buffer BUF-TYPE \(`A' or `B'\). |
3278 That is to say, the Nth diff on the `ediff-killed-diffs-alist'. REG | |
7424 | 3279 is the region to save. It is redundant here, but is passed anyway, for |
7419 | 3280 convenience." |
7267 | 3281 |
3282 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist)) | |
3283 (this-buf-n-th-diff-saved (assoc buf-type (cdr n-th-diff-saved)))) | |
3284 | |
3285 (if this-buf-n-th-diff-saved | |
3286 ;; either nothing saved for n-th diff and buffer or we OK'ed | |
3287 ;; overriding | |
3288 (setcdr this-buf-n-th-diff-saved reg) | |
3289 (if n-th-diff-saved ;; n-th diff saved, but for another buffer | |
3290 (nconc n-th-diff-saved (list (cons buf-type reg))) | |
3291 (setq ediff-killed-diffs-alist ;; create record for n-th diff | |
3292 (cons (list n (cons buf-type reg)) | |
3293 ediff-killed-diffs-alist)))) | |
7424 | 3294 (message "Saved diff region #%d for buffer %S. To recover hit 'r%s'." |
3295 (1+ n) buf-type | |
3296 (downcase (symbol-name buf-type))))) | |
7267 | 3297 |
3298 (defun ediff-test-save-region (n buf-type) | |
7419 | 3299 "Test if saving Nth difference region of buffer BUF-TYPE is possible." |
7267 | 3300 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist)) |
3301 (this-buf-n-th-diff-saved (assoc buf-type (cdr n-th-diff-saved)))) | |
3302 | |
3303 (if this-buf-n-th-diff-saved | |
3304 (if (yes-or-no-p | |
3305 (format | |
7424 | 3306 "You've previously copied diff region %d to buffer %S. Confirm." |
3307 (1+ n) buf-type)) | |
7267 | 3308 t |
3309 (error "Quit.")) | |
3310 t))) | |
3311 | |
3312 (defun ediff-pop-diff (n buf-type) | |
7419 | 3313 "Pop last killed Nth diff region from buffer BUF-TYPE." |
7267 | 3314 (let* ((n-th-record (assoc n ediff-killed-diffs-alist)) |
3315 (saved-rec (assoc buf-type (cdr n-th-record))) | |
7424 | 3316 (buf (ediff-get-buffer buf-type)) |
7267 | 3317 saved-diff reg-beg reg-end recovered) |
3318 | |
3319 (if (cdr saved-rec) | |
3320 (setq saved-diff (cdr saved-rec)) | |
7424 | 3321 (if (> ediff-number-of-differences 0) |
3322 (error "Nothing saved for diff %d in buffer %S." (1+ n) buf-type) | |
3323 (error "No differences found."))) | |
7267 | 3324 |
3325 (ediff-operate-on-flags 'remove) | |
3326 | |
3327 (setq reg-beg (ediff-get-diff-posn buf-type 'beg n ediff-control-buffer)) | |
3328 (setq reg-end (ediff-get-diff-posn buf-type 'end n ediff-control-buffer)) | |
3329 (setq ediff-disturbed-overlays nil) ;; clear before use | |
3330 | |
3331 (condition-case conds | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3332 (ediff-eval-in-buffer |
7267 | 3333 buf |
3334 (let ((inhibit-read-only (null buffer-read-only)) | |
3335 (before-change-function nil)) | |
3336 (goto-char reg-end) | |
3337 (insert-before-markers saved-diff) | |
3338 | |
3339 (if (ediff-if-lucid) | |
3340 (progn | |
3341 (ediff-collect-extents-lucid reg-beg) | |
3342 (if (> reg-end reg-beg) | |
3343 (progn | |
3344 (kill-region reg-beg reg-end) | |
3345 (if (string= saved-diff "") | |
3346 (ediff-adjust-disturbed-extents-lucid reg-beg))))) | |
3347 (if (> reg-end reg-beg) | |
3348 (kill-region reg-beg reg-end) | |
3349 (ediff-move-disturbed-overlays reg-beg))) | |
3350 | |
3351 (setq recovered t) | |
3352 )) | |
3353 (error (message "%s %s" | |
3354 (car conds) | |
3355 (mapconcat 'prin1-to-string (cdr conds) " ")) | |
3356 (beep 1))) | |
3357 | |
3358 (ediff-operate-on-flags 'insert) | |
3359 (if recovered | |
3360 (progn | |
3361 (setq n-th-record (delq saved-rec n-th-record)) | |
7424 | 3362 (message "Restored diff region %d in buffer %S." (1+ n) buf-type))) |
7267 | 3363 )) |
3364 | |
3365 (defun ediff-restore-diff (arg) | |
7419 | 3366 "Restore ARGth diff from `ediff-killed-diffs-alist'. |
3367 ARG is a prefix argument. If ARG is nil, restore current-difference." | |
7267 | 3368 (interactive "P") |
3369 (if arg | |
3370 (ediff-jump-to-difference arg)) | |
3371 (ediff-pop-diff ediff-current-difference | |
7424 | 3372 (ediff-char-to-buftype last-command-char)) |
7267 | 3373 (ediff-recenter 'no-rehighlight)) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3374 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3375 (defun ediff-toggle-regexp-match () |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3376 "Toggle focus on difference regions that match a regexp or hide those diffs." |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3377 (interactive) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3378 (let (regexp-A regexp-B) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3379 (cond |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3380 ((or (and (eq ediff-skip-diff-region-function 'ediff-focus-on-regexp-matches) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3381 (eq last-command-char ?f)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3382 (and (eq ediff-skip-diff-region-function 'ediff-hide-regexp-matches) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3383 (eq last-command-char ?h))) |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3384 (message "Selective browsing by regexp turned off.") |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3385 (setq ediff-skip-diff-region-function 'ediff-show-all-diffs)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3386 ((eq last-command-char ?h) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3387 (setq ediff-skip-diff-region-function 'ediff-hide-regexp-matches |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3388 regexp-A |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3389 (read-string |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3390 (format |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3391 "Ignore A-regions matching this regexp (default \"%s\"): " |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3392 (regexp-quote ediff-regexp-hide-A))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3393 regexp-B |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3394 (read-string |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3395 (format |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3396 "Ignore B-regions matching this regexp (default \"%s\"): " |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3397 (regexp-quote ediff-regexp-hide-B)))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3398 (message "Hide difference regions matching regexp.") |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3399 (or (string= regexp-A "") (setq ediff-regexp-hide-A regexp-A)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3400 (or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3401 ((eq last-command-char ?f) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3402 (setq ediff-skip-diff-region-function 'ediff-focus-on-regexp-matches |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3403 regexp-A |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3404 (read-string |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3405 (format |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3406 "Focus on A-regions matching this regexp (default \"%s\"): " |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3407 (regexp-quote ediff-regexp-focus-A))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3408 regexp-B |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3409 (read-string |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3410 (format |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3411 "Focus on B-regions matching this regexp (default \"%s\"): " |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3412 (regexp-quote ediff-regexp-focus-B)))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3413 (message "Focus on difference regions matching regexp.") |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3414 (or (string= regexp-A "") (setq ediff-regexp-focus-A regexp-A)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3415 (or (string= regexp-B "") (setq ediff-regexp-focus-B regexp-B)))))) |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3416 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3417 (defun ediff-toggle-skip-similar () |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3418 (interactive) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3419 (setq ediff-ignore-similar-regions (not ediff-ignore-similar-regions)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3420 (if ediff-ignore-similar-regions |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3421 (message "Skipping over regions that differ only in white space & line breaks.") |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3422 (message "Skipping over white-space differences turned off."))) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3423 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3424 (defun ediff-show-all-diffs (n) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3425 "Don't skip difference regions." |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3426 nil) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3427 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3428 (defun ediff-focus-on-regexp-matches (n) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3429 "Focus on diffs that match regexp `ediff-regexp-focus-A/B'. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3430 Regions to be ignored according to this function are those where |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3431 buf A region doesn't match `ediff-regexp-focus-A' and buf B region |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3432 doesn't match `ediff-regexp-focus-B'. |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3433 This function returns nil if the region number N (specified as |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3434 an argument) is not to be ignored and t if region N is to be ignored. |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3435 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3436 N is a region number used by Ediff internally. It is 1 less |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3437 the number seen by the user." |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3438 (if (and (>= n 0) (< n ediff-number-of-differences)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3439 (let* ((ctl-buf ediff-control-buffer) |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3440 (regex-A ediff-regexp-focus-A) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3441 (regex-B ediff-regexp-focus-B) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3442 (reg-A-match (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3443 ediff-A-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3444 (goto-char (ediff-get-diff-posn 'A 'beg n ctl-buf)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3445 (re-search-forward |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3446 regex-A |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3447 (ediff-get-diff-posn 'A 'end n ctl-buf) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3448 t))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3449 (reg-B-match (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3450 ediff-B-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3451 (goto-char (ediff-get-diff-posn 'B 'beg n ctl-buf)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3452 (re-search-forward |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3453 regex-B |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3454 (ediff-get-diff-posn 'B 'end n ctl-buf) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3455 t)))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3456 (not (and reg-A-match reg-B-match))))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3457 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3458 (defun ediff-hide-regexp-matches (n) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3459 "Hide diffs that match regexp `ediff-regexp-hide-A/B'. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3460 Regions to be ignored are those where buf A region matches |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3461 `ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'. |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3462 This function returns nil if the region number N (specified as |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3463 an argument) is not to be ignored and t if region N is to be ignored. |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3464 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3465 N is a region number used by Ediff internally. It is 1 less |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3466 the number seen by the user." |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3467 (if (and (>= n 0) (< n ediff-number-of-differences)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3468 (let* ((ctl-buf ediff-control-buffer) |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3469 (regex-A ediff-regexp-hide-A) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3470 (regex-B ediff-regexp-hide-B) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3471 (reg-A-match (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3472 ediff-A-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3473 (goto-char (ediff-get-diff-posn 'A 'beg n ctl-buf)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3474 (re-search-forward |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3475 regex-A |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3476 (ediff-get-diff-posn 'A 'end n ctl-buf) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3477 t))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3478 (reg-B-match (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3479 ediff-B-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3480 (goto-char (ediff-get-diff-posn 'B 'beg n ctl-buf)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3481 (re-search-forward |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3482 regex-B |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3483 (ediff-get-diff-posn 'B 'end n ctl-buf) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3484 t)))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3485 (and reg-A-match reg-B-match)))) |
7267 | 3486 |
3487 | |
3488 ;;; Quitting, suspending, etc. | |
3489 (defun ediff-quit () | |
3490 "Finish an Ediff session and exit Ediff. | |
3491 Unselects the selected difference, if any, restores the read-only and modified | |
3492 flags of the compared file buffers, kills Ediff buffers for this session | |
3493 \(but not file-A and file-B\)." | |
3494 (interactive) | |
3495 (if (prog1 | |
3496 (y-or-n-p "Do you really want to exit Ediff? ") | |
3497 (message "")) | |
3498 (ediff-really-quit))) | |
3499 | |
7424 | 3500 |
7267 | 3501 ;; Perform the quit operations. |
3502 (defun ediff-really-quit () | |
3503 (setq ediff-help-message ediff-help-message-long) | |
3504 (ediff-restore-buffer-characteristics t) ;; restore as they were at setup | |
3505 (ediff-unhighlight-diffs-totally) | |
7424 | 3506 (ediff-clear-diff-vector ediff-difference-vector 'fine-diffs-also) |
3507 (if ediff-temp-file-A (delete-file ediff-temp-file-A)) | |
3508 (if ediff-temp-file-B (delete-file ediff-temp-file-B)) | |
7267 | 3509 |
3510 ;; restore buffer mode line id's in buffer-A/B | |
3511 (let ((control-buffer ediff-control-buffer)) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3512 (condition-case nil |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3513 (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3514 ediff-A-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3515 (setq before-change-function nil) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3516 (setq ediff-this-buffer-control-sessions |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3517 (delq control-buffer ediff-this-buffer-control-sessions)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3518 (if (null ediff-this-buffer-control-sessions) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3519 (setq local-write-file-hooks |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3520 (delq 'ediff-block-write-file local-write-file-hooks))) |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3521 (kill-local-variable 'ediff-local-checkout-flag) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3522 (kill-local-variable 'mode-line-buffer-identification)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3523 (error)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3524 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3525 (condition-case nil |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3526 (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3527 ediff-B-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3528 (setq ediff-this-buffer-control-sessions |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3529 (delq control-buffer ediff-this-buffer-control-sessions)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3530 (if (null ediff-this-buffer-control-sessions) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3531 (setq local-write-file-hooks |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3532 (delq 'ediff-block-write-file local-write-file-hooks))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3533 (setq before-change-function nil) |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3534 (kill-local-variable 'ediff-local-checkout-flag) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3535 (kill-local-variable 'mode-line-buffer-identification)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3536 (error))) |
7267 | 3537 |
3538 (run-hooks 'ediff-quit-hooks)) | |
3539 | |
3540 (defun ediff-kill-buffer-carefully (buf) | |
3541 "Kill buffer BUF if it exists." | |
3542 (if (ediff-buffer-live-p buf) | |
3543 (kill-buffer (get-buffer buf)))) | |
3544 | |
3545 ;; The default way of quitting Ediff. | |
3546 ;; Kills control buffers and leaves the | |
3547 ;; frame split between the two diff'ed files. | |
3548 (defun ediff-default-quit-hook () | |
3549 (let ((buff-A ediff-A-buffer) | |
3550 (buff-B ediff-B-buffer)) | |
3551 (ediff-kill-buffer-carefully ediff-diff-buffer) | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3552 (ediff-kill-buffer-carefully ediff-fine-diff-buffer) |
7424 | 3553 (ediff-kill-buffer-carefully ediff-tmp-buffer) |
3554 (ediff-kill-buffer-carefully ediff-error-buffer) | |
7267 | 3555 (ediff-kill-buffer-carefully ediff-control-buffer) |
3556 (ediff-kill-buffer-carefully ediff-patch-diagnostics) | |
3557 (delete-other-windows) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3558 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3559 ;; display only if not visible |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3560 (condition-case nil |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3561 (or (ediff-get-visible-buffer-window buff-B) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3562 (switch-to-buffer buff-B)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3563 (error)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3564 (condition-case nil |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3565 (or (ediff-get-visible-buffer-window buff-A) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3566 (progn |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3567 (if (ediff-get-visible-buffer-window buff-B) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3568 (split-window-vertically)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3569 (switch-to-buffer buff-A))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3570 (error)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3571 (message "") |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3572 )) |
7267 | 3573 |
3574 ;; The default way of suspending Ediff. | |
3575 ;; Buries Ediff buffers, kills all windows. | |
3576 (defun ediff-default-suspend-hook () | |
3577 (let ((buf-A ediff-A-buffer) | |
3578 (buf-B ediff-B-buffer) | |
3579 (buf-patch ediff-patch-buf) | |
3580 (buf-patch-diag ediff-patch-diagnostics) | |
7424 | 3581 (buf-err ediff-error-buffer) |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3582 (buf-diff ediff-diff-buffer) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3583 (buf-fine-diff ediff-fine-diff-buffer)) |
7267 | 3584 (bury-buffer) ;; ediff-control-buffer |
3585 (delete-other-windows) | |
3586 (bury-buffer buf-err) | |
3587 (bury-buffer buf-diff) | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3588 (bury-buffer buf-fine-diff) |
7267 | 3589 (bury-buffer buf-patch) |
3590 (bury-buffer buf-patch-diag) | |
3591 (bury-buffer buf-A) | |
3592 (bury-buffer buf-B))) | |
3593 | |
3594 | |
3595 (defun ediff-suspend () | |
7419 | 3596 "Suspend Ediff. |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3597 To resume, switch to the appropriate `Ediff Control Panel' |
7419 | 3598 buffer and then type \\[ediff-recenter]. Ediff will automatically set |
7267 | 3599 up an appropriate window config." |
3600 (interactive) | |
7424 | 3601 (let ((key (substitute-command-keys "\\[ediff-recenter]"))) |
7267 | 3602 (run-hooks 'ediff-suspend-hooks) |
3603 (message | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3604 "To resume Ediff, switch to Ediff Control Panel and hit '%S'" key))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3605 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3606 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3607 (defun ediff-status-info () |
7267 | 3608 "Show the names of the buffers or files being operated on by Ediff. |
7419 | 3609 Hit \\[ediff-recenter] to reset the windows afterward." |
7267 | 3610 (interactive) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3611 (with-output-to-temp-buffer " *ediff-info*" |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3612 (princ (ediff-version)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3613 (princ "\n\n") |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3614 (ediff-eval-in-buffer ediff-A-buffer |
7267 | 3615 (if buffer-file-name |
7424 | 3616 (princ |
3617 (format "File A is: %s\n" buffer-file-name)) | |
3618 (princ | |
3619 (format "Buffer A is: %s\n" (buffer-name))))) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3620 (ediff-eval-in-buffer ediff-B-buffer |
7267 | 3621 (if buffer-file-name |
7424 | 3622 (princ |
3623 (format "File B is: %s\n" buffer-file-name)) | |
3624 (princ | |
3625 (format "Buffer B is: %s\n" (buffer-name))))) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3626 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3627 (let* ((A-line (ediff-eval-in-buffer ediff-A-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3628 (count-lines (point-min) (point)))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3629 (B-line (ediff-eval-in-buffer ediff-B-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3630 (count-lines (point-min) (point))))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3631 (princ (format "\nPoint position in buffer A = %d\n" A-line)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3632 (princ (format "Point position in buffer B = %d\n" B-line))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3633 |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3634 (princ (format "\nCurrent difference number = %S\n" |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3635 (cond ((< ediff-current-difference 0) 'start) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3636 ((>= ediff-current-difference |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3637 ediff-number-of-differences) 'end) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3638 (t (1+ ediff-current-difference))))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3639 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3640 (cond (ediff-ignore-similar-regions |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3641 (princ "\nSkipping over regions that differ only in white space & line breaks.")) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3642 (t |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3643 (princ "\nNo skipping over regions that differ in white space & line breaks."))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3644 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3645 (cond ((eq ediff-skip-diff-region-function 'ediff-show-all-diffs) |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3646 (princ "\nSelective browsing by regexp is off.\n")) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3647 ((eq ediff-skip-diff-region-function 'ediff-hide-regexp-matches) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3648 (princ |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3649 "\nIgnoring regions that match") |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3650 (princ |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3651 (format "\n\t regexp `%s' in buffer A and\n\t regexp `%s' in buffer B\n" |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3652 ediff-regexp-hide-A ediff-regexp-hide-B))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3653 ((eq ediff-skip-diff-region-function 'ediff-focus-on-regexp-matches) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3654 (princ |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3655 "\nFocusing on regions that match") |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3656 (princ |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3657 (format "\n\t regexp `%s' in buffer A and\n\t regexp `%s' in buffer B\n" |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3658 ediff-regexp-focus-A ediff-regexp-focus-B))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3659 (t (princ "\nSelective browsing via a user-defined method.\n"))) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3660 |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
3661 (princ "\nBugs: M-x ediff-submit-report") |
7267 | 3662 )) |
3663 | |
3664 | |
3665 | |
3666 ;;; Support routines | |
3667 | |
3668 ;; Select a difference by placing the ASCII flags around the appropriate | |
3669 ;; group of lines in the A, B buffers | |
3670 (defun ediff-select-difference (n) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3671 (if (and (ediff-buffer-live-p ediff-A-buffer) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3672 (ediff-buffer-live-p ediff-B-buffer) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3673 (>= n 0) (< n ediff-number-of-differences)) |
7267 | 3674 (progn |
3675 (ediff-remember-buffer-characteristics) | |
3676 (if (and window-system ediff-want-faces) | |
3677 (progn | |
3678 (ediff-highlight-diff n) | |
3679 (setq ediff-highlighting-style 'face)) | |
3680 (setq ediff-highlighting-style 'ascii) | |
3681 (ediff-place-flags-in-buffer 'A ediff-A-buffer | |
3682 ediff-control-buffer n) | |
3683 (ediff-place-flags-in-buffer 'B ediff-B-buffer | |
3684 ediff-control-buffer n)) | |
3685 | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3686 (cond ((eq ediff-auto-refine 'on) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3687 (if (and |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3688 (> ediff-auto-refine-limit |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3689 (- (ediff-get-diff-posn 'A 'end n) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3690 (ediff-get-diff-posn 'A 'beg n))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3691 (> ediff-auto-refine-limit |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3692 (- (ediff-get-diff-posn 'B 'end n) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3693 (ediff-get-diff-posn 'B 'beg n)))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3694 (ediff-make-fine-diffs n 'noforce) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3695 (ediff-make-fine-diffs n 'skip))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3696 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3697 ((eq ediff-auto-refine 'off) ; highlight iff fine diffs |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3698 (ediff-make-fine-diffs n 'skip))) ; already exist |
7424 | 3699 |
7267 | 3700 (ediff-restore-buffer-characteristics) |
3701 (run-hooks 'ediff-select-hooks)))) | |
3702 | |
3703 | |
3704 ;; Unselect a difference by removing the ASCII flags in the buffers. | |
3705 (defun ediff-unselect-difference (n) | |
3706 (if (and (>= n 0) (< n ediff-number-of-differences)) | |
3707 (progn | |
3708 (ediff-remember-buffer-characteristics) | |
3709 | |
3710 (cond ((and window-system ediff-want-faces) | |
3711 (ediff-unhighlight-diff)) | |
3712 ((eq ediff-highlighting-style 'ascii) | |
3713 (ediff-remove-flags-from-buffer | |
3714 ediff-A-buffer | |
3715 (ediff-get-diff-posn 'A 'beg n) | |
3716 (ediff-get-diff-posn 'A 'end n) | |
3717 ediff-before-flag-A ediff-after-flag-A) | |
3718 (ediff-remove-flags-from-buffer | |
3719 ediff-B-buffer | |
3720 (ediff-get-diff-posn 'B 'beg n) | |
3721 (ediff-get-diff-posn 'B 'end n) | |
3722 ediff-before-flag-B ediff-after-flag-B))) | |
3723 | |
3724 (ediff-restore-buffer-characteristics) | |
3725 (setq ediff-highlighting-style nil) | |
7424 | 3726 |
3727 ;; unhighlight fine diffs | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
3728 (ediff-set-fine-diff-properties ediff-current-difference 'default) |
7424 | 3729 |
7267 | 3730 (run-hooks 'ediff-unselect-hooks)))) |
3731 | |
3732 | |
3733 ;; Unselects prev diff and selects a new one, if FLAG has value other than | |
3734 ;; 'select-only or 'unselect-only. If FLAG is 'select-only, the | |
3735 ;; next difference is selected, but the current selection is not | |
3736 ;; unselected. If FLAG is 'unselect-only then the current selection is | |
3737 ;; unselected, but the next one is not selected. If NO-RECENTER is non-nil, | |
3738 ;; don't recenter buffers after selecting/unselecting. | |
3739 ;; | |
7419 | 3740 ;; Don't use `ediff-select-difference' and `ediff-unselect-difference' |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3741 ;; directly, since this will screw up the undo info in the presence of |
7267 | 3742 ;; ASCII flags. |
7419 | 3743 ;; Instead, use `ediff-unselect-and-select-difference' with appropriate |
7267 | 3744 ;; flags. |
3745 | |
3746 (defun ediff-unselect-and-select-difference (n &optional flag no-recenter) | |
7424 | 3747 (let (;; save buf modified info |
3748 (control-buf ediff-control-buffer) | |
7267 | 3749 (buf-A-modified (buffer-modified-p ediff-A-buffer)) |
3750 (buf-B-modified (buffer-modified-p ediff-B-buffer)) | |
3751 ;; temporarily disable undo so highlighting won't confuse the user | |
3752 buf-A-undo buf-B-undo) | |
3753 | |
7424 | 3754 (let ((ediff-current-difference n)) |
3755 (or no-recenter | |
3756 (ediff-recenter 'no-rehighlight))) | |
3757 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3758 (if (and (ediff-buffer-live-p ediff-A-buffer) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3759 (ediff-buffer-live-p ediff-B-buffer)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3760 (progn |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3761 (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3762 ediff-A-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3763 (setq buf-A-undo buffer-undo-list)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3764 (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3765 ediff-B-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3766 (setq buf-B-undo buffer-undo-list)) |
7424 | 3767 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3768 (buffer-disable-undo ediff-A-buffer) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3769 (buffer-disable-undo ediff-B-buffer))) |
7424 | 3770 |
3771 (unwind-protect ;; we don't want to lose undo info due to error | |
3772 (progn | |
3773 (or (eq flag 'select-only) | |
3774 (ediff-unselect-difference ediff-current-difference)) | |
3775 | |
3776 ;; Auto-save buffers while Ediff flags are temporarily removed. | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3777 (ediff-eval-in-buffer |
7424 | 3778 ediff-A-buffer |
3779 (if buf-A-modified | |
3780 (do-auto-save))) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3781 (ediff-eval-in-buffer |
7424 | 3782 ediff-B-buffer |
3783 (if buf-B-modified | |
3784 (do-auto-save))) | |
3785 | |
3786 (or (eq flag 'unselect-only) | |
3787 (ediff-select-difference n)) | |
3788 (setq ediff-current-difference n) | |
3789 ) ;; end protected section | |
3790 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3791 (ediff-eval-in-buffer |
7424 | 3792 control-buf |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3793 (ediff-refresh-mode-line) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3794 ;; restore undo and buffer-modified info |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3795 (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3796 ediff-A-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3797 (set-buffer-modified-p buf-A-modified) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3798 (setq buffer-undo-list buf-A-undo))) |
7424 | 3799 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3800 (ediff-eval-in-buffer |
7424 | 3801 control-buf |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3802 (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3803 ediff-B-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3804 (set-buffer-modified-p buf-B-modified) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3805 (setq buffer-undo-list buf-B-undo))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3806 ))) |
7267 | 3807 |
3808 ;; Revise the mode line to display which difference we have selected | |
3809 | |
3810 (defun ediff-refresh-mode-line () | |
3811 (setq mode-line-buffer-identification | |
7424 | 3812 (cond ((< ediff-current-difference 0) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3813 (list (format "%%b: At start of %d diffs" |
7424 | 3814 ediff-number-of-differences))) |
3815 ((>= ediff-current-difference ediff-number-of-differences) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3816 (list (format "%%b: At end of %d diffs" |
7424 | 3817 ediff-number-of-differences))) |
3818 (t | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3819 (list (format "%%b: diff %d of %d" |
7424 | 3820 (1+ ediff-current-difference) |
3821 ediff-number-of-differences))))) | |
7267 | 3822 ;; Force mode-line redisplay |
8348
bf950cbd542c
Made menu bar's autoloaded stuff conditional on
Richard M. Stallman <rms@gnu.org>
parents:
8303
diff
changeset
|
3823 (force-mode-line-update)) |
7267 | 3824 |
3825 | |
3826 | |
3827 ;; Verify that we have a difference selected. | |
3828 (defun ediff-validate-difference () | |
3829 (if (not (and (>= ediff-current-difference 0) | |
3830 (< ediff-current-difference ediff-number-of-differences))) | |
3831 (error "No difference selected"))) | |
3832 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3833 (defun ediff-read-file-name (prompt default-dir default-file) |
7419 | 3834 ; This is a modified version of a similar function in `emerge.el'. |
7267 | 3835 ; PROMPT should not have trailing ': ', so that it can be modified |
3836 ; according to context. | |
3837 ; If default-file is set, it should be used as the default value. | |
3838 ; If default-dir is non-nil, use it as the default directory. | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3839 ; Otherwise, use the value of Emacs' variable `default-directory.' |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3840 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3841 ;; hack default-dir if it is not set |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3842 (setq default-dir |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3843 (file-name-as-directory |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3844 (abbreviate-file-name |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3845 (expand-file-name (or default-dir |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3846 (and default-file |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3847 (file-name-directory default-file)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3848 default-directory))))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3849 |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3850 ;; strip the directory from default-file |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3851 (if default-file |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3852 (setq default-file (file-name-nondirectory default-file))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3853 |
7424 | 3854 (let (f) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3855 (setq f (expand-file-name |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3856 (read-file-name |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3857 (format "%s%s: " |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3858 prompt |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3859 (if default-file |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3860 (concat " (default " default-file ")") |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3861 "")) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3862 default-dir |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3863 default-file |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3864 'confirm |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3865 default-file |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3866 ) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3867 default-dir |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3868 )) |
7424 | 3869 ;; If user enters a directory name, expand the default file in that |
3870 ;; directory. This allows the user to enter a directory name for the | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3871 ;; B-file and diff against the default-file in that directory instead |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3872 ;; of a DIRED listing! |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3873 (if (and (file-directory-p f) default-file) |
7424 | 3874 (setq f (expand-file-name |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3875 (file-name-nondirectory default-file) f))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3876 f)) |
7267 | 3877 |
7424 | 3878 ;; If `prefix' is given, then it is used as a prefix for the temp file |
3879 ;; name. Otherwise, `.buffer-name' is used. If `file' is given, use this | |
3880 ;; file and don't create a new one. | |
3881 (defun ediff-make-temp-file (&optional prefix given-file) | |
3882 (let ((f (or given-file | |
3883 (make-temp-name (concat | |
3884 ediff-temp-file-prefix | |
3885 (or prefix | |
3886 (format | |
3887 ".%s" | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3888 "buf"))))))) |
7267 | 3889 ;; create the file |
7424 | 3890 (write-region (point-min) (point-max) f nil 'no-message) |
7267 | 3891 (set-file-modes f ediff-temp-file-mode) |
3892 f)) | |
7424 | 3893 |
3894 ;; Quote metacharacters (using \) when executing diff in Unix, but not in | |
3895 ;; EMX OS/2 | |
3896 (defun ediff-protect-metachars (str) | |
3897 (or (eq system-type 'emx) | |
3898 (let ((limit 0)) | |
3899 (while (string-match emerge-metachars str limit) | |
3900 (setq str (concat (substring str 0 (match-beginning 0)) | |
3901 "\\" | |
3902 (substring str (match-beginning 0)))) | |
3903 (setq limit (1+ (match-end 0)))))) | |
3904 str) | |
3905 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3906 ;; Make sure the current buffer (for a file) has the same contents as the |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3907 ;; file on disk, and attempt to remedy the situation if not. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3908 ;; Signal an error if we can't make them the same, or the user doesn't want |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3909 ;; to do what is necessary to make them the same. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3910 ;; If file has file handlers (indicated by the optional arg), then we |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3911 ;; offer to instead of saving. This is one difference with Emerge. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3912 ;; Another is that we always offer to revert obsolete files, whether they |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3913 ;; are modified or not. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3914 (defun ediff-verify-file-buffer (&optional file-magic) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3915 ;; First check if the file has been modified since the buffer visited it. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3916 (if (verify-visited-file-modtime (current-buffer)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3917 (if (buffer-modified-p) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3918 ;; If buffer is not obsolete and is modified, offer to save |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3919 (if (yes-or-no-p |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3920 (format "Buffer out of sync with visited file. %s file %s? " |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3921 (if file-magic "Revert" "Save") |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3922 buffer-file-name)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3923 (if (not file-magic) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3924 (save-buffer) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3925 ;; for some reason, file-name-handlers append instead of |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3926 ;; replacing, so we have to erase first. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3927 (erase-buffer) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3928 (revert-buffer t t)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3929 (error "Buffer out of sync for file %s" buffer-file-name)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3930 ;; If buffer is not obsolete and is not modified, do nothing |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3931 nil) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3932 ;; If buffer is obsolete, offer to revert |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3933 (if (yes-or-no-p |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3934 (format "Buffer out of sync with visited file. Revert file %s? " |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3935 buffer-file-name)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3936 (progn |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3937 (if file-magic |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3938 (erase-buffer)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3939 (revert-buffer t t)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3940 (error "Buffer out of sync for file %s" buffer-file-name)))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3941 |
7424 | 3942 |
7267 | 3943 (defun ediff-block-write-file () |
3944 "Prevent writing files A and B directly." | |
3945 (if (ediff-check-for-ascii-flags) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3946 (error "Type 'wa' and 'wb' in Ediff Control Panel to save buffs A/B."))) |
7267 | 3947 |
3948 (defun ediff-check-for-ascii-flags () | |
3949 (eval | |
3950 (cons 'or | |
3951 (mapcar (function (lambda (buf) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3952 (if (ediff-buffer-live-p buf) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3953 (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3954 buf |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
3955 (eq ediff-highlighting-style 'ascii))))) |
7267 | 3956 ediff-this-buffer-control-sessions)))) |
3957 | |
3958 (defun ediff-insert-in-front (overl beg end) | |
3959 "Capture overlays that had insertions in the front. | |
3960 Called when overlay OVERL gets insertion in front." | |
3961 (if (ediff-overlay-get overl 'ediff-diff-num) | |
3962 (setq ediff-disturbed-overlays | |
3963 (cons overl ediff-disturbed-overlays))) | |
3964 ) | |
3965 | |
3966 (defun ediff-collect-extents-lucid (pos) | |
3967 "Collects all extents at POS having property `ediff-diff-num'. | |
3968 Lucid Emacs causes headache by detaching empty extents, so I have to save | |
3969 them before they disappear." | |
3970 (let (lis elt) | |
3971 (while (setq elt (extent-at pos nil 'ediff-diff-num elt)) | |
3972 (setq lis (cons elt lis))) | |
3973 (setq ediff-disturbed-overlays lis))) | |
3974 | |
3975 (defun ediff-move-disturbed-overlays (posn) | |
3976 (mapcar (function (lambda (overl) | |
3977 (ediff-move-overlay overl | |
3978 posn | |
3979 (ediff-overlay-end overl)) | |
3980 )) | |
3981 ediff-disturbed-overlays) | |
3982 (setq ediff-disturbed-overlays nil)) | |
3983 | |
3984 (defun ediff-adjust-disturbed-extents-lucid (posn &optional posn-type) | |
3985 ;; POSN-TYPE tells if POSN should become a new start of the extents | |
3986 ;; (if 'new-start) or a new end (if 'new-end). If POSN-TYPE is nil, then | |
3987 ;; POSN is both the new start and the new end. | |
3988 (mapcar (function (lambda (overl) | |
3989 (cond ((and (null posn-type) | |
3990 (equal (ediff-overlay-start overl) | |
3991 (ediff-overlay-end overl))) | |
3992 (ediff-move-overlay overl posn posn)) | |
3993 | |
3994 (posn-type | |
3995 (ediff-move-overlay | |
3996 overl | |
3997 (if (eq posn-type 'new-start) | |
3998 posn | |
3999 (ediff-overlay-start overl)) | |
4000 (if (eq posn-type 'new-end) | |
4001 posn | |
4002 (ediff-overlay-end overl))))))) | |
4003 ediff-disturbed-overlays) | |
4004 (setq ediff-disturbed-overlays nil)) | |
4005 | |
4006 (defun ediff-save-buffer () | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4007 "Safe way of saving buffers A, B, and the diff output. |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4008 `wa' saves buffer A, `wb' saves buffer B, and `wf' saves the diff output." |
7267 | 4009 (interactive) |
4010 (let ((hooks local-write-file-hooks)) | |
4011 (ediff-unselect-and-select-difference ediff-current-difference | |
4012 'unselect-only) | |
4013 (unwind-protect | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4014 (ediff-eval-in-buffer |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4015 (cond ((eq last-command-char ?a) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4016 ediff-A-buffer) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4017 ((eq last-command-char ?b) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4018 ediff-B-buffer) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4019 ((eq last-command-char ?f) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4020 (message "Saving diff output ...")(sit-for 1) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4021 ediff-diff-buffer)) |
7267 | 4022 ;; temporarily remove writing block |
4023 (setq hooks (delq 'ediff-block-write-file hooks)) | |
4024 (let ((local-write-file-hooks hooks)) | |
4025 (save-buffer))) | |
4026 (ediff-unselect-and-select-difference ediff-current-difference | |
4027 'select-only) | |
4028 ))) | |
4029 | |
4030 | |
4031 | |
7419 | 4032 ;; Essentially `emerge-remove-flags-in-buffer', modified to allow deletion |
4033 ;; of read-only flags. | |
7267 | 4034 (defun ediff-remove-flags-from-buffer (buffer before-posn after-posn |
4035 before-flag after-flag) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4036 (ediff-eval-in-buffer |
7267 | 4037 buffer |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4038 (let ((before-flag-length (length before-flag)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4039 (after-flag-length (length after-flag)) |
7267 | 4040 (inhibit-read-only t) |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4041 buffer-read-only |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4042 before-change-function) |
7267 | 4043 (goto-char after-posn) |
4044 (setq after-posn (point-marker)) ;; after-posn is now a marker | |
4045 ;; remove the flags, if they're there | |
4046 (goto-char (- before-posn before-flag-length)) | |
4047 (if (ediff-if-lucid) | |
4048 (ediff-collect-extents-lucid (+ (point) before-flag-length))) | |
4049 (if (looking-at (regexp-quote before-flag)) | |
4050 (delete-region (point) (+ (point) before-flag-length)) | |
4051 ;; the flag isn't there | |
4052 (ding) | |
4053 (message "Trouble removing ASCII flag")) | |
4054 (if (ediff-if-lucid) | |
4055 (ediff-adjust-disturbed-extents-lucid (point))) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4056 |
7267 | 4057 (if (ediff-if-lucid) |
4058 (ediff-collect-extents-lucid (point))) | |
4059 (goto-char after-posn) | |
4060 (if (looking-at (regexp-quote after-flag)) | |
4061 (delete-region (point) (+ (point) after-flag-length)) | |
4062 ;; the flag isn't there | |
4063 (ding) | |
4064 (message "Trouble removing ASCII flag")) | |
4065 (if (ediff-if-lucid) | |
4066 (ediff-adjust-disturbed-extents-lucid (point))) | |
4067 (setq after-posn nil) ;; after has become a marker--garbage-collect | |
4068 ))) | |
4069 | |
4070 | |
7419 | 4071 ;; This is a modified `emerge-place-flags-in-buffer'. |
7267 | 4072 (defun ediff-place-flags-in-buffer (buf-type buffer ctl-buffer difference) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4073 (ediff-eval-in-buffer |
7267 | 4074 buffer |
4075 (ediff-place-flags-in-buffer1 buf-type ctl-buffer difference))) | |
4076 | |
7419 | 4077 ;; Modified `emerge-place-flags-in-buffer1'. |
7267 | 4078 (defun ediff-place-flags-in-buffer1 (buf-type ctl-buffer difference) |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4079 (let ((before-flag-name (if (eq buf-type 'A) |
7267 | 4080 'ediff-before-flag-A |
4081 'ediff-before-flag-B)) | |
4082 (after-flag-name (if (eq buf-type 'A) | |
4083 'ediff-after-flag-A | |
4084 'ediff-after-flag-B)) | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4085 (inhibit-read-only t) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4086 buffer-read-only before-change-function beg-of-line flag) |
7267 | 4087 |
4088 ;; insert the flag before the difference | |
4089 (let ((before (ediff-get-diff-posn buf-type 'beg difference ctl-buffer))) | |
4090 (goto-char before) | |
4091 (setq beg-of-line (bolp)) | |
4092 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4093 (setq flag (ediff-eval-in-buffer |
7267 | 4094 ctl-buffer |
4095 (if beg-of-line | |
4096 (set before-flag-name ediff-before-flag-bol) | |
4097 (set before-flag-name ediff-before-flag-mol)))) | |
4098 | |
4099 ;; insert the flag itself | |
4100 (if (ediff-if-lucid) | |
4101 (ediff-collect-extents-lucid (point))) | |
4102 (insert-before-markers flag) | |
4103 (if (ediff-if-lucid) | |
4104 ;; Lucid's extent end-points behave strangely; they won't | |
4105 ;; respect insert-before-markers | |
4106 (ediff-adjust-disturbed-extents-lucid (point) 'new-start)) | |
4107 ) | |
4108 ;; insert the flag after the difference | |
4109 (let* ((after (ediff-get-diff-posn buf-type 'end difference ctl-buffer))) | |
4110 (goto-char after) | |
4111 (setq beg-of-line (bolp)) | |
4112 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4113 (setq flag (ediff-eval-in-buffer |
7267 | 4114 ctl-buffer |
4115 (if beg-of-line | |
4116 (set after-flag-name ediff-after-flag-bol) | |
4117 (set after-flag-name ediff-after-flag-mol)))) | |
4118 | |
4119 ;; insert the flag itself | |
4120 (if (ediff-if-lucid) | |
4121 (ediff-collect-extents-lucid (point))) | |
4122 (insert flag) | |
4123 (if (ediff-if-lucid) | |
4124 (ediff-adjust-disturbed-extents-lucid after 'new-end)) | |
4125 ))) | |
4126 | |
4127 | |
4128 (defun ediff-get-diff-posn (buf-type pos &optional n control-buf) | |
7419 | 4129 "Returns positions of difference sectors in the BUF-TYPE buffer. |
4130 BUF-TYPE should be a symbol--either `A' or `B'. | |
4131 POS is either `beg' or `end'--it specifies whether you want the position at the | |
7424 | 4132 beginning of a difference or at the end. |
7267 | 4133 |
7419 | 4134 The optional argument N says which difference \(default: |
4135 `ediff-current-difference'\). The optional argument CONTROL-BUF says | |
4136 which control buffer is in effect in case it is not the current | |
4137 buffer." | |
7267 | 4138 (let (diff-overlay) |
4139 (or control-buf | |
4140 (setq control-buf (current-buffer))) | |
4141 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4142 (ediff-eval-in-buffer |
7267 | 4143 control-buf |
4144 (or n (setq n ediff-current-difference)) | |
4145 (if (or (< n 0) (>= n ediff-number-of-differences)) | |
7424 | 4146 (if (> ediff-number-of-differences 0) |
4147 (error "There is no diff %d. Valid diffs are 1 to %d." | |
4148 (1+ n) ediff-number-of-differences) | |
4149 (error "No differences found."))) | |
4150 (setq diff-overlay (ediff-get-diff-overlay n buf-type))) | |
4151 | |
7267 | 4152 (if (ediff-overlay-get diff-overlay 'detached) |
4153 (ediff-move-overlay diff-overlay | |
4154 (ediff-overlay-get diff-overlay 'ediff-marker) | |
4155 (ediff-overlay-get diff-overlay 'ediff-marker))) | |
4156 (if (eq pos 'beg) | |
4157 (ediff-overlay-start diff-overlay) | |
4158 (ediff-overlay-end diff-overlay)) | |
4159 )) | |
4160 | |
4161 | |
4162 | |
4163 ;; These would highlight differences under X | |
4164 (defun ediff-highlight-diff (n) | |
4165 "Put face on diff N. Invoked for X displays only." | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4166 (let* ((last-A (ediff-eval-in-buffer ediff-A-buffer (point-max))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4167 (last-B (ediff-eval-in-buffer ediff-B-buffer (point-max))) |
7267 | 4168 (begin-A (ediff-get-diff-posn 'A 'beg n)) |
4169 (end-A (ediff-get-diff-posn 'A 'end n)) | |
4170 (xtraA (if (equal begin-A end-A) 1 0)) | |
4171 (end-A-hilit (min last-A (+ end-A xtraA))) | |
4172 | |
4173 (begin-B (ediff-get-diff-posn 'B 'beg n)) | |
4174 (end-B (ediff-get-diff-posn 'B 'end n)) | |
4175 (xtraB (if (equal begin-B end-B) 1 0)) | |
4176 (end-B-hilit (min last-B (+ end-B xtraB)))) | |
4177 | |
4178 (if (ediff-if-lucid) | |
4179 (progn | |
4180 (ediff-move-overlay | |
4181 ediff-current-diff-overlay-A begin-A end-A-hilit) | |
4182 (ediff-move-overlay | |
4183 ediff-current-diff-overlay-B begin-B end-B-hilit)) | |
7391 | 4184 ;; Emacs 19.22 has a bug, which requires that ediff-move-overlay will |
4185 ;; have the buffer as a parameter. Believed fixed in 19.23. | |
7267 | 4186 (ediff-move-overlay ediff-current-diff-overlay-A |
4187 begin-A end-A-hilit ediff-A-buffer) | |
4188 (ediff-move-overlay ediff-current-diff-overlay-B | |
4189 begin-B end-B-hilit ediff-B-buffer)) | |
4190 ;; giving priority of 0 and then changing it may look funny, but | |
4191 ;; this is intended to overcome an Emacs bug. | |
4192 (ediff-overlay-put ediff-current-diff-overlay-A 'priority 0) | |
4193 (ediff-overlay-put ediff-current-diff-overlay-B 'priority 0) | |
4194 (ediff-overlay-put ediff-current-diff-overlay-A 'priority | |
4195 (ediff-highest-priority begin-A end-A-hilit ediff-A-buffer)) | |
4196 (ediff-overlay-put ediff-current-diff-overlay-B 'priority | |
4197 (ediff-highest-priority begin-B end-B-hilit ediff-B-buffer)) | |
4198 | |
7424 | 4199 (or (face-differs-from-default-p 'ediff-odd-diff-face-A-var) |
4200 (not ediff-highlight-all-diffs) | |
7267 | 4201 (progn |
4202 (copy-face ediff-odd-diff-face-A 'ediff-odd-diff-face-A-var) | |
4203 (copy-face ediff-odd-diff-face-B 'ediff-odd-diff-face-B-var) | |
4204 (copy-face ediff-even-diff-face-A 'ediff-even-diff-face-A-var) | |
4205 (copy-face ediff-even-diff-face-B 'ediff-even-diff-face-B-var))) | |
4206 | |
4207 ;; unhighlight the background overlay for the diff n so they won't | |
4208 ;; interfere with the current diff overlay | |
7424 | 4209 (ediff-overlay-put (ediff-get-diff-overlay n 'A) 'face nil) |
4210 (ediff-overlay-put (ediff-get-diff-overlay n 'B) 'face nil) | |
7267 | 4211 |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4212 ;; (sit-for 0) ;; needed synch for some reason in v19.22 |
7267 | 4213 )) |
4214 | |
4215 | |
4216 (defun ediff-unhighlight-diff () | |
4217 "Remove overlays from buffers A and B." | |
4218 | |
4219 (ediff-move-overlay ediff-current-diff-overlay-A 1 1) | |
4220 (ediff-move-overlay ediff-current-diff-overlay-B 1 1) | |
4221 | |
4222 ;; rehighlight the overlay in the background of the | |
4223 ;; current difference region | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4224 (let ((overlay-A (ediff-get-diff-overlay ediff-current-difference 'A)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4225 (overlay-B (ediff-get-diff-overlay ediff-current-difference 'B))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4226 (ediff-overlay-put overlay-A |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4227 'face (if (ediff-odd-p ediff-current-difference) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4228 'ediff-odd-diff-face-A-var |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4229 'ediff-even-diff-face-A-var)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4230 (ediff-overlay-put overlay-B |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4231 'face (if (ediff-odd-p ediff-current-difference) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4232 'ediff-odd-diff-face-B-var |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4233 'ediff-even-diff-face-B-var)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4234 )) |
7267 | 4235 |
4236 | |
7424 | 4237 ;; delete highlighting overlays, restore faces to their original form |
7267 | 4238 (defun ediff-unhighlight-diffs-totally () |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4239 (let (buffer-read-only) |
7424 | 4240 (ediff-unselect-and-select-difference -1) |
4241 | |
7267 | 4242 (if (and window-system ediff-want-faces) |
4243 (let ((inhibit-quit t)) | |
4244 (if (face-differs-from-default-p 'ediff-odd-diff-face-A-var) | |
4245 (progn | |
4246 (copy-face 'default 'ediff-odd-diff-face-A-var) | |
4247 (copy-face 'default 'ediff-odd-diff-face-B-var) | |
4248 (copy-face 'default 'ediff-even-diff-face-A-var) | |
4249 (copy-face 'default 'ediff-even-diff-face-B-var))) | |
4250 (if (ediff-overlayp ediff-current-diff-overlay-A) | |
4251 (ediff-delete-overlay ediff-current-diff-overlay-A)) | |
4252 (setq ediff-current-diff-overlay-A nil) | |
4253 (if (ediff-overlayp ediff-current-diff-overlay-B) | |
4254 (ediff-delete-overlay ediff-current-diff-overlay-B)) | |
7424 | 4255 (setq ediff-current-diff-overlay-B nil))) |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4256 )) |
7424 | 4257 |
4258 (defun ediff-clear-diff-vector (vec &optional fin-diffs-also) | |
4259 ;; null out the difference overlays so they won't slow down future | |
4260 ;; editing operations | |
4261 (mapcar (function | |
4262 (lambda (elt) | |
4263 (ediff-delete-overlay (ediff-get-diff-overlay-from-vector elt 'A)) | |
4264 (ediff-delete-overlay (ediff-get-diff-overlay-from-vector elt 'B)) | |
4265 (if fin-diffs-also | |
4266 (ediff-clear-diff-vector | |
4267 (ediff-get-fine-diff-vector-from-vec elt))) | |
4268 )) | |
4269 vec) | |
4270 ;; allow them to be garbage collected | |
4271 (setq vec nil)) | |
7267 | 4272 |
4273 (defun ediff-operate-on-flags (action) | |
7419 | 4274 "Re/unhighlights buffers A and B with all flags from all Ediff sessions. |
4275 This is usually needed only when a | |
7267 | 4276 buffer is involved in multiple Ediff sessions." |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4277 (let* ((A-sessions (ediff-eval-in-buffer |
7267 | 4278 ediff-A-buffer |
4279 ediff-this-buffer-control-sessions)) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4280 (B-sessions (ediff-eval-in-buffer |
7267 | 4281 ediff-B-buffer |
4282 ediff-this-buffer-control-sessions)) | |
4283 (sessions (ediff-union A-sessions B-sessions)) | |
4284 (flag (if (eq action 'remove) 'unselect-only 'select-only))) | |
4285 | |
4286 (mapcar (function (lambda (buf) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4287 (ediff-eval-in-buffer |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4288 buf |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4289 (or (if (eq action 'insert) |
7267 | 4290 (memq ediff-highlighting-style '(ascii off)) |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4291 (not (eq ediff-highlighting-style 'ascii))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4292 (ediff-unselect-and-select-difference |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4293 ediff-current-difference |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4294 flag 'no-recenter)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4295 ))) |
7267 | 4296 sessions))) |
7424 | 4297 |
4298 | |
4299 | |
4300 ;;; Refinement of current diff | |
4301 ;; Split region along word boundaries. Each word will be on its own line. | |
4302 ;; Output to buffer out-buffer. | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4303 (defun ediff-forward-word () |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4304 "Move point one word forward. Used for splitting diff regions into words. |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4305 This is the default for `ediff-forward-word-function'." |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4306 (or (> (skip-chars-forward ediff-word-1) 0) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4307 (> (skip-chars-forward ediff-word-2) 0))) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4308 |
7424 | 4309 (defun ediff-wordify (beg end in-buffer out-buffer) |
4310 (let (sv-point string) | |
4311 (save-excursion | |
4312 (set-buffer in-buffer) | |
4313 (setq string (buffer-substring beg end)) | |
4314 | |
4315 (set-buffer out-buffer) | |
4316 (erase-buffer) | |
4317 (insert string) | |
4318 (goto-char (point-min)) | |
4319 (skip-chars-forward ediff-whitespace) | |
4320 (delete-region (point-min) (point)) | |
7267 | 4321 |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4322 (while (not (eobp)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4323 (funcall ediff-forward-word-function) |
7424 | 4324 (setq sv-point (point)) |
4325 (skip-chars-forward ediff-whitespace) | |
4326 (delete-region sv-point (point)) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4327 (insert "\n"))))) |
7424 | 4328 |
4329 ;; `n' is the diff region to work on. | |
4330 ;; if `flag' is 'noforce then make fine-diffs only if this region's fine | |
4331 ;; diffs have not been computed before. | |
4332 ;; if `flag' is 'skip then don't compute fine diffs for this region. | |
4333 (defun ediff-make-fine-diffs (&optional n flag) | |
4334 (interactive) | |
4335 (or n (setq n ediff-current-difference)) | |
4336 | |
4337 (if (< ediff-number-of-differences 1) | |
4338 (error "No differences found.")) | |
4339 | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4340 (or (< n 0) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4341 (>= n ediff-number-of-differences) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4342 ;; n is within the range |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4343 (let ((file-A ediff-temp-file-A) |
7424 | 4344 (file-B ediff-temp-file-B)) |
4345 | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4346 (cond ((and (eq flag 'noforce) (ediff-get-fine-diff-vector n)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4347 nil) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4348 ((eq flag 'skip) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4349 (or (ediff-get-fine-diff-vector n) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4350 (eq ediff-auto-refine 'off) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4351 (message "Region %d is larger than auto-refine limit. Hit %S to force-refine." |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4352 (1+ n) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4353 (substitute-command-keys |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4354 "\\[ediff-make-fine-diffs]") |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4355 ))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4356 (t |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4357 ;; delete old fine diffs |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4358 (ediff-clear-diff-vector (ediff-get-fine-diff-vector n)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4359 ;; recompute fine diffs |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4360 (setq ediff-tmp-buffer (get-buffer-create "*ediff-tmp*")) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4361 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4362 (ediff-wordify |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4363 (ediff-get-diff-posn 'A 'beg n) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4364 (ediff-get-diff-posn 'A 'end n) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4365 ediff-A-buffer |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4366 ediff-tmp-buffer) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4367 (ediff-eval-in-buffer |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4368 ediff-tmp-buffer |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4369 (setq file-A (ediff-make-temp-file ".fine-diffs-A" file-A))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4370 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4371 (ediff-wordify |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4372 (ediff-get-diff-posn 'B 'beg n) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4373 (ediff-get-diff-posn 'B 'end n) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4374 ediff-B-buffer |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4375 ediff-tmp-buffer) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4376 (ediff-eval-in-buffer |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4377 ediff-tmp-buffer |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4378 (setq file-B (ediff-make-temp-file ".fine-diffs-B" file-B))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4379 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4380 ;; save temp file names. |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4381 (setq ediff-temp-file-A file-A |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4382 ediff-temp-file-B file-B) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4383 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4384 ;; set the new vector of fine diffs, if none exists |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4385 (ediff-set-fine-diff-vector |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4386 n |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4387 (ediff-setup-diff-regions file-A file-B 'use-old-diff-buf n |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4388 ediff-fine-diff-program |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4389 ediff-fine-diff-options |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4390 ediff-fine-diff-ok-lines-regexp)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4391 (if (eq (length (ediff-get-fine-diff-vector n)) 0) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4392 (progn |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4393 (message "No diffs found in region %d, except for white space and line breaks." |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4394 (1+ n)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4395 (ediff-mark-diff-as-space-only n t)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4396 (ediff-mark-diff-as-space-only n nil))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4397 ) ;; end cond |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4398 (ediff-set-fine-diff-properties n) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4399 ))) |
7424 | 4400 |
4401 | |
4402 (defun ediff-set-fine-diff-properties (n &optional default) | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4403 (or (not window-system) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4404 (< n 0) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4405 (>= n ediff-number-of-differences) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4406 ;; in a window system, set faces and priorities of fine overlays |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4407 (let ((fine-diff-vector (ediff-get-fine-diff-vector n)) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4408 (face-A (if default 'default (face-name ediff-fine-diff-face-A))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4409 (face-B (if default 'default (face-name ediff-fine-diff-face-B))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4410 (priority-A (if default |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4411 0 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4412 (1+ (ediff-overlay-get ediff-current-diff-overlay-A |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4413 'priority)))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4414 (priority-B (if default |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4415 0 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4416 (1+ (ediff-overlay-get ediff-current-diff-overlay-B |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4417 'priority))))) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4418 (mapcar |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4419 (function (lambda (vec) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4420 (ediff-overlay-put |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4421 (ediff-get-diff-overlay-from-vector vec 'A) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4422 'face face-A) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4423 (ediff-overlay-put |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4424 (ediff-get-diff-overlay-from-vector vec 'A) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4425 'priority priority-A) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4426 |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4427 (ediff-overlay-put |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4428 (ediff-get-diff-overlay-from-vector vec 'B) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4429 'face face-B) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4430 (ediff-overlay-put |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4431 (ediff-get-diff-overlay-from-vector vec 'B) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4432 'priority priority-B) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4433 )) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4434 fine-diff-vector) |
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4435 ))) |
7424 | 4436 |
4437 (defun ediff-convert-diffs-to-overlays-refine (A-buffer B-buffer | |
4438 diff-list refine-region) | |
4439 (let* ((current-diff -1) | |
4440 (reg-A-start (ediff-get-diff-posn 'A 'beg refine-region)) | |
4441 (reg-B-start (ediff-get-diff-posn 'B 'beg refine-region)) | |
4442 diff-overlay-list list-element | |
4443 a-begin a-end b-begin b-end | |
4444 a-overlay b-overlay) | |
4445 | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4446 (ediff-eval-in-buffer A-buffer (goto-char reg-A-start)) |
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4447 (ediff-eval-in-buffer B-buffer (goto-char reg-B-start)) |
7424 | 4448 |
4449 (while diff-list | |
4450 (setq current-diff (1+ current-diff) | |
4451 list-element (car diff-list) | |
4452 a-begin (aref list-element 0) | |
4453 a-end (aref list-element 1) | |
4454 b-begin (aref list-element 2) | |
4455 b-end (aref list-element 3)) | |
4456 | |
8503
084456e12635
(ediff-find-file, ediff-patch-file): Handle symlinks.
Richard M. Stallman <rms@gnu.org>
parents:
8441
diff
changeset
|
4457 ;; put overlays at appropriate places in buffers |
7424 | 4458 (setq a-overlay (ediff-make-overlay |
4459 (ediff-goto-word (1+ a-begin) A-buffer) | |
4460 (ediff-goto-word a-end A-buffer 'end) | |
4461 A-buffer)) | |
4462 | |
4463 (setq b-overlay (ediff-make-overlay | |
4464 (ediff-goto-word (1+ b-begin) B-buffer) | |
4465 (ediff-goto-word b-end B-buffer 'end) | |
4466 B-buffer)) | |
4467 | |
4468 ;; record all overlays for this difference | |
4469 (setq diff-overlay-list (nconc diff-overlay-list | |
4470 (list (vector a-overlay b-overlay))) | |
4471 diff-list (cdr diff-list)) | |
4472 ) ;; while | |
4473 ;; convert the list of difference information into a vector for | |
4474 ;; fast access | |
4475 (apply 'vector diff-overlay-list))) | |
4476 | |
4477 ;; goto word #n starting at current position in buffer `buf' | |
4478 ;; For ediff, a word is either a string of a-z,A-Z, incl `-' and `_'; | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4479 ;; or a string of other non-blanks. A blank is a \n\t\C-j |
7424 | 4480 ;; If `flag' is non-nil, goto the end of the n-th word. |
4481 (defun ediff-goto-word (n buf &optional flag) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4482 (ediff-eval-in-buffer |
7424 | 4483 buf |
4484 (skip-chars-forward ediff-whitespace) | |
4485 (while (> n 1) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4486 (funcall ediff-forward-word-function) |
7424 | 4487 (skip-chars-forward ediff-whitespace) |
4488 (setq n (1- n))) | |
4489 ;(if flag | |
4490 (if (and flag (> n 0)) | |
8303
33ef3e3234dd
(Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
Richard M. Stallman <rms@gnu.org>
parents:
7709
diff
changeset
|
4491 (funcall ediff-forward-word-function)) |
7424 | 4492 (point))) |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4493 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4494 (defun ediff-get-visible-buffer-window (wind) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4495 (if (ediff-if-lucid) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4496 (get-buffer-window wind t) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4497 (get-buffer-window wind 'visible))) |
7424 | 4498 |
4499 | |
4500 | |
4501 | |
4502 | |
4503 ;;; Misc | |
8874
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4504 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4505 ;; These two functions are here to neutralize Lemacs' unwillingless to |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4506 ;; handle overlays whose buffers have been deleted. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4507 (defun ediff-move-overlay (overlay beg end &optional buffer) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4508 "Calls `move-overlay' in Emacs and `set-extent-endpoints' in Lemacs. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4509 Checks if overlay's buffer exists before actually doing the move." |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4510 (let ((buf (ediff-overlay-buffer overlay))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4511 (if (ediff-buffer-live-p buf) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4512 (if (ediff-if-lucid) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4513 (set-extent-endpoints overlay beg end) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4514 (move-overlay overlay beg end buffer)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4515 (ediff-delete-overlay overlay)))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4516 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4517 (defun ediff-overlay-put (overlay prop value) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4518 "Calls `overlay-put' or `set-extent-property' depending on Emacs version. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4519 Checks if overlay's buffer exists." |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4520 (if (ediff-buffer-live-p (ediff-overlay-buffer overlay)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4521 (if (ediff-if-lucid) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4522 (set-extent-property overlay prop value) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4523 (overlay-put overlay prop value)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4524 (ediff-delete-overlay overlay))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4525 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4526 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4527 ;; In Emacs 19.23 and Lucid 19.10, the number of variables to |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4528 ;; file-name-handler has changed. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4529 (defun ediff-find-file-name-handler (file) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4530 (let (newvers) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4531 (setq newvers |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4532 (cond ((and (boundp 'emacs-major-version) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4533 (> emacs-major-version 19)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4534 t) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4535 ((boundp 'emacs-minor-version) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4536 (if (ediff-if-lucid) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4537 (> emacs-minor-version 9) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4538 (> emacs-minor-version 22))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4539 (t nil))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4540 (if newvers |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4541 (find-file-name-handler file 'find-file-noselect) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4542 (find-file-name-handler file)))) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4543 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4544 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4545 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4546 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4547 (defun ediff-submit-report () |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4548 "Submit bug report on Ediff." |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4549 (interactive) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4550 (let ((reporter-prompt-for-summary-p t) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4551 varlist salutation) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4552 (setq varlist '(ediff-diff-program ediff-diff-options |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4553 ediff-fine-diff-program ediff-fine-diff-options |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4554 ediff-patch-program ediff-patch-options |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4555 ediff-shell |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4556 ediff-want-faces ediff-want-default-menus |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4557 ediff-auto-refine ediff-highlighting-style |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4558 ediff-A-buffer ediff-B-buffer ediff-control-buffer |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4559 ediff-forward-word-function)) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4560 (setq salutation " |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4561 Congratulations! You are about to report a bug in Ediff! |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4562 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4563 Please make a concise, accurate summary of what happened |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4564 and mail it to the address above. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4565 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4566 Some ``bugs'' may actually not be bugs at all. For instance, if you are |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4567 reporting that certain difference regions are not matched as you think they |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4568 should, this is most likely due to the way Unix diff program decides what |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4569 constitutes a difference region. Ediff is an Emacs interface to diff, and |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4570 it has nothing to do with those decisions---it only takes the output from |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4571 diff and presents it in a way that is better suited for human browsing and |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4572 manipulation. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4573 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4574 Another popular topic for reports are ``error messages'' arising from |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4575 byte-compilation. Because Ediff interfaces to several other packages and |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4576 runs under Emacs and Lucid Emacs, byte-compilation may produce output like |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4577 this: |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4578 While compiling toplevel forms in file ediff.el: |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4579 ** reference to free variable pm-color-alist |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4580 ........................ |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4581 While compiling the end of the data: |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4582 ** The following functions are not known to be defined: |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4583 ediff-valid-color-p, ediff-display-color-p, ediff-set-face, |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4584 ........................ |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4585 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4586 These are NOT errors, but inevitable warnings that should be ignored. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4587 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4588 So, please don't report those and similar things. However, if all you wanted |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4589 is to tell us how much you liked Ediff, go ahead and send this message anyway. |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4590 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4591 ------------------------------------------------------------------") |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4592 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4593 (require 'reporter) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4594 |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4595 (reporter-submit-bug-report "kifer@cs.sunysb.edu" |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4596 (ediff-version) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4597 varlist |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4598 nil nil |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4599 salutation) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4600 )) |
716969785d08
(ediff-submit-report, ediff-revision)
Richard M. Stallman <rms@gnu.org>
parents:
8524
diff
changeset
|
4601 |
7424 | 4602 |
7267 | 4603 (defun ediff-union (list1 list2) |
4604 "Combine LIST1 and LIST2 using a set-union operation. | |
4605 The result list contains all items that appear in either LIST1 or LIST2. | |
4606 This is a non-destructive function; it makes a copy of the data if necessary | |
4607 to avoid corrupting the original LIST1 and LIST2. | |
7419 | 4608 This is a slightly simplified version from `cl-seq.el'. Added here to |
7267 | 4609 avoid loading cl-*." |
4610 (cond ((null list1) list2) ((null list2) list1) | |
4611 ((equal list1 list2) list1) | |
4612 (t | |
4613 (or (>= (length list1) (length list2)) | |
4614 (setq list1 (prog1 list2 (setq list2 list1)))) | |
4615 (while list2 | |
4616 (or (memq (car list2) list1) | |
4617 (setq list1 (cons (car list2) list1))) | |
4618 (setq list2 (cdr list2))) | |
4619 list1))) | |
7424 | 4620 |
4621 ;(defun ediff-debug () | |
4622 ; (interactive) | |
4623 ; (with-output-to-temp-buffer "*ediff-debug*" | |
4624 ; (princ | |
4625 ; (format "Ctl buffer: %S\n\nediff-difference-vector:\n" | |
4626 ; ediff-control-buffer)) | |
4627 ; (mapcar (function | |
4628 ; (lambda (overl-vec) | |
4629 ; (princ (format "Diff %d: %S %S %S\n\t %S %S %S\n" | |
4630 ; (1+ (ediff-overlay-get (aref overl-vec 0) | |
4631 ; 'ediff-diff-num)) | |
4632 ; (ediff-overlay-get (aref overl-vec 0) | |
4633 ; 'ediff-control-buffer) | |
4634 ; (ediff-overlay-get (aref overl-vec 0) | |
4635 ; 'insert-in-front-hooks) | |
4636 ; (aref overl-vec 0) | |
4637 ; (ediff-overlay-get (aref overl-vec 1) | |
4638 ; 'ediff-control-buffer) | |
4639 ; (ediff-overlay-get (aref overl-vec 0) | |
4640 ; 'insert-in-front-hooks) | |
4641 ; (aref overl-vec 1) | |
4642 ; )))) | |
4643 ; ediff-difference-vector) | |
4644 ; (princ "\nediff-disturbed-overlays:\n") | |
4645 ; (mapcar (function | |
4646 ; (lambda (overl) | |
4647 ; (princ (format "%S %S\n" | |
4648 ; (ediff-overlay-get overl 'ediff-control-buffer) | |
4649 ; overl | |
4650 ; )))) | |
4651 ; ediff-disturbed-overlays))) | |
7267 | 4652 |
4653 | |
4654 (run-hooks 'ediff-load-hooks) | |
4655 | |
4656 | |
4657 (provide 'ediff) | |
4658 | |
4659 ;;; ediff.el ends here |