Commit | Line | Data |
---|---|---|
4009494e GM |
1 | \input texinfo @c -*-texinfo-*- |
2 | @c documentation for Ediff | |
3 | @c Written by Michael Kifer | |
4 | ||
5 | @comment %**start of header (This is for running Texinfo on a region.) | |
6 | ||
7 | @comment Using ediff.info instead of ediff in setfilename breaks DOS. | |
8 | @comment @setfilename ediff | |
9 | @comment @setfilename ediff.info | |
db78a8cb | 10 | @setfilename ../../info/ediff |
4009494e GM |
11 | |
12 | @settitle Ediff User's Manual | |
13 | @synindex vr cp | |
14 | @synindex fn cp | |
15 | @synindex pg cp | |
16 | @synindex ky cp | |
17 | ||
18 | @iftex | |
19 | @finalout | |
20 | @end iftex | |
21 | @c @smallbook | |
22 | @comment %**end of header (This is for running Texinfo on a region.) | |
23 | ||
24 | @copying | |
25 | This file documents Ediff, a comprehensive visual interface to Unix diff | |
26 | and patch utilities. | |
27 | ||
6bc383b1 | 28 | Copyright @copyright{} 1995--2014 Free Software Foundation, Inc. |
4009494e GM |
29 | |
30 | @quotation | |
31 | Permission is granted to copy, distribute and/or modify this document | |
6a2c4aec | 32 | under the terms of the GNU Free Documentation License, Version 1.3 or |
4009494e | 33 | any later version published by the Free Software Foundation; with no |
debf4439 GM |
34 | Invariant Sections, with the Front-Cover texts being ``A GNU Manual'', |
35 | and with the Back-Cover Texts as in (a) below. A copy of the license | |
36 | is included in the section entitled ``GNU Free Documentation License''. | |
4009494e | 37 | |
6f093307 | 38 | (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and |
6bf430d1 | 39 | modify this GNU manual.'' |
4009494e GM |
40 | @end quotation |
41 | @end copying | |
42 | ||
0c973505 | 43 | @dircategory Emacs misc features |
4009494e | 44 | @direntry |
f9405d87 GM |
45 | * Ediff: (ediff). A visual interface for comparing and |
46 | merging programs. | |
4009494e GM |
47 | @end direntry |
48 | ||
49 | @titlepage | |
50 | @title Ediff User's Manual | |
51 | @sp 4 | |
837afb4a | 52 | @subtitle Ediff version 2.81.2 |
4009494e | 53 | @sp 1 |
837afb4a | 54 | @subtitle November 2008 |
4009494e GM |
55 | @sp 5 |
56 | @author Michael Kifer | |
57 | @page | |
58 | ||
59 | @vskip 0pt plus 1filll | |
60 | @insertcopying | |
61 | @end titlepage | |
62 | ||
5dc584b5 | 63 | @contents |
4009494e | 64 | |
563a450c | 65 | @node Top |
8a36c07f | 66 | @top Ediff |
4009494e | 67 | |
5dc584b5 | 68 | @insertcopying |
4009494e GM |
69 | |
70 | @menu | |
71 | * Introduction:: About Ediff. | |
72 | * Major Entry Points:: How to use Ediff. | |
73 | * Session Commands:: Ediff commands used within a session. | |
74 | * Registry of Ediff Sessions:: Keeping track of multiple Ediff sessions. | |
75 | * Session Groups:: Comparing and merging directories. | |
76 | * Remote and Compressed Files:: You may want to know about this. | |
77 | * Customization:: How to make Ediff work the way YOU want. | |
78 | * Credits:: Thanks to those who helped. | |
79 | * GNU Free Documentation License:: The license for this documentation. | |
80 | * Index:: | |
81 | @end menu | |
82 | ||
563a450c | 83 | @node Introduction |
4009494e GM |
84 | @chapter Introduction |
85 | ||
86 | @cindex Comparing files and buffers | |
87 | @cindex Merging files and buffers | |
88 | @cindex Patching files and buffers | |
89 | @cindex Finding differences | |
90 | ||
91 | Ediff provides a convenient way for simultaneous browsing through | |
92 | the differences between a pair (or a triple) of files or buffers | |
93 | (which are called @samp{variants} for our purposes). The | |
94 | files being compared, file-A, file-B, and file-C (if applicable) are | |
95 | shown in separate windows (side by side, one above the another, or in | |
96 | separate frames), and the differences are highlighted as you step | |
97 | through them. You can also copy difference regions from one buffer to | |
98 | another (and recover old differences if you change your mind). | |
99 | ||
100 | Another powerful feature is the ability to merge a pair of files into a | |
101 | third buffer. Merging with an ancestor file is also supported. | |
102 | Furthermore, Ediff is equipped with directory-level capabilities that | |
103 | allow the user to conveniently launch browsing or merging sessions on | |
104 | groups of files in two (or three) different directories. | |
105 | ||
106 | In addition, Ediff can apply a patch to a file and then let you step through | |
107 | both files, the patched and the original one, simultaneously, | |
108 | difference-by-difference. You can even apply a patch right out of a mail | |
109 | buffer, i.e., patches received by mail don't even have to be saved. Since | |
110 | Ediff lets you copy differences between variants, you can, in effect, apply | |
111 | patches selectively (i.e., you can copy a difference region from | |
112 | @file{file.orig} to @file{file}, thereby undoing any particular patch that | |
113 | you don't like). | |
114 | ||
115 | Ediff even understands multi-file patches and can apply them interactively! | |
116 | (Ediff can recognize multi-file patches only if they are in the context | |
117 | format or GNU unified format. All other patches are treated as 1-file | |
118 | patches. Ediff is [hopefully] using the same algorithm as @code{patch} to | |
119 | determine which files need to be patched.) | |
120 | ||
121 | Ediff is aware of version control, which lets you compare | |
122 | files with their older versions. Ediff also works with remote and | |
123 | compressed files, automatically ftp'ing them over and uncompressing them. | |
124 | @xref{Remote and Compressed Files}, for details. | |
125 | ||
126 | This package builds upon ideas borrowed from Emerge, and several of Ediff's | |
127 | functions are adaptations from Emerge. Although Ediff subsumes and greatly | |
128 | extends Emerge, much of the functionality in Ediff is influenced by Emerge. | |
129 | The architecture and the interface are, of course, drastically different. | |
130 | ||
563a450c | 131 | @node Major Entry Points |
4009494e GM |
132 | @chapter Major Entry Points |
133 | ||
134 | When Ediff starts up, it displays a small control window, which accepts the | |
135 | Ediff commands, and two or three windows displaying the files to be compared | |
136 | or merged. The control window can be in its own small frame or it can be | |
137 | part of a bigger frame that displays other buffers. In any case, it is | |
138 | important that the control window be active (i.e., be the one receiving the | |
139 | keystrokes) when you use Ediff. You can switch to other Emacs buffers at | |
140 | will and even edit the files currently being compared with Ediff and then | |
141 | switch back to Ediff at any time by activating the appropriate Emacs windows. | |
142 | ||
143 | Ediff can be invoked interactively using the following functions, which can | |
144 | be run either from the minibuffer or from the menu bar. In the menu bar, | |
145 | all Ediff's entry points belong to three submenus of the Tools menu: | |
146 | Compare, Merge, and Apply Patch. | |
147 | ||
148 | @table @code | |
149 | @item ediff-files | |
150 | @itemx ediff | |
151 | @findex ediff-files | |
152 | @findex ediff | |
153 | Compare two files. | |
154 | ||
155 | @item ediff-backup | |
156 | @findex ediff-backup | |
157 | Compare a file with its backup. If there are several numerical backups, use | |
158 | the latest. If the file is itself a backup, then compare it with its | |
159 | original. | |
160 | ||
9ff0b02b MK |
161 | @item ediff-current-file |
162 | @findex ediff-current-file | |
163 | Compare the buffer with its file on disk. This function can be used as a | |
164 | safe version of @code{revert-buffer}. | |
165 | ||
4009494e GM |
166 | @item ediff-buffers |
167 | @findex ediff-buffers | |
168 | Compare two buffers. | |
169 | ||
170 | @item ediff-files3 | |
171 | @itemx ediff3 | |
172 | @findex ediff-files3 | |
173 | @findex ediff3 | |
174 | Compare three files. | |
175 | ||
176 | @item ediff-buffers3 | |
177 | @findex ediff-buffers3 | |
178 | Compare three buffers. | |
179 | ||
180 | @item edirs | |
181 | @itemx ediff-directories | |
182 | @findex edirs | |
183 | @findex ediff-directories | |
184 | Compare files common to two directories. | |
185 | @item edirs3 | |
186 | @itemx ediff-directories3 | |
187 | @findex edirs3 | |
188 | @findex ediff-directories3 | |
189 | Compare files common to three directories. | |
190 | @item edir-revisions | |
191 | @itemx ediff-directory-revisions | |
192 | @findex ediff-directory-revisions | |
193 | @findex edir-revisions | |
194 | Compare versions of files in a given directory. Ediff selects only the | |
195 | files that are under version control. | |
196 | @item edir-merge-revisions | |
197 | @itemx ediff-merge-directory-revisions | |
198 | @findex edir-merge-revisions | |
199 | @findex ediff-merge-directory-revisions | |
200 | Merge versions of files in a given directory. Ediff selects only the | |
201 | files that are under version control. | |
202 | @item edir-merge-revisions-with-ancestor | |
203 | @itemx ediff-merge-directory-revisions-with-ancestor | |
204 | @findex edir-merge-revisions-with-ancestor | |
205 | @findex ediff-merge-directory-revisions-with-ancestor | |
206 | Merge versions of files in a given directory using other versions as | |
207 | ancestors. Ediff selects only the files that are under version control. | |
208 | ||
209 | @item ediff-windows-wordwise | |
210 | @findex ediff-windows-wordwise | |
211 | Compare windows word-by-word. | |
212 | ||
213 | @item ediff-windows-linewise | |
214 | @findex ediff-windows-linewise | |
215 | Compare windows line-by-line. | |
216 | ||
217 | @item ediff-regions-wordwise | |
218 | @findex ediff-regions-wordwise | |
219 | Compare regions word-by-word. The regions can come from the same buffer | |
220 | and they can even overlap. You will be asked to specify the buffers that | |
221 | contain the regions, which you want to compare. For each buffer, you will | |
222 | also be asked to mark the regions to be compared. Pay attention to the | |
223 | messages that appear in the minibuffer. | |
224 | ||
225 | @item ediff-regions-linewise | |
226 | @findex ediff-regions-linewise | |
227 | Similar to @code{ediff-windows-linewise}, but compares the regions | |
228 | line-by-line. See @code{ediff-windows-linewise} for more details. | |
229 | ||
230 | @item ediff-revision | |
231 | @findex ediff-revision | |
232 | Compare versions of the current buffer, if the buffer is visiting | |
233 | a file under version control. | |
234 | ||
235 | @item ediff-patch-file | |
236 | @itemx epatch | |
237 | @findex ediff-patch-file | |
238 | @findex epatch | |
239 | ||
240 | Patch a file or multiple files, then compare. If the patch applies to just | |
241 | one file, Ediff will invoke a regular comparison session. If it is a | |
242 | multi-file patch, then a session group interface will be used and the user | |
243 | will be able to patch the files selectively. @xref{Session Groups}, for | |
244 | more details. | |
245 | ||
246 | Since the patch might be in a buffer or a file, you will be asked which is | |
247 | the case. To avoid this extra prompt, you can invoke this command with a | |
248 | prefix argument. With an odd prefix argument, Ediff assumes the patch | |
249 | is in a file; with an even argument, a buffer is assumed. | |
250 | ||
251 | Note that @code{ediff-patch-file} will actually use the @code{patch} | |
252 | utility to change the original files on disk. This is not that | |
253 | dangerous, since you will always have the original contents of the file | |
254 | saved in another file that has the extension @file{.orig}. | |
255 | Furthermore, if the file is under version control, then you can always back | |
256 | out to one of the previous versions (see the section on Version Control in | |
257 | the Emacs manual). | |
258 | ||
259 | @code{ediff-patch-file} is careful about versions control: if the file | |
260 | to be patched is checked in, then Ediff will offer to check it out, because | |
261 | failing to do so may result in the loss of the changes when the file is | |
262 | checked out the next time. | |
263 | ||
264 | If you don't intend to modify the file via the patch and just want to see | |
265 | what the patch is all about (and decide later), then | |
266 | @code{ediff-patch-buffer} might be a better choice. | |
267 | ||
268 | @item ediff-patch-buffer | |
269 | @itemx epatch-buffer | |
270 | @findex ediff-patch-buffer | |
271 | @findex epatch-buffer | |
272 | Patch a buffer, then compare. The buffer being patched and the file visited | |
273 | by that buffer (if any) is @emph{not} modified. The result of the patch | |
274 | appears in some other buffer that has the name ending with @emph{_patched}. | |
275 | ||
276 | This function would refuse to apply a multifile patch to a buffer. Use | |
277 | @code{ediff-patch-file} for that (and when you want the original file to be | |
278 | modified by the @code{patch} utility). | |
279 | ||
280 | Since the patch might be in a buffer or a file, you will be asked which is | |
281 | the case. To avoid this extra prompt, you can invoke this command with a | |
282 | prefix argument. With an odd prefix argument, Ediff assumes the patch | |
283 | is in a file; with an even argument, a buffer is assumed. | |
284 | ||
285 | @item ediff-merge-files | |
286 | @itemx ediff-merge | |
287 | @findex ediff-merge-files | |
288 | @findex ediff-merge | |
289 | Merge two files. | |
290 | ||
291 | @item ediff-merge-files-with-ancestor | |
292 | @itemx ediff-merge-with-ancestor | |
293 | @findex ediff-merge-files-with-ancestor | |
294 | @findex ediff-merge-with-ancestor | |
295 | Like @code{ediff-merge}, but with a third ancestor file. | |
296 | ||
297 | @item ediff-merge-buffers | |
298 | @findex ediff-merge-buffers | |
299 | Merge two buffers. | |
300 | ||
301 | @item ediff-merge-buffers-with-ancestor | |
302 | @findex ediff-merge-buffers-with-ancestor | |
303 | Same but with ancestor. | |
304 | ||
305 | ||
306 | @item edirs-merge | |
307 | @itemx ediff-merge-directories | |
308 | @findex edirs-merge | |
309 | @findex ediff-merge-directories | |
310 | Merge files common to two directories. | |
311 | @item edirs-merge-with-ancestor | |
312 | @itemx ediff-merge-directories-with-ancestor | |
313 | @findex edirs-merge-with-ancestor | |
314 | @findex ediff-merge-directories-with-ancestor | |
315 | Same but using files in a third directory as ancestors. | |
316 | If a pair of files doesn't have an ancestor in the ancestor-directory, you | |
317 | will still be able to merge them without the ancestor. | |
318 | ||
319 | @item ediff-merge-revisions | |
320 | @findex ediff-merge-revisions | |
321 | Merge two versions of the file visited by the current buffer. | |
322 | ||
323 | @item ediff-merge-revisions-with-ancestor | |
324 | @findex ediff-merge-revisions-with-ancestor | |
325 | Same but with ancestor. | |
326 | ||
327 | @item ediff-documentation | |
328 | @findex ediff-documentation | |
329 | Brings up this manual. | |
330 | ||
331 | @item ediff-show-registry | |
332 | @itemx eregistry | |
333 | Brings up Ediff session registry. This feature enables you to quickly find | |
334 | and restart active Ediff sessions. | |
335 | @end table | |
336 | ||
4009494e GM |
337 | When the above functions are invoked, the user is prompted for all the |
338 | necessary information---typically the files or buffers to compare, merge, or | |
339 | patch. Ediff tries to be smart about these prompts. For instance, in | |
340 | comparing/merging files, it will offer the visible buffers as defaults. In | |
341 | prompting for files, if the user enters a directory, the previously input | |
342 | file name will be appended to that directory. In addition, if the variable | |
343 | @code{ediff-use-last-dir} is not @code{nil}, Ediff will offer | |
344 | previously entered directories as defaults (which will be maintained | |
345 | separately for each type of file, A, B, or C). | |
346 | @vindex @code{ediff-use-last-dir} | |
347 | ||
348 | All the above functions use the POSIX @code{diff} or @code{diff3} programs | |
349 | to find differences between two files. They process the @code{diff} output | |
350 | and display it in a convenient form. At present, Ediff understands only | |
351 | the plain output from diff. Options such as @samp{-c} are not supported, | |
352 | nor is the format produced by incompatible file comparison programs such as | |
353 | the VMS version of @code{diff}. | |
354 | ||
355 | The functions @code{ediff-files}, @code{ediff-buffers}, | |
356 | @code{ediff-files3}, @code{ediff-buffers3} first display the coarse, | |
357 | line-based difference regions, as reported by the @code{diff} program. The | |
358 | total number of difference regions and the current difference number are | |
359 | always displayed in the mode line of the control window. | |
360 | ||
361 | Since @code{diff} may report fairly large chunks of text as being different, | |
362 | even though the difference may be localized to just a few words or even | |
363 | to the white space or line breaks, Ediff further @emph{refines} the | |
364 | regions to indicate which exact words differ. If the only difference is | |
365 | in the white space and line breaks, Ediff says so. | |
366 | ||
367 | On a color display, fine differences are highlighted with color; on a | |
368 | monochrome display, they are underlined. @xref{Highlighting Difference | |
369 | Regions}, for information on how to customize this. | |
370 | ||
371 | The commands @code{ediff-windows-wordwise}, | |
372 | @code{ediff-windows-linewise}, @code{ediff-regions-wordwise} and | |
373 | @code{ediff-regions-linewise} do comparison on parts of existing Emacs | |
374 | buffers. The commands @code{ediff-windows-wordwise} and | |
375 | @code{ediff-regions-wordwise} are intended for relatively small segments | |
376 | of buffers (e.g., up to 100 lines, depending on the speed of your machine), | |
377 | as they perform comparison on the basis of words rather than lines. | |
378 | (Word-wise comparison of large chunks of text can be slow.) | |
379 | ||
380 | To compare large regions, use @code{ediff-regions-linewise}. This | |
381 | command displays differences much like @code{ediff-files} and | |
382 | @code{ediff-buffers}. | |
383 | ||
384 | The functions @code{ediff-patch-file} and @code{ediff-patch-buffer} apply a | |
385 | patch to a file or a buffer and then run Ediff on the appropriate | |
386 | files/buffers, displaying the difference regions. | |
387 | ||
388 | The entry points @code{ediff-directories}, @code{ediff-merge-directories}, | |
389 | etc., provide a convenient interface for comparing and merging files in | |
390 | different directories. The user is presented with Dired-like interface from | |
391 | which one can run a group of related Ediff sessions. | |
392 | ||
393 | For files under version control, @code{ediff-revision} lets you compare | |
394 | the file visited by the current buffer to one of its checked-in versions. | |
395 | You can also compare two checked-in versions of the visited file. | |
396 | Moreover, the functions @code{ediff-directory-revisions}, | |
397 | @code{ediff-merge-directory-revisions}, etc., let you run a group of | |
398 | related Ediff sessions by taking a directory and comparing (or merging) | |
399 | versions of files in that directory. | |
400 | ||
563a450c | 401 | @node Session Commands |
4009494e GM |
402 | @chapter Session Commands |
403 | ||
404 | All Ediff commands are displayed in a Quick Help window, unless you type | |
405 | @kbd{?} to shrink the window to just one line. You can redisplay the help | |
406 | window by typing @kbd{?} again. The Quick Help commands are detailed below. | |
407 | ||
408 | Many Ediff commands take numeric prefix arguments. For instance, if you | |
409 | type a number, say 3, and then @kbd{j} (@code{ediff-jump-to-difference}), | |
410 | Ediff moves to the third difference region. Typing 3 and then @kbd{a} | |
96d98c40 | 411 | (@code{ediff-diff-to-diff}) copies the 3rd difference region from variant A |
1df7defd | 412 | to variant B@. Likewise, 4 followed by @kbd{ra} restores the 4th difference |
4009494e GM |
413 | region in buffer A (if it was previously written over via the command |
414 | @kbd{a}). | |
415 | ||
416 | Some commands take negative prefix arguments as well. For instance, typing | |
417 | @kbd{-} and then @kbd{j} will make the last difference region | |
418 | current. Typing @kbd{-2} then @kbd{j} makes the penultimate difference | |
419 | region current, etc. | |
420 | ||
421 | Without the prefix argument, all commands operate on the currently | |
422 | selected difference region. You can make any difference region | |
423 | current using the various commands explained below. | |
424 | ||
425 | For some commands, the actual value of the prefix argument is | |
426 | immaterial. However, if supplied, the prefix argument may modify the | |
427 | command (see @kbd{ga}, @kbd{gb}, and @kbd{gc}). | |
428 | ||
429 | @menu | |
430 | * Quick Help Commands:: Frequently used commands. | |
431 | * Other Session Commands:: Commands that are not bound to keys. | |
432 | @end menu | |
433 | ||
563a450c | 434 | @node Quick Help Commands |
4009494e | 435 | @section Quick Help Commands |
fa9a0855 CY |
436 | @cindex command help |
437 | @cindex important commands | |
4009494e GM |
438 | |
439 | @table @kbd | |
440 | @item ? | |
441 | @kindex ? | |
442 | Toggles the Ediff Quick Help window ON and OFF. | |
443 | @item G | |
444 | @kindex G | |
445 | Prepares a mail buffer for sending a praise or a curse to the Ediff maintainer. | |
446 | ||
447 | @item E | |
448 | @kindex E | |
449 | Brings up the top node of this manual, where you can find further | |
450 | information on the various Ediff functions and advanced issues, such as | |
451 | customization, session groups, etc. | |
452 | ||
453 | @item v | |
454 | @kindex v | |
455 | Scrolls up buffers A and B (and buffer C where appropriate) in a | |
456 | coordinated fashion. | |
457 | @item V | |
458 | @kindex V | |
459 | Scrolls the buffers down. | |
460 | ||
461 | @item < | |
462 | @kindex < | |
463 | Scrolls the buffers to the left simultaneously. | |
464 | @item > | |
465 | @kindex > | |
466 | Scrolls buffers to the right. | |
467 | ||
468 | @item wd | |
469 | @kindex wd | |
470 | Saves the output from the diff utility, for further reference. | |
471 | ||
472 | With prefix argument, saves the plain output from @code{diff} (see | |
473 | @code{ediff-diff-program} and @code{ediff-diff-options}). Without the | |
474 | argument, it saves customized @code{diff} output (see | |
475 | @code{ediff-custom-diff-program} and @code{ediff-custom-diff-options}), if | |
476 | it is available. | |
477 | ||
478 | @item wa | |
479 | @kindex wa | |
480 | Saves buffer A, if it was modified. | |
481 | @item wb | |
482 | @kindex wb | |
483 | Saves buffer B, if it was modified. | |
484 | @item wc | |
485 | @kindex wc | |
486 | Saves buffer C, if it was modified (if you are in a session that | |
487 | compares three files simultaneously). | |
488 | ||
489 | @item a | |
490 | @kindex a | |
491 | @emph{In comparison sessions:} | |
492 | Copies the current difference region (or the region specified as the prefix | |
1df7defd | 493 | to this command) from buffer A to buffer B@. |
4009494e GM |
494 | Ediff saves the old contents of buffer B's region; it can |
495 | be restored via the command @kbd{rb}, which see. | |
496 | ||
497 | @emph{In merge sessions:} | |
498 | Copies the current difference region (or the region specified as the prefix | |
499 | to this command) from buffer A to the merge buffer. The old contents of | |
500 | this region in buffer C can be restored via the command @kbd{r}. | |
501 | ||
502 | @item b | |
503 | @kindex b | |
504 | Works similarly, but copies the current difference region from buffer B to | |
505 | buffer A (in @emph{comparison sessions}) or the merge buffer (in | |
506 | @emph{merge sessions}). | |
507 | ||
508 | Ediff saves the old contents of the difference region copied over; it can | |
509 | be reinstated via the command @kbd{ra} in comparison sessions and | |
510 | @kbd{r} in merge sessions. | |
511 | ||
512 | @item ab | |
513 | @kindex ab | |
514 | Copies the current difference region (or the region specified as the prefix | |
1df7defd | 515 | to this command) from buffer A to buffer B@. This (and the next five) |
4009494e GM |
516 | command is enabled only in sessions that compare three files |
517 | simultaneously. The old region in buffer B is saved and can be restored | |
518 | via the command @kbd{rb}. | |
519 | @item ac | |
520 | @kindex ac | |
1df7defd | 521 | Copies the difference region from buffer A to buffer C@. |
4009494e GM |
522 | The old region in buffer C is saved and can be restored via the command |
523 | @kbd{rc}. | |
524 | @item ba | |
525 | @kindex ba | |
1df7defd | 526 | Copies the difference region from buffer B to buffer A@. |
4009494e GM |
527 | The old region in buffer A is saved and can be restored via the command |
528 | @kbd{ra}. | |
529 | @item bc | |
530 | @kindex bc | |
1df7defd | 531 | Copies the difference region from buffer B to buffer C@. |
4009494e GM |
532 | The command @kbd{rc} undoes this. |
533 | @item ca | |
534 | @kindex ca | |
1df7defd | 535 | Copies the difference region from buffer C to buffer A@. |
4009494e GM |
536 | The command @kbd{ra} undoes this. |
537 | @item cb | |
538 | @kindex cb | |
1df7defd | 539 | Copies the difference region from buffer C to buffer B@. |
4009494e GM |
540 | The command @kbd{rb} undoes this. |
541 | ||
542 | @item p | |
543 | @itemx DEL | |
544 | @kindex p | |
545 | @kindex DEL | |
546 | Makes the previous difference region current. | |
547 | @item n | |
548 | @itemx SPC | |
549 | @kindex n | |
550 | @kindex SPC | |
551 | Makes the next difference region current. | |
552 | ||
553 | @item j | |
554 | @itemx -j | |
555 | @itemx Nj | |
556 | @kindex j | |
557 | Makes the very first difference region current. | |
558 | ||
559 | @kbd{-j} makes the last region current. Typing a number, N, and then `j' | |
f99f1641 PE |
560 | makes the difference region N current. Typing @minus{}N (a negative number) then |
561 | `j' makes current the region Last @minus{} N. | |
4009494e GM |
562 | |
563 | @item ga | |
564 | @kindex ga | |
565 | Makes current the difference region closest to the position of the point in | |
566 | buffer A. | |
567 | ||
568 | However, with a prefix argument, Ediff would position all variants | |
569 | around the area indicated by the current point in buffer A: if | |
570 | the point is inside a difference region, then the variants will be | |
571 | positioned at this difference region. If the point is not in any difference | |
572 | region, then it is in an area where all variants agree with each other. In | |
573 | this case, the variants will be positioned so that each would display this | |
574 | area (of agreement). | |
575 | @item gb | |
576 | @kindex gb | |
577 | Makes current the difference region closest to the position of the point in | |
578 | buffer B. | |
579 | ||
580 | With a prefix argument, behaves like @kbd{ga}, but with respect to buffer B. | |
581 | @item gc | |
582 | @kindex gc | |
583 | @emph{In merge sessions:} | |
584 | makes current the difference region closest to the point in the merge buffer. | |
585 | ||
586 | @emph{In 3-file comparison sessions:} | |
587 | makes current the region closest to the point in buffer C. | |
588 | ||
589 | With a prefix argument, behaves like @kbd{ga}, but with respect to buffer C. | |
590 | ||
591 | @item ! | |
592 | @kindex ! | |
593 | Recomputes the difference regions, bringing them up to date. This is often | |
594 | needed because it is common to do all sorts of editing during Ediff | |
595 | sessions, so after a while, the highlighted difference regions may no | |
596 | longer reflect the actual differences among the buffers. | |
597 | ||
598 | @item * | |
599 | @kindex * | |
600 | Forces refinement of the current difference region, which highlights the exact | |
601 | words of disagreement among the buffers. With a negative prefix argument, | |
602 | unhighlights the current region. | |
603 | ||
604 | Forceful refinement may be needed if Ediff encounters a difference region | |
605 | that is larger than @code{ediff-auto-refine-limit}. In this situation, | |
606 | Ediff doesn't do automatic refinement in order to improve response time. | |
607 | (Ediff doesn't auto-refine on dumb terminals as well, but @kbd{*} still | |
608 | works there. However, the only useful piece of information it can tell you | |
609 | is whether or not the difference regions disagree only in the amount of | |
610 | white space.) | |
611 | ||
612 | This command is also useful when the highlighted fine differences are | |
613 | no longer current, due to user editing. | |
614 | ||
615 | @item m | |
616 | @kindex m | |
617 | Displays the current Ediff session in a frame as wide as the physical | |
618 | display. This is useful when comparing files side-by-side. Typing `m' again | |
619 | restores the original size of the frame. | |
620 | ||
621 | @item | | |
622 | @kindex | | |
623 | Toggles the horizontal/vertical split of the Ediff display. Horizontal | |
624 | split is convenient when it is possible to compare files | |
625 | side-by-side. If the frame in which files are displayed is too narrow | |
626 | and lines are cut off, typing @kbd{m} may help some. | |
627 | ||
628 | @item @@ | |
629 | @kindex @@ | |
630 | Toggles auto-refinement of difference regions (i.e., automatic highlighting | |
631 | of the exact words that differ among the variants). Auto-refinement is | |
632 | turned off on devices where Emacs doesn't support highlighting. | |
633 | ||
634 | On slow machines, it may be advantageous to turn auto-refinement off. The | |
635 | user can always forcefully refine specific difference regions by typing | |
636 | @kbd{*}. | |
637 | ||
638 | @item h | |
639 | @kindex h | |
640 | Cycles between full highlighting, the mode where fine differences are not | |
641 | highlighted (but computed), and the mode where highlighting is done with | |
642 | @acronym{ASCII} strings. The latter is not really recommended, unless on a dumb TTY. | |
643 | ||
644 | @item r | |
645 | @kindex r | |
646 | Restores the old contents of the region in the merge buffer. | |
647 | (If you copied a difference region from buffer A or B into the merge buffer | |
648 | using the commands @kbd{a} or @kbd{b}, Ediff saves the old contents of the | |
649 | region in case you change your mind.) | |
650 | ||
651 | This command is enabled in merge sessions only. | |
652 | ||
653 | @item ra | |
654 | @kindex ra | |
655 | Restores the old contents of the current difference region in buffer A, | |
656 | which was previously saved when the user invoked one of these commands: | |
657 | @kbd{b}, @kbd{ba}, @kbd{ca}, which see. This command is enabled in | |
658 | comparison sessions only. | |
659 | @item rb | |
660 | @kindex rb | |
661 | Restores the old contents of the current difference region in buffer B, | |
662 | which was previously saved when the user invoked one of these commands: | |
663 | @kbd{a}, @kbd{ab}, @kbd{cb}, which see. This command is enabled in | |
664 | comparison sessions only. | |
665 | @item rc | |
666 | @kindex rc | |
667 | Restores the old contents of the current difference region in buffer C, | |
668 | which was previously saved when the user invoked one of these commands: | |
669 | @kbd{ac}, @kbd{bc}, which see. This command is enabled in 3-file | |
670 | comparison sessions only. | |
671 | ||
672 | @item ## | |
673 | @kindex ## | |
674 | Tell Ediff to skip over regions that disagree among themselves only in the | |
675 | amount of white space and line breaks. | |
676 | ||
677 | Even though such regions will be skipped over, you can still jump to any | |
678 | one of them by typing the region number and then `j'. Typing @kbd{##} | |
679 | again puts Ediff back in the original state. | |
680 | ||
681 | @item #c | |
682 | @kindex #c | |
683 | @vindex ediff-ignore-case-option | |
684 | @vindex ediff-ignore-case-option3 | |
685 | @vindex ediff-ignore-case | |
686 | Toggle case sensitivity in the diff program. All diffs are recomputed. | |
687 | Case sensitivity is controlled by the variables | |
688 | @code{ediff-ignore-case-option}, @code{ediff-ignore-case-option3}, | |
689 | and @code{ediff-ignore-case}, which are explained elsewhere. | |
690 | ||
691 | @item #h | |
692 | @itemx #f | |
693 | @kindex #f | |
694 | @kindex #h | |
695 | Ediff works hard to ameliorate the effects of boredom in the workplace... | |
696 | ||
697 | Quite often differences are due to identical replacements (e.g., the word | |
698 | `foo' is replaced with the word `bar' everywhere). If the number of regions | |
699 | with such boring differences exceeds your tolerance threshold, you may be | |
700 | tempted to tell Ediff to skip these regions altogether (you will still be able | |
701 | to jump to them via the command @kbd{j}). The above commands, @kbd{#h} | |
702 | and @kbd{#f}, may well save your day! | |
703 | ||
704 | @kbd{#h} prompts you to specify regular expressions for each | |
705 | variant. Difference regions where each variant's region matches the | |
706 | corresponding regular expression will be skipped from then on. (You can | |
707 | also tell Ediff to skip regions where at least one variant matches its | |
708 | regular expression.) | |
709 | ||
710 | @kbd{#f} does dual job: it focuses on regions that match the corresponding | |
711 | regular expressions. All other regions will be skipped | |
712 | over. @xref{Selective Browsing}, for more. | |
713 | ||
714 | @item A | |
715 | @kindex A | |
1df7defd | 716 | Toggles the read-only property in buffer A@. |
4009494e GM |
717 | If file A is under version control and is checked in, it is checked out |
718 | (with your permission). | |
719 | @item B | |
720 | @kindex B | |
1df7defd | 721 | Toggles the read-only property in buffer B@. |
4009494e GM |
722 | If file B is under version control and is checked in, it is checked out. |
723 | @item C | |
724 | @kindex C | |
725 | Toggles the read-only property in buffer C (in 3-file comparison sessions). | |
726 | If file C is under version control and is checked in, it is checked out. | |
727 | ||
728 | @item ~ | |
729 | @kindex ~ | |
730 | Swaps the windows where buffers A and B are displayed. If you are comparing | |
731 | three buffers at once, then this command would rotate the windows among | |
732 | buffers A, B, and C. | |
733 | ||
734 | @item i | |
735 | @kindex i | |
736 | Displays all kinds of useful data about the current Ediff session. | |
737 | @item D | |
738 | @kindex D | |
739 | Runs @code{ediff-custom-diff-program} on the variants and displays the | |
740 | buffer containing the output. This is useful when you must send the output | |
741 | to your Mom. | |
742 | ||
743 | With a prefix argument, displays the plain @code{diff} output. | |
744 | @xref{Patch and Diff Programs}, for details. | |
745 | ||
746 | @item R | |
747 | @kindex R | |
748 | Displays a list of currently active Ediff sessions---the Ediff Registry. | |
749 | You can then restart any of these sessions by either clicking on a session | |
750 | record or by putting the cursor over it and then typing the return key. | |
751 | ||
537b04b9 | 752 | (Some poor souls leave so many active Ediff sessions around that they lose |
4009494e GM |
753 | track of them completely... The `R' command is designed to save these |
754 | people from the recently discovered Ediff Proficiency Syndrome.) | |
755 | ||
756 | Typing @kbd{R} brings up Ediff Registry only if it is typed into an Ediff | |
757 | Control Panel. If you don't have a control panel handy, type this in the | |
758 | minibuffer: @kbd{M-x eregistry}. @xref{Registry of Ediff Sessions}. | |
759 | ||
760 | @item M | |
761 | @kindex M | |
762 | Shows the session group buffer that invoked the current Ediff session. | |
763 | @xref{Session Groups}, for more information on session groups. | |
764 | ||
765 | @item z | |
766 | @kindex z | |
767 | Suspends the current Ediff session. (If you develop a condition known as | |
768 | Repetitive Ediff Injury---a serious but curable illness---you must change | |
769 | your current activity. This command tries hard to hide all Ediff-related | |
770 | buffers.) | |
771 | ||
772 | The easiest way to resume a suspended Ediff session is through the registry | |
773 | of active sessions. @xref{Registry of Ediff Sessions}, for details. | |
774 | @item q | |
775 | @kindex q | |
776 | Terminates this Ediff session. With a prefix argument (e.g.,@kbd{1q}), asks | |
777 | if you also want to delete the buffers of the variants. | |
778 | Modified files and the results of merges are never deleted. | |
779 | ||
780 | @item % | |
781 | @kindex % | |
782 | Toggles narrowing in Ediff buffers. Ediff buffers may be narrowed if you | |
783 | are comparing only parts of these buffers via the commands | |
784 | @code{ediff-windows-*} and @code{ediff-regions-*}, which see. | |
785 | ||
786 | @item C-l | |
787 | @kindex C-l | |
788 | Restores the usual Ediff window setup. This is the quickest way to resume | |
789 | an Ediff session, but it works only if the control panel of that session is | |
790 | visible. | |
791 | ||
792 | @item $$ | |
793 | @kindex $$ | |
794 | While merging with an ancestor file, Ediff is determined to reduce user's | |
795 | wear and tear by saving him and her much of unproductive, repetitive | |
796 | typing. If it notices that, say, file A's difference region is identical to | |
797 | the same difference region in the ancestor file, then the merge buffer will | |
1df7defd | 798 | automatically get the difference region taken from buffer B@. The rationale |
4009494e GM |
799 | is that this difference region in buffer A is as old as that in the |
800 | ancestor buffer, so the contents of that region in buffer B represents real | |
801 | change. | |
802 | ||
803 | You may want to ignore such `obvious' merges and concentrate on difference | |
804 | regions where both files `clash' with the ancestor, since this means that | |
805 | two different people have been changing this region independently and they | |
806 | had different ideas on how to do this. | |
807 | ||
808 | The above command does this for you by skipping the regions where only one | |
809 | of the variants clashes with the ancestor but the other variant agrees with | |
810 | it. Typing @kbd{$$} again undoes this setting. | |
811 | ||
812 | @item $* | |
813 | @kindex $* | |
814 | When merging files with large number of differences, it is sometimes | |
815 | convenient to be able to skip the difference regions for which you already | |
816 | decided which variant is most appropriate. Typing @kbd{$*} will accomplish | |
817 | precisely this. | |
818 | ||
819 | To be more precise, this toggles the check for whether the current merge is | |
820 | identical to its default setting, as originally decided by Ediff. For | |
821 | instance, if Ediff is merging according to the `combined' policy, then the | |
822 | merge region is skipped over if it is different from the combination of the | |
1df7defd | 823 | regions in buffers A and B@. (Warning: swapping buffers A and B will confuse |
4009494e GM |
824 | things in this respect.) If the merge region is marked as `prefer-A' then |
825 | this region will be skipped if it differs from the current difference | |
826 | region in buffer A, etc. | |
827 | ||
828 | @item / | |
829 | @kindex / | |
830 | Displays the ancestor file during merges. | |
831 | @item & | |
832 | @kindex & | |
833 | In some situations, such as when one of the files agrees with the ancestor file | |
834 | on a difference region and the other doesn't, Ediff knows what to do: it copies | |
835 | the current difference region from the second buffer into the merge buffer. | |
836 | ||
837 | In other cases, the right course of action is not that clearcut, and Ediff | |
838 | would use a default action. The above command changes the default action. | |
839 | The default action can be @samp{default-A} (choose the region from buffer | |
840 | A), @samp{default-B} (choose the region from buffer B), or @samp{combined} | |
841 | (combine the regions from the two buffers). | |
842 | @xref{Merging and diff3}, for further details. | |
843 | ||
844 | The command @kbd{&} also affects the regions in the merge buffers that have | |
845 | @samp{default-A}, @samp{default-B}, or @samp{combined} status, provided | |
846 | they weren't changed with respect to the original. For instance, if such a | |
847 | region has the status @samp{default-A} then changing the default action to | |
848 | @samp{default-B} will also replace this merge-buffer's region with the | |
849 | corresponding region from buffer B. | |
850 | ||
851 | @item s | |
852 | @kindex s | |
853 | Causes the merge window shrink to its minimum size, thereby exposing as much | |
854 | of the variant buffers as possible. Typing `s' again restores | |
855 | the original size of that window. | |
856 | ||
857 | With a positive prefix argument, this command enlarges the merge window. | |
858 | E.g., @kbd{4s} increases the size of the window by about 4 lines, if | |
859 | possible. With a negative numeric argument, the size of the merge window | |
860 | shrinks by that many lines, if possible. Thus, @kbd{-s} shrinks the window | |
861 | by about 1 line and @kbd{-3s} by about 3 lines. | |
862 | ||
863 | This command is intended only for temporary viewing; therefore, Ediff | |
864 | restores window C to its original size whenever it makes any other change | |
865 | in the window configuration. However, redisplaying (@kbd{C-l}) or jumping | |
866 | to another difference does not affect window C's size. | |
867 | ||
868 | The split between the merge window and the variant windows is controlled by | |
869 | the variable @code{ediff-merge-window-share}, which see. | |
870 | ||
871 | @item + | |
872 | @kindex + | |
873 | Combines the difference regions from buffers A and B and copies the | |
874 | result into the merge buffer. @xref{Merging and diff3}, and the | |
875 | variables @code{ediff-combine-diffs} and @code{ediff-combination-pattern}. | |
876 | ||
877 | ||
878 | @item = | |
879 | @kindex = | |
880 | You may run into situations when a large chunk of text in one file has been | |
881 | edited and then moved to a different place in another file. In such a case, | |
882 | these two chunks of text are unlikely to belong to the same difference | |
883 | region, so the refinement feature of Ediff will not be able to tell you | |
884 | what exactly differs inside these chunks. Since eyeballing large pieces of | |
885 | text is contrary to human nature, Ediff has a special command to help | |
886 | reduce the risk of developing a cataract. | |
887 | ||
888 | In other situations, the currently highlighted region might be big and you | |
889 | might want to reconcile of them interactively. | |
890 | ||
891 | All of this can be done with the above command, @kbd{=}, which | |
892 | compares regions within Ediff buffers. Typing @kbd{=} creates a | |
893 | child Ediff session for comparing regions in buffers A, B, or | |
894 | C as follows. | |
895 | ||
896 | First, you will be asked whether you want to compare the fine differences | |
897 | between the currently highlighted buffers on a word-by-word basis. If you | |
898 | accept, a child Ediff session will start using the currently highlighted | |
899 | regions. Ediff will let you step over the differences word-wise. | |
900 | ||
901 | If you reject the offer, you will be asked to select regions of your choice. | |
902 | ||
903 | @emph{If you are comparing 2 files or buffers:} | |
904 | Ediff will ask you to select regions in buffers A and B. | |
905 | ||
906 | @emph{If you are comparing 3 files or buffers simultaneously:} Ediff will | |
907 | ask you to choose buffers and then select regions inside those buffers. | |
908 | ||
909 | @emph{If you are merging files or buffers (with or without ancestor):} | |
910 | Ediff will ask you to choose which buffer (A or B) to compare with the | |
911 | merge buffer and then select regions in those buffers. | |
912 | ||
913 | @end table | |
914 | ||
563a450c | 915 | @node Other Session Commands |
4009494e GM |
916 | @section Other Session Commands |
917 | ||
918 | The following commands can be invoked from within any Ediff session, | |
919 | although some of them are not bound to a key. | |
920 | ||
921 | @table @code | |
922 | @item eregistry | |
923 | @itemx ediff-show-registry | |
924 | @findex eregistry | |
925 | @findex ediff-show-registry | |
926 | This command brings up the registry of active Ediff sessions. Ediff | |
927 | registry is a device that can be used to resume any active Ediff session | |
928 | (which may have been postponed because the user switched to some other | |
929 | activity). This command is also useful for switching between multiple | |
930 | active Ediff sessions that are run at the same time. The function | |
931 | @code{eregistry} is an alias for @code{ediff-show-registry}. | |
932 | @xref{Registry of Ediff Sessions}, for more information on this registry. | |
933 | ||
934 | @item ediff-toggle-multiframe | |
935 | @findex ediff-toggle-multiframe | |
936 | Changes the display from the multi-frame mode (where the quick help window | |
937 | is in a separate frame) to the single-frame mode (where all Ediff buffers | |
938 | share the same frame), and vice versa. See | |
939 | @code{ediff-window-setup-function} for details on how to make either of | |
940 | these modes the default one. | |
941 | ||
942 | This function can also be invoked from the Menubar. However, in some | |
943 | cases, the change will take place only after you execute one of the Ediff | |
944 | commands, such as going to the next difference or redisplaying. | |
945 | ||
946 | @item ediff-toggle-use-toolbar | |
947 | @findex ediff-toggle-use-toolbar | |
948 | Available in XEmacs only. The Ediff toolbar provides quick access to some | |
949 | of the common Ediff functions. This function toggles the display of the | |
950 | toolbar. If invoked from the menubar, the function may take sometimes | |
951 | effect only after you execute an Ediff command, such as going to the next | |
952 | difference. | |
953 | ||
954 | @item ediff-use-toolbar-p | |
955 | @vindex ediff-use-toolbar-p | |
956 | The use of the toolbar can also be specified via the variable | |
957 | @code{ediff-use-toolbar-p} (default is @code{t}). This variable can be set | |
f99f1641 | 958 | only in @file{.emacs}: do @strong{not} change it interactively. Use the |
4009494e GM |
959 | function @code{ediff-toggle-use-toolbar} instead. |
960 | ||
961 | @item ediff-revert-buffers-then-recompute-diffs | |
962 | @findex ediff-revert-buffers-then-recompute-diffs | |
963 | This command reverts the buffers you are comparing and recomputes their | |
964 | differences. It is useful when, after making changes, you decided to | |
965 | make a fresh start, or if at some point you changed the files being | |
966 | compared but want to discard any changes to comparison buffers that were | |
967 | done since then. | |
968 | ||
969 | This command normally asks for confirmation before reverting files. | |
970 | With a prefix argument, it reverts files without asking. | |
971 | ||
972 | ||
973 | @item ediff-profile | |
974 | @findex ediff-profile | |
975 | Ediff has an admittedly primitive (but useful) facility for profiling | |
976 | Ediff's commands. It is meant for Ediff maintenance---specifically, for | |
977 | making it run faster. The function @code{ediff-profile} toggles | |
978 | profiling of ediff commands. | |
979 | @end table | |
980 | ||
563a450c | 981 | @node Registry of Ediff Sessions |
4009494e GM |
982 | @chapter Registry of Ediff Sessions |
983 | ||
984 | Ediff maintains a registry of all its invocations that are | |
985 | still @emph{active}. This feature is very convenient for switching among | |
986 | active Ediff sessions or for quickly restarting a suspended Ediff session. | |
987 | ||
988 | The focal point of this activity is a buffer | |
989 | called @emph{*Ediff Registry*}. You can display this buffer by typing | |
990 | @kbd{R} in any Ediff Control Buffer or Session Group Buffer | |
991 | (@pxref{Session Groups}), or by typing | |
992 | @kbd{M-x eregistry} into the Minibuffer. | |
993 | The latter would be the fastest way to bring up the registry | |
994 | buffer if no control or group buffer is displayed in any of the visible | |
995 | Emacs windows. | |
996 | If you are in a habit of running multiple long Ediff sessions and often need to | |
997 | suspend, resume, or switch between them, it may be a good idea to have the | |
998 | registry buffer permanently displayed in a separate, dedicated window. | |
999 | ||
1000 | The registry buffer has several convenient key bindings. | |
1001 | For instance, clicking mouse button 2 or typing | |
1002 | @kbd{RET} or @kbd{v} over any session record resumes that session. | |
1003 | Session records in the registry buffer provide a fairly complete | |
1004 | description of each session, so it is usually easy to identify the right | |
1005 | session to resume. | |
1006 | ||
1007 | Other useful commands are bound to @kbd{SPC} (next registry record) | |
1008 | and @kbd{DEL} (previous registry record). There are other commands as well, | |
1009 | but you don't need to memorize them, since they are listed at the top of | |
1010 | the registry buffer. | |
1011 | ||
563a450c | 1012 | @node Session Groups |
4009494e GM |
1013 | @chapter Session Groups |
1014 | ||
1015 | Several major entries of Ediff perform comparison and merging on | |
1016 | directories. On entering @code{ediff-directories}, | |
1017 | @code{ediff-directories3}, | |
1018 | @code{ediff-merge-directories}, | |
1019 | @code{ediff-merge-directories-with-ancestor}, | |
1020 | @code{ediff-directory-revisions}, | |
1021 | @code{ediff-merge-directory-revisions}, or | |
1022 | @code{ediff-merge-directory-revisions-with-ancestor}, | |
1023 | the user is presented with a | |
1024 | Dired-like buffer that lists files common to the directories involved along | |
1025 | with their sizes. (The list of common files can be further filtered through | |
1026 | a regular expression, which the user is prompted for.) We call this buffer | |
1027 | @emph{Session Group Panel} because all Ediff sessions associated with the | |
1028 | listed files will have this buffer as a common focal point. | |
1029 | ||
1030 | Clicking button 2 or typing @kbd{RET} or @kbd{v} over a | |
1031 | record describing files invokes Ediff in the appropriate mode on these | |
1032 | files. You can come back to the session group buffer associated with a | |
1033 | particular invocation of Ediff by typing @kbd{M} in Ediff control buffer of | |
1034 | that invocation. | |
1035 | ||
1036 | Many commands are available in the session group buffer; some are | |
1037 | applicable only to certain types of work. The relevant commands are always | |
1038 | listed at the top of each session group buffer, so there is no need to | |
1039 | memorize them. | |
1040 | ||
1041 | In directory comparison or merging, a session group panel displays only the | |
1042 | files common to all directories involved. The differences are kept in a | |
1043 | separate @emph{directory difference buffer} and are conveniently displayed | |
1044 | by typing @kbd{D} to the corresponding session group panel. Thus, as an | |
1045 | added benefit, Ediff can be used to compare the contents of up to three | |
1046 | directories. | |
1047 | ||
1048 | @cindex Directory difference buffer | |
1049 | Sometimes it is desirable to copy some files from one directory to another | |
1050 | without exiting Ediff. The @emph{directory difference buffer}, which is | |
1051 | displayed by typing @kbd{D} as discussed above, can be used for this | |
1052 | purpose. If a file is, say, in Ediff's Directory A, but is missing in | |
1053 | Ediff's Directory B (Ediff will refuse to override existing files), then | |
1054 | typing @kbd{C} or clicking mouse button 2 over that file (which must be | |
1055 | displayed in directory difference buffer) will copy that file from | |
1056 | Directory A to Directory B. | |
1057 | ||
1058 | Session records in session group panels are also marked with @kbd{+}, for | |
1059 | active sessions, and with @kbd{-}, for finished sessions. | |
1060 | ||
1061 | Sometimes, it is convenient to exclude certain sessions from a group. | |
1062 | Usually this happens when the user doesn't intend to run Ediff of certain | |
1063 | files in the group, and the corresponding session records just add clutter | |
1064 | to the session group buffer. To help alleviate this problem, the user can | |
1065 | type @kbd{h} to mark a session as a candidate for exclusion and @kbd{x} to | |
1066 | actually hide the marked sessions. There actions are reversible: with a | |
1067 | prefix argument, @kbd{h} unmarks the session under the cursor, and @kbd{x} | |
1068 | brings the hidden sessions into the view (@kbd{x} doesn't unmark them, | |
1069 | though, so the user has to explicitly unmark the sessions of interest). | |
1070 | ||
1071 | Group sessions also understand the command @kbd{m}, which marks sessions | |
1072 | for future operations (other than hiding) on a group of sessions. At present, | |
1073 | the only such group-level operation is the creation of a multi-file patch. | |
1074 | ||
1075 | @vindex ediff-autostore-merges | |
1076 | For group sessions created to merge files, Ediff can store all merges | |
1077 | automatically in a directory. The user is asked to specify such directory | |
1078 | if the value of @code{ediff-autostore-merges} is non-@code{nil}. If the value is | |
1079 | @code{nil}, nothing is done to the merge buffers---it will be the user's | |
1080 | responsibility to save them. If the value is @code{t}, the user will be | |
1081 | asked where to save the merge buffers in all merge jobs, even those that do | |
1082 | not originate from a session group. It the value is neither @code{nil} nor | |
1083 | @code{t}, the merge buffer is saved @emph{only} if this merge session was | |
1084 | invoked from a session group. This behavior is implemented in the function | |
1085 | @code{ediff-maybe-save-and-delete-merge}, which is a hook in | |
1086 | @code{ediff-quit-merge-hook}. The user can supply a different hook, if | |
1087 | necessary. | |
1088 | ||
1089 | The variable @code{ediff-autostore-merges} is buffer-local, so it can be | |
1090 | set on a per-buffer basis. Therefore, use @code{setq-default} to change | |
1091 | this variable globally. | |
1092 | ||
1093 | @cindex Multi-file patches | |
1094 | A multi-file patch is a concatenated output of several runs of the Unix | |
1095 | @code{diff} command (some versions of @code{diff} let you create a | |
1096 | multi-file patch in just one run). Ediff facilitates creation of | |
1097 | multi-file patches as follows. If you are in a session group buffer | |
1098 | created in response to @code{ediff-directories} or | |
1099 | @code{ediff-directory-revisions}, you can mark (by typing @kbd{m}) the | |
1100 | desired Ediff sessions and then type @kbd{P} to create a | |
1101 | multi-file patch of those marked sessions. | |
1102 | Ediff will then display a buffer containing the patch. | |
1103 | The patch is generated by invoking @code{diff} on all marked individual | |
1104 | sessions (represented by files) and session groups (represented by | |
1105 | directories). Ediff will also recursively descend into any @emph{unmarked} | |
1106 | session group and will search for marked sessions there. In this way, you | |
1107 | can create multi-file patches that span file subtrees that grow out of | |
1108 | any given directory. | |
1109 | ||
1110 | In an @code{ediff-directories} session, it is enough to just mark the | |
1111 | requisite sessions. In @code{ediff-directory-revisions} revisions, the | |
1112 | marked sessions must also be active, or else Ediff will refuse to produce a | |
1113 | multi-file patch. This is because, in the latter-style sessions, there are | |
1114 | many ways to create diff output, and it is easier to handle by running | |
1115 | Ediff on the inactive sessions. | |
1116 | ||
1117 | Last, but not least, by typing @kbd{==}, you can quickly find out which | |
1118 | sessions have identical entries, so you won't have to run Ediff on those | |
1119 | sessions. This, however, works only on local, uncompressed files. | |
1120 | For compressed or remote files, this command won't report anything. | |
1121 | Likewise, you can use @kbd{=h} to mark sessions with identical entries | |
1122 | for hiding or, with @kbd{=m}, for further operations. | |
1123 | ||
1124 | The comparison operations @kbd{==}, @kbd{=h}, and @kbd{=m} can recurse into | |
1125 | subdirectories to see if they have identical contents (so the user will not | |
1126 | need to descend into those subdirectories manually). These commands ask the | |
1127 | user whether or not to do a recursive descent. | |
1128 | ||
1129 | ||
1130 | ||
563a450c | 1131 | @node Remote and Compressed Files |
4009494e GM |
1132 | @chapter Remote and Compressed Files |
1133 | ||
1134 | Ediff works with remote, compressed, and encrypted files. Ediff | |
1135 | supports @file{ange-ftp.el}, @file{jka-compr.el}, @file{uncompress.el} | |
1136 | and @file{crypt++.el}, but it may work with other similar packages as | |
1137 | well. This means that you can compare files residing on another | |
1138 | machine, or you can apply a patch to a file on another machine. Even | |
1139 | the patch itself can be a remote file! | |
1140 | ||
1141 | When patching compressed or remote files, Ediff does not rename the source | |
1142 | file (unlike what the @code{patch} utility would usually do). Instead, the | |
1143 | source file retains its name and the result of applying the patch is placed | |
1144 | in a temporary file that has the suffix @file{_patched} attached. | |
1145 | Generally, this applies to files that are handled using black magic, such | |
1146 | as special file handlers (ange-ftp and some compression and encryption | |
1147 | packages also use this method). | |
1148 | ||
1149 | Regular files are treated by the @code{patch} utility in the usual manner, | |
1150 | i.e., the original is renamed into @file{source-name.orig} and the result | |
1151 | of the patch is placed into the file source-name (@file{_orig} is used | |
65e7ca35 | 1152 | on systems like DOS, etc.). |
4009494e | 1153 | |
563a450c | 1154 | @node Customization |
4009494e GM |
1155 | @chapter Customization |
1156 | ||
1157 | Ediff has a rather self-explanatory interface, and in most cases you | |
1158 | won't need to change anything. However, should the need arise, there are | |
1159 | extensive facilities for changing the default behavior. | |
1160 | ||
1161 | Most of the customization can be done by setting various variables in the | |
1162 | @file{.emacs} file. Some customization (mostly window-related | |
1163 | customization and faces) can be done by putting appropriate lines in | |
1164 | @file{.Xdefaults}, @file{.xrdb}, or whatever X resource file is in use. | |
1165 | ||
1166 | With respect to the latter, please note that the X resource | |
1167 | for Ediff customization is `Ediff', @emph{not} `emacs'. | |
1168 | @xref{Window and Frame Configuration}, | |
1169 | @xref{Highlighting Difference Regions}, for further details. Please also | |
1170 | refer to Emacs manual for the information on how to set Emacs X resources. | |
1171 | ||
1172 | @menu | |
1173 | * Hooks:: Customization via the hooks. | |
1174 | * Quick Help Customization:: How to customize Ediff's quick help feature. | |
1175 | * Window and Frame Configuration:: Controlling the way Ediff displays things. | |
1176 | * Selective Browsing:: Advanced browsing through difference regions. | |
1177 | * Highlighting Difference Regions:: Controlling highlighting. | |
1178 | * Narrowing:: Comparing regions, windows, etc. | |
1179 | * Refinement of Difference Regions:: How to control the refinement process. | |
1180 | * Patch and Diff Programs:: Changing the utilities that compute differences | |
1181 | and apply patches. | |
1182 | * Merging and diff3:: How to customize Ediff in its Merge Mode. | |
1183 | * Support for Version Control:: Changing the version control package. | |
1184 | You are not likely to do that. | |
1185 | * Customizing the Mode Line:: Changing the look of the mode line in Ediff. | |
1186 | * Miscellaneous:: Other customization. | |
1187 | * Notes on Heavy-duty Customization:: Customization for the gurus. | |
1188 | @end menu | |
1189 | ||
563a450c | 1190 | @node Hooks |
4009494e GM |
1191 | @section Hooks |
1192 | ||
1193 | The bulk of customization can be done via the following hooks: | |
1194 | ||
1195 | @table @code | |
1196 | @item ediff-load-hook | |
1197 | @vindex ediff-load-hook | |
1198 | This hook can be used to change defaults after Ediff is loaded. | |
1199 | ||
1200 | @item ediff-before-setup-hook | |
1201 | @vindex ediff-before-setup-hook | |
1202 | Hook that is run just before Ediff rearranges windows to its liking. | |
1203 | Can be used to save windows configuration. | |
1204 | ||
1205 | @item ediff-keymap-setup-hook | |
1206 | @vindex ediff-keymap-setup-hook | |
1207 | @vindex ediff-mode-map | |
1208 | This hook can be used to alter bindings in Ediff's keymap, | |
1209 | @code{ediff-mode-map}. These hooks are | |
1210 | run right after the default bindings are set but before | |
1211 | @code{ediff-load-hook}. The regular user needs not be concerned with this | |
0b381c7e | 1212 | hook---it is provided for implementers of other Emacs packages built on top |
4009494e GM |
1213 | of Ediff. |
1214 | ||
1215 | @item ediff-before-setup-windows-hook | |
1216 | @itemx ediff-after-setup-windows-hook | |
1217 | @vindex ediff-before-setup-windows-hook | |
1218 | @vindex ediff-after-setup-windows-hook | |
1219 | These two hooks are called before and after Ediff sets up its window | |
1220 | configuration. These hooks are run each time Ediff rearranges windows to | |
1221 | its liking. This happens whenever it detects that the user changed the | |
1222 | windows setup. | |
1223 | ||
1224 | @item ediff-suspend-hook | |
1225 | @itemx ediff-quit-hook | |
1226 | @vindex ediff-suspend-hook | |
1227 | @vindex ediff-quit-hook | |
1228 | These two hooks are run when you suspend or quit Ediff. They can be | |
1229 | used to set desired window configurations, delete files Ediff didn't | |
1230 | want to clean up after exiting, etc. | |
1231 | ||
1232 | By default, @code{ediff-quit-hook} holds one hook function, | |
1233 | @code{ediff-cleanup-mess}, which cleans after Ediff, as appropriate in | |
1234 | most cases. You probably won't want to change it, but you might | |
1235 | want to add other hook functions. | |
1236 | ||
1237 | Keep in mind that hooks executing before @code{ediff-cleanup-mess} start | |
1238 | in @code{ediff-control-buffer;} they should also leave | |
1239 | @code{ediff-control-buffer} as the current buffer when they finish. | |
1240 | Hooks that are executed after @code{ediff-cleanup-mess} should expect | |
1df7defd | 1241 | the current buffer be either buffer A or buffer B@. |
4009494e GM |
1242 | @code{ediff-cleanup-mess} doesn't kill the buffers being compared or |
1243 | merged (see @code{ediff-cleanup-hook}, below). | |
1244 | ||
1245 | @item ediff-cleanup-hook | |
1246 | @vindex ediff-cleanup-hook | |
1247 | This hook is run just before @code{ediff-quit-hook}. This is a good | |
1248 | place to do various cleanups, such as deleting the variant buffers. | |
1249 | Ediff provides a function, @code{ediff-janitor}, as one such possible | |
1250 | hook, which you can add to @code{ediff-cleanup-hook} with | |
d1069532 | 1251 | @code{add-hook}. |
4009494e GM |
1252 | |
1253 | @findex ediff-janitor | |
1254 | This function kills buffers A, B, and, possibly, C, if these buffers aren't | |
1255 | modified. In merge jobs, buffer C is never deleted. However, the side | |
1256 | effect of using this function is that you may not be able to compare the | |
1257 | same buffer in two separate Ediff sessions: quitting one of them will | |
1258 | delete this buffer in another session as well. | |
1259 | ||
1260 | @item ediff-quit-merge-hook | |
1261 | @vindex ediff-quit-merge-hook | |
1262 | @vindex ediff-autostore-merges | |
1263 | @findex ediff-maybe-save-and-delete-merge | |
1264 | This hook is called when Ediff quits a merge job. By default, the value is | |
1265 | @code{ediff-maybe-save-and-delete-merge}, which is a function that attempts | |
1266 | to save the merge buffer according to the value of | |
1267 | @code{ediff-autostore-merges}, as described later. | |
1268 | ||
1269 | @item ediff-before-setup-control-frame-hook | |
1270 | @itemx ediff-after-setup-control-frame-hook | |
1271 | @vindex ediff-before-setup-control-frame-hook | |
1272 | @vindex ediff-after-setup-control-frame-hook | |
1273 | These two hooks run before and after Ediff sets up the control frame. | |
1274 | They can be used to relocate Ediff control frame when Ediff runs in a | |
1275 | multiframe mode (i.e., when the control buffer is in its own dedicated | |
1276 | frame). Be aware that many variables that drive Ediff are local to | |
1277 | Ediff Control Panel (@code{ediff-control-buffer}), which requires | |
1278 | special care in writing these hooks. Take a look at | |
1279 | @code{ediff-default-suspend-hook} and @code{ediff-default-quit-hook} to | |
1280 | see what's involved. | |
1281 | ||
1282 | @item ediff-startup-hook | |
1283 | @vindex ediff-startup-hook | |
1284 | This hook is run at the end of Ediff startup. | |
1285 | ||
1286 | @item ediff-select-hook | |
1287 | @vindex ediff-select-hook | |
1288 | This hook is run after Ediff selects the next difference region. | |
1289 | ||
1290 | @item ediff-unselect-hook | |
1291 | @vindex ediff-unselect-hook | |
1292 | This hook is run after Ediff unselects the current difference region. | |
1293 | ||
1294 | @item ediff-prepare-buffer-hook | |
1295 | @vindex ediff-prepare-buffer-hook | |
1296 | This hook is run for each Ediff buffer (A, B, C) right after the buffer | |
1297 | is arranged. | |
1298 | ||
1299 | @item ediff-display-help-hook | |
1300 | @vindex ediff-display-help-hook | |
1301 | Ediff runs this hook each time after setting up the help message. It | |
1302 | can be used to alter the help message for custom packages that run on | |
1303 | top of Ediff. | |
1304 | ||
1305 | @item ediff-mode-hook | |
1306 | @vindex ediff-mode-hook | |
1307 | This hook is run just after Ediff mode is set up in the control | |
1308 | buffer. This is done before any Ediff window is created. You can use it to | |
1309 | set local variables that alter the look of the display. | |
1310 | ||
1311 | @item ediff-registry-setup-hook | |
1312 | @vindex ediff-registry-setup-hook | |
1313 | Hooks run after setting up the registry for all active Ediff session. | |
1314 | @xref{Session Groups}, for details. | |
1315 | @item ediff-before-session-group-setup-hook | |
1316 | @vindex ediff-before-session-group-setup-hook | |
1317 | Hooks run before setting up a control panel for a group of related Ediff | |
1318 | sessions. Can be used, for example, to save window configuration to restore | |
1319 | later. | |
1320 | @item ediff-after-session-group-setup-hook | |
1321 | @vindex ediff-after-session-group-setup-hook | |
1322 | Hooks run after setting up a control panel for a group of related Ediff | |
1323 | sessions. @xref{Session Groups}, for details. | |
1324 | @item ediff-quit-session-group-hook | |
1325 | @vindex ediff-quit-session-group-hook | |
1326 | Hooks run just before exiting a session group. | |
1327 | @item ediff-meta-buffer-keymap-setup-hook | |
1328 | @vindex ediff-meta-buffer-keymap-setup-hook | |
1329 | @vindex ediff-meta-buffer-map | |
f99f1641 | 1330 | Hooks run just after setting up the @code{ediff-meta-buffer-map}, the |
4009494e GM |
1331 | map that controls key bindings in the meta buffer. Since |
1332 | @code{ediff-meta-buffer-map} is a local variable, you can set different | |
1333 | bindings for different kinds of meta buffers. | |
1334 | @end table | |
1335 | ||
563a450c | 1336 | @node Quick Help Customization |
4009494e GM |
1337 | @section Quick Help Customization |
1338 | @vindex ediff-use-long-help-message | |
1339 | @vindex ediff-control-buffer | |
1340 | @vindex ediff-startup-hook | |
1341 | @vindex ediff-help-message | |
1342 | ||
1343 | Ediff provides quick help using its control panel window. Since this window | |
1344 | takes a fair share of the screen real estate, you can toggle it off by | |
1345 | typing @kbd{?}. The control window will then shrink to just one line and a | |
1346 | mode line, displaying a short help message. | |
1347 | ||
1348 | The variable @code{ediff-use-long-help-message} tells Ediff whether | |
1349 | you use the short message or the long one. By default, it | |
1350 | is set to @code{nil}, meaning that the short message is used. | |
1351 | Set this to @code{t}, if you want Ediff to use the long | |
1352 | message by default. This property can always be changed interactively, by | |
1353 | typing @kbd{?} into Ediff Control Buffer. | |
1354 | ||
1355 | If you want to change the appearance of the help message on a per-buffer | |
1356 | basis, you must use @code{ediff-startup-hook} to change the value of | |
1357 | the variable @code{ediff-help-message}, which is local to | |
1358 | @code{ediff-control-buffer}. | |
1359 | ||
563a450c | 1360 | @node Window and Frame Configuration |
4009494e GM |
1361 | @section Window and Frame Configuration |
1362 | ||
1363 | On a non-windowing display, Ediff sets things up in one frame, splitting | |
1df7defd | 1364 | it between a small control window and the windows for buffers A, B, and C@. |
4009494e GM |
1365 | The split between these windows can be horizontal or |
1366 | vertical, which can be changed interactively by typing @kbd{|} while the | |
1367 | cursor is in the control window. | |
1368 | ||
1369 | On a window display, Ediff sets up a dedicated frame for Ediff Control | |
1370 | Panel and then it chooses windows as follows: If one of the buffers | |
1371 | is invisible, it is displayed in the currently selected frame. If | |
1372 | a buffer is visible, it is displayed in the frame where it is visible. | |
1373 | If, according to the above criteria, the two buffers fall into the same | |
1374 | frame, then so be it---the frame will be shared by the two. The same | |
1375 | algorithm works when you type @kbd{C-l} (@code{ediff-recenter}), @kbd{p} | |
1376 | (@code{ediff-previous-difference}), @kbd{n} | |
1377 | (@code{ediff-next-difference}), etc. | |
1378 | ||
1379 | The above behavior also depends on whether the current frame is splittable, | |
1380 | dedicated, etc. Unfortunately, the margin of this book is too narrow to | |
1381 | present the details of this remarkable algorithm. | |
1382 | ||
1383 | The upshot of all this is that you can compare buffers in one frame or | |
1384 | in different frames. The former is done by default, while the latter can | |
1385 | be achieved by arranging buffers A, B (and C, if applicable) to be seen in | |
1386 | different frames. Ediff respects these arrangements, automatically | |
1387 | adapting itself to the multi-frame mode. | |
1388 | ||
1389 | Ediff uses the following variables to set up its control panel | |
1390 | (a.k.a.@: control buffer, a.k.a.@: quick help window): | |
1391 | ||
1392 | @table @code | |
1393 | @item ediff-control-frame-parameters | |
1394 | @vindex ediff-control-frame-parameters | |
1395 | You can change or augment this variable including the font, color, | |
1396 | etc. The X resource name of Ediff Control Panel frames is @samp{Ediff}. Under | |
1397 | X-windows, you can use this name to set up preferences in your | |
1398 | @file{~/.Xdefaults}, @file{~/.xrdb}, or whatever X resource file is in | |
1399 | use. Usually this is preferable to changing | |
1400 | @code{ediff-control-frame-parameters} directly. For instance, you can | |
1401 | specify in @file{~/.Xdefaults} the color of the control frame | |
1402 | using the resource @samp{Ediff*background}. | |
1403 | ||
1404 | In general, any X resource pertaining the control frame can be reached | |
1405 | via the prefix @code{Ediff*}. | |
1406 | ||
1407 | @item ediff-control-frame-position-function | |
1408 | @vindex ediff-control-frame-position-function | |
1409 | The preferred way of specifying the position of the control frame is by | |
1410 | setting the variable @code{ediff-control-frame-position-function} to an | |
1411 | appropriate function. | |
1412 | The default value of this variable is | |
1413 | @code{ediff-make-frame-position}. This function places the control frame in | |
1414 | the vicinity of the North-East corner of the frame displaying buffer A. | |
1415 | ||
1416 | @findex ediff-make-frame-position | |
1417 | @end table | |
1418 | ||
1419 | The following variables can be used to adjust the location produced by | |
1420 | @code{ediff-make-frame-position} and for related customization. | |
1421 | ||
1422 | @table @code | |
1423 | @item ediff-narrow-control-frame-leftward-shift | |
1424 | @vindex ediff-narrow-control-frame-leftward-shift | |
1425 | Specifies the number of characters for shifting | |
1426 | the control frame from the rightmost edge of frame A when the control | |
1427 | frame is displayed as a small window. | |
1428 | ||
1429 | @item ediff-wide-control-frame-rightward-shift | |
1430 | @vindex ediff-wide-control-frame-rightward-shift | |
1431 | Specifies the rightward shift of the control frame | |
1432 | from the left edge of frame A when the control frame shows the full | |
1433 | menu of options. | |
1434 | ||
1435 | @item ediff-control-frame-upward-shift | |
1436 | @vindex ediff-control-frame-upward-shift | |
1437 | Specifies the number of pixels for the upward shift | |
1438 | of the control frame. | |
1439 | ||
1440 | @item ediff-prefer-iconified-control-frame | |
1441 | @vindex ediff-prefer-iconified-control-frame | |
1442 | If this variable is @code{t}, the control frame becomes iconified | |
1443 | automatically when you toggle the quick help message off. This saves | |
1444 | valuable real estate on the screen. Toggling help back will deiconify | |
1445 | the control frame. | |
1446 | ||
1447 | To start Ediff with an iconified Control Panel, you should set this | |
1448 | variable to @code{t} and @code{ediff-prefer-long-help-message} to | |
1449 | @code{nil} (@pxref{Quick Help Customization}). This behavior is useful | |
1450 | only if icons are allowed to accept keyboard input (which depends on the | |
1451 | window manager and other factors). | |
1452 | @end table | |
1453 | ||
1454 | @findex ediff-setup-windows | |
1455 | To make more creative changes in the way Ediff sets up windows, you can | |
1456 | rewrite the function @code{ediff-setup-windows}. However, we believe | |
1457 | that detaching Ediff Control Panel from the rest and making it into a | |
1458 | separate frame offers an important opportunity by allowing you to | |
1459 | iconify that frame. The icon will usually accept all of the Ediff | |
1460 | commands, but will free up valuable real estate on your screen (this may | |
1461 | depend on your window manager, though). | |
1462 | ||
1463 | The following variable controls how windows are set up: | |
1464 | ||
1465 | @table @code | |
1466 | @item ediff-window-setup-function | |
1467 | @vindex ediff-window-setup-function | |
1468 | The multiframe setup is done by the | |
1469 | @code{ediff-setup-windows-multiframe} function, which is the default on | |
1470 | windowing displays. The plain setup, one where all windows are always | |
1471 | in one frame, is done by @code{ediff-setup-windows-plain}, which is the | |
1472 | default on a non-windowing display (or in an xterm window). In fact, | |
1473 | under Emacs, you can switch freely between these two setups by executing | |
1474 | the command @code{ediff-toggle-multiframe} using the Minibuffer of the | |
1475 | Menubar. | |
1476 | @findex ediff-setup-windows-multiframe | |
1477 | @findex ediff-setup-windows-plain | |
1478 | @findex ediff-toggle-multiframe | |
1479 | ||
1480 | If you don't like any of these setups, write your own function. See the | |
1481 | documentation for @code{ediff-window-setup-function} for the basic | |
1482 | guidelines. However, writing window setups is not easy, so you should | |
1483 | first take a close look at @code{ediff-setup-windows-plain} and | |
1484 | @code{ediff-setup-windows-multiframe}. | |
1485 | @end table | |
1486 | ||
1487 | You can run multiple Ediff sessions at once, by invoking Ediff several | |
1488 | times without exiting previous Ediff sessions. Different sessions | |
1489 | may even operate on the same pair of files. | |
1490 | ||
1491 | Each session has its own Ediff Control Panel and all the regarding a | |
1492 | particular session is local to the associated control panel buffer. You | |
1493 | can switch between sessions by suspending one session and then switching | |
1494 | to another control panel. (Different control panel buffers are | |
1495 | distinguished by a numerical suffix, e.g., @samp{Ediff Control Panel<3>}.) | |
1496 | ||
563a450c | 1497 | @node Selective Browsing |
4009494e GM |
1498 | @section Selective Browsing |
1499 | ||
1500 | Sometimes it is convenient to be able to step through only some difference | |
1501 | regions, those that match certain regular expressions, and to ignore all | |
1502 | others. On other occasions, you may want to ignore difference regions that | |
1503 | match some regular expressions, and to look only at the rest. | |
1504 | ||
1505 | The commands @kbd{#f} and @kbd{#h} let you do precisely this. | |
1506 | ||
1507 | Typing @kbd{#f} lets you specify regular expressions that match difference | |
1508 | regions you want to focus on. | |
1509 | We shall call these regular expressions @var{regexp-A}, @var{regexp-B} and | |
1510 | @var{regexp-C}. | |
1511 | Ediff will then start stepping through only those difference regions | |
1512 | where the region in buffer A matches @var{regexp-A} and/or the region in | |
1513 | buffer B matches @var{regexp-B}, etc. Whether `and' or `or' will be used | |
1514 | depends on how you respond to a question. | |
1515 | ||
1516 | When scanning difference regions for the aforesaid regular expressions, | |
1517 | Ediff narrows the buffers to those regions. This means that you can use | |
1518 | the expressions @kbd{\`} and @kbd{\'} to tie search to the beginning or end | |
1519 | of the difference regions. | |
1520 | ||
1521 | On the other hand, typing @kbd{#h} lets you specify (hide) uninteresting | |
1522 | regions. That is, if a difference region in buffer A matches | |
1523 | @var{regexp-A}, the corresponding region in buffer B matches @var{regexp-B} | |
1524 | and (if applicable) buffer C's region matches @var{regexp-C}, then the | |
1525 | region will be ignored by the commands @kbd{n}/@key{SPC} | |
1526 | (@code{ediff-next-difference}) and @kbd{p}/@key{DEL} | |
1527 | (@code{ediff-previous-difference}) commands. | |
1528 | ||
1529 | Typing @kbd{#f} and @kbd{#h} toggles selective browsing on and off. | |
1530 | ||
1531 | Note that selective browsing affects only @code{ediff-next-difference} | |
1532 | and @code{ediff-previous-difference}, i.e., the commands | |
1533 | @kbd{n}/@key{SPC} and @kbd{p}/@key{DEL}. @kbd{#f} and @kbd{#h} do not | |
1534 | change the position of the point in the buffers. And you can still jump | |
1535 | directly (using @kbd{j}) to any numbered | |
1536 | difference. | |
1537 | ||
1538 | Users can supply their own functions to specify how Ediff should do | |
1539 | selective browsing. To change the default Ediff function, add a function to | |
1540 | @code{ediff-load-hook} which will do the following assignments: | |
1541 | ||
1542 | @example | |
1543 | (setq ediff-hide-regexp-matches-function 'your-hide-function) | |
1544 | (setq ediff-focus-on-regexp-matches-function 'your-focus-function) | |
1545 | @end example | |
1546 | ||
1547 | @strong{Useful hint}: To specify a regexp that matches everything, don't | |
1548 | simply type @key{RET} in response to a prompt. Typing @key{RET} tells Ediff | |
1549 | to accept the default value, which may not be what you want. Instead, you | |
1550 | should enter something like @key{^} or @key{$}. These match every | |
1551 | line. | |
1552 | ||
1553 | You can use the status command, @kbd{i}, to find out whether | |
1554 | selective browsing is currently in effect. | |
1555 | ||
1556 | The regular expressions you specified are kept in the local variables | |
1557 | @code{ediff-regexp-focus-A}, @code{ediff-regexp-focus-B}, | |
1558 | @code{ediff-regexp-focus-C}, @code{ediff-regexp-hide-A}, | |
1559 | @code{ediff-regexp-hide-B}, @code{ediff-regexp-hide-C}. Their default value | |
1560 | is the empty string (i.e., nothing is hidden or focused on). To change the | |
1561 | default, set these variables in @file{.emacs} using @code{setq-default}. | |
1562 | ||
1563 | In addition to the ability to ignore regions that match regular | |
1564 | expressions, Ediff can be ordered to start skipping over certain | |
1565 | ``uninteresting'' difference regions. This is controlled by the following | |
1566 | variable: | |
1567 | ||
1568 | @table @code | |
1569 | @item ediff-ignore-similar-regions | |
1570 | @vindex ediff-ignore-similar-regions | |
1571 | If @code{t}, causes Ediff to skip over "uninteresting" difference regions, | |
1572 | which are the regions where the variants differ only in the amount of the | |
1573 | white space and newlines. This feature can be toggled on/off interactively, | |
1574 | via the command @kbd{##}. | |
1575 | @end table | |
1576 | ||
1577 | @strong{Please note:} in order for this feature to work, auto-refining of | |
1578 | difference regions must be on, since otherwise Ediff won't know if there | |
1579 | are fine differences between regions. On devices where Emacs can display | |
1580 | faces, auto-refining is a default, but it is not turned on by default on | |
1581 | text-only terminals. In that case, you must explicitly turn auto-refining | |
1582 | on (such as, by typing @kbd{@@}). | |
1583 | ||
1584 | @strong{Reassurance:} If many such uninteresting regions appear in a row, | |
1585 | Ediff may take a long time to skip over them because it has to compute fine | |
1586 | differences of all intermediate regions. This delay does not indicate any | |
1587 | problem. | |
1588 | ||
1589 | @vindex ediff-ignore-case-option | |
1590 | @vindex ediff-ignore-case-option3 | |
1591 | @vindex ediff-ignore-case | |
1592 | Finally, Ediff can be told to ignore the case of the letters. This behavior | |
1593 | can be toggled with @kbd{#c} and it is controlled with three variables: | |
1594 | @code{ediff-ignore-case-option}, @code{ediff-ignore-case-option3}, and | |
1595 | @code{ediff-ignore-case}. | |
1596 | ||
1597 | The variable @code{ediff-ignore-case-option} specifies the option to pass | |
1598 | to the diff program for comparing two files or buffers. For GNU | |
1599 | @code{diff}, this option is @code{"-i"}. The variable | |
1600 | @code{ediff-ignore-case-option3} specifies the option to pass to the | |
1601 | @code{diff3} program in order to make it case-insensitive. GNU @code{diff3} | |
1602 | does not have such an option, so when merging or comparing three files with | |
1603 | this program, ignoring the letter case is not supported. | |
1604 | ||
1605 | The variable @code{ediff-ignore-case} controls whether Ediff starts out by | |
1606 | ignoring letter case or not. It can be set in @file{.emacs} using | |
1607 | @code{setq-default}. | |
1608 | ||
1609 | When case sensitivity is toggled, all difference | |
1610 | regions are recomputed. | |
1611 | ||
563a450c | 1612 | @node Highlighting Difference Regions |
4009494e GM |
1613 | @section Highlighting Difference Regions |
1614 | ||
1615 | The following variables control the way Ediff highlights difference | |
1616 | regions: | |
1617 | ||
1618 | @table @code | |
1619 | @item ediff-before-flag-bol | |
1620 | @itemx ediff-after-flag-eol | |
1621 | @itemx ediff-before-flag-mol | |
1622 | @itemx ediff-after-flag-mol | |
1623 | @vindex ediff-before-flag-bol | |
1624 | @vindex ediff-after-flag-eol | |
1625 | @vindex ediff-before-flag-mol | |
1626 | @vindex ediff-after-flag-mol | |
1627 | These variables hold strings that Ediff uses to mark the beginning and the | |
1628 | end of the differences found in files A, B, and C on devices where Emacs | |
1629 | cannot display faces. Ediff uses different flags to highlight regions that | |
1630 | begin/end at the beginning/end of a line or in a middle of a line. | |
1631 | ||
1632 | @item ediff-current-diff-face-A | |
1633 | @itemx ediff-current-diff-face-B | |
1634 | @itemx ediff-current-diff-face-C | |
1635 | @vindex ediff-current-diff-face-A | |
1636 | @vindex ediff-current-diff-face-B | |
1637 | @vindex ediff-current-diff-face-C | |
1638 | Ediff uses these faces to highlight current differences on devices where | |
1639 | Emacs can display faces. These and subsequently described faces can be set | |
1640 | either in @file{.emacs} or in @file{.Xdefaults}. The X resource for Ediff | |
1641 | is @samp{Ediff}, @emph{not} @samp{emacs}. Please refer to Emacs manual for | |
1642 | the information on how to set X resources. | |
1643 | @item ediff-fine-diff-face-A | |
1644 | @itemx ediff-fine-diff-face-B | |
1645 | @itemx ediff-fine-diff-face-C | |
1646 | @vindex ediff-fine-diff-face-A | |
1647 | @vindex ediff-fine-diff-face-B | |
1648 | @vindex ediff-fine-diff-face-C | |
1649 | Ediff uses these faces to show the fine differences between the current | |
1650 | differences regions in buffers A, B, and C, respectively. | |
1651 | ||
1652 | @item ediff-even-diff-face-A | |
1653 | @itemx ediff-even-diff-face-B | |
1654 | @itemx ediff-even-diff-face-C | |
1655 | @itemx ediff-odd-diff-face-A | |
1656 | @itemx ediff-odd-diff-face-B | |
1657 | @itemx ediff-odd-diff-face-C | |
1658 | @vindex ediff-even-diff-face-A | |
1659 | @vindex ediff-even-diff-face-B | |
1660 | @vindex ediff-even-diff-face-C | |
1661 | @vindex ediff-odd-diff-face-A | |
1662 | @vindex ediff-odd-diff-face-B | |
1663 | @vindex ediff-odd-diff-face-C | |
1664 | Non-current difference regions are displayed using these alternating | |
1665 | faces. The odd and the even faces are actually identical on monochrome | |
1666 | displays, because without colors options are limited. | |
1667 | So, Ediff uses italics to highlight non-current differences. | |
1668 | ||
1669 | @item ediff-force-faces | |
1670 | @vindex ediff-force-faces | |
1671 | Ediff generally can detect when Emacs is running on a device where it can | |
1672 | use highlighting with faces. However, if it fails to determine that faces | |
1673 | can be used, the user can set this variable to @code{t} to make sure that | |
1674 | Ediff uses faces to highlight differences. | |
1675 | ||
1676 | @item ediff-highlight-all-diffs | |
1677 | @vindex ediff-highlight-all-diffs | |
1678 | Indicates whether---on a windowing display---Ediff should highlight | |
1679 | differences using inserted strings (as on text-only terminals) or using | |
1680 | colors and highlighting. Normally, Ediff highlights all differences, but | |
1681 | the selected difference is highlighted more visibly. One can cycle through | |
1682 | various modes of highlighting by typing @kbd{h}. By default, Ediff starts | |
1683 | in the mode where all difference regions are highlighted. If you prefer to | |
1684 | start in the mode where unselected differences are not highlighted, you | |
1685 | should set @code{ediff-highlight-all-diffs} to @code{nil}. Type @kbd{h} to | |
1686 | restore highlighting for all differences. | |
1687 | ||
1688 | Ediff lets you switch between the two modes of highlighting. That is, | |
1689 | you can switch interactively from highlighting using faces to | |
1690 | highlighting using string flags, and back. Of course, switching has | |
1691 | effect only under a windowing system. On a text-only terminal or in an | |
1692 | xterm window, the only available option is highlighting with strings. | |
1693 | @end table | |
1694 | ||
1695 | @noindent | |
1696 | If you want to change the default settings for @code{ediff-force-faces} and | |
1697 | @code{ediff-highlight-all-diffs}, you must do it @strong{before} Ediff is | |
1698 | loaded. | |
1699 | ||
1700 | You can also change the defaults for the faces used to highlight the | |
1701 | difference regions. There are two ways to do this. The simplest and the | |
1702 | preferred way is to use the customization widget accessible from the | |
1703 | menubar. Ediff's customization group is located under "Tools", which in | |
1704 | turn is under "Programming". The faces that are used to highlight | |
1705 | difference regions are located in the "Highlighting" subgroup of the Ediff | |
1706 | customization group. | |
1707 | ||
1708 | The second, much more arcane, method to change default faces is to include | |
1709 | some Lisp code in @file{~/.emacs}. For instance, | |
1710 | ||
1711 | @example | |
1712 | (setq ediff-current-diff-face-A | |
1713 | (copy-face 'bold-italic 'ediff-current-diff-face-A)) | |
1714 | @end example | |
1715 | ||
1716 | @noindent | |
1717 | would use the pre-defined face @code{bold-italic} to highlight the current | |
1718 | difference region in buffer A (this face is not a good choice, by the way). | |
1719 | ||
1720 | If you are unhappy with just @emph{some} of the aspects of the default | |
1721 | faces, you can modify them when Ediff is being loaded using | |
1722 | @code{ediff-load-hook}. For instance: | |
1723 | ||
1724 | @smallexample | |
1725 | (add-hook 'ediff-load-hook | |
1726 | (lambda () | |
1727 | (set-face-foreground | |
1728 | ediff-current-diff-face-B "blue") | |
1729 | (set-face-background | |
1730 | ediff-current-diff-face-B "red") | |
1731 | (make-face-italic | |
1732 | ediff-current-diff-face-B))) | |
1733 | @end smallexample | |
1734 | ||
1735 | @strong{Please note:} to set Ediff's faces, use only @code{copy-face} | |
44e97401 | 1736 | or @code{set/make-face-@dots{}} as shown above. Emacs's low-level |
4009494e GM |
1737 | face-manipulation functions should be avoided. |
1738 | ||
563a450c | 1739 | @node Narrowing |
4009494e GM |
1740 | @section Narrowing |
1741 | ||
1742 | If buffers being compared are narrowed at the time of invocation of | |
1743 | Ediff, @code{ediff-buffers} will preserve the narrowing range. However, | |
1744 | if @code{ediff-files} is invoked on the files visited by these buffers, | |
1745 | that would widen the buffers, since this command is defined to compare the | |
1746 | entire files. | |
1747 | ||
1748 | Calling @code{ediff-regions-linewise} or @code{ediff-windows-linewise}, or | |
1749 | the corresponding @samp{-wordwise} commands, narrows the variants to the | |
1750 | particular regions being compared. The original accessible ranges are | |
1751 | restored when you quit Ediff. During the command, you can toggle this | |
1752 | narrowing on and off with the @kbd{%} command. | |
1753 | ||
1754 | These two variables control this narrowing behavior: | |
1755 | ||
1756 | @table @code | |
1757 | @item ediff-start-narrowed | |
1758 | @vindex ediff-start-narrowed | |
1759 | If @code{t}, Ediff narrows the display to the appropriate range when it | |
1760 | is invoked with an @samp{ediff-regions@dots{}} or | |
1761 | @samp{ediff-windows@dots{}} command. If @code{nil}, these commands do | |
1762 | not automatically narrow, but you can still toggle narrowing on and off | |
1763 | by typing @kbd{%}. | |
1764 | ||
1765 | @item ediff-quit-widened | |
1766 | @vindex ediff-quit-widened | |
1767 | Controls whether on quitting Ediff should restore the accessible range | |
1768 | that existed before the current invocation. | |
1769 | @end table | |
1770 | ||
563a450c | 1771 | @node Refinement of Difference Regions |
4009494e GM |
1772 | @section Refinement of Difference Regions |
1773 | ||
1774 | Ediff has variables to control the way fine differences are | |
1775 | highlighted. This feature gives you control over the process of refinement. | |
1776 | Note that refinement ignores spaces, tabs, and newlines. | |
1777 | ||
1778 | @table @code | |
1779 | @item ediff-auto-refine | |
1780 | @vindex ediff-auto-refine | |
1781 | This variable controls whether fine differences within regions are | |
1782 | highlighted automatically (``auto-refining''). The default is yes | |
1783 | (@samp{on}). | |
1784 | ||
1785 | On a slow machine, automatic refinement may be painful. In that case, | |
1786 | you can turn auto-refining on or off interactively by typing | |
1787 | @kbd{@@}. You can also turn off display of refining that has | |
1788 | already been done. | |
1789 | ||
1790 | When auto-refining is off, fine differences are shown only for regions | |
1791 | for which these differences have been computed and saved before. If | |
1792 | auto-refining and display of refining are both turned off, fine | |
1793 | differences are not shown at all. | |
1794 | ||
1795 | Typing @kbd{*} computes and displays fine differences for the current | |
1796 | difference region, regardless of whether auto-refining is turned on. | |
1797 | ||
1798 | @item ediff-auto-refine-limit | |
1799 | @vindex ediff-auto-refine-limit | |
1800 | If auto-refining is on, this variable limits the size of the regions to | |
1801 | be auto-refined. This guards against the possible slowdown that may be | |
1802 | caused by extraordinary large difference regions. | |
1803 | ||
1804 | You can always refine the current region by typing @kbd{*}. | |
1805 | ||
1806 | @item ediff-forward-word-function | |
1807 | @vindex ediff-forward-word-function | |
1808 | This variable controls how fine differences are computed. The | |
1809 | value must be a Lisp function that determines how the current difference | |
1810 | region should be split into words. | |
1811 | ||
1812 | @vindex ediff-diff-program | |
1813 | @vindex ediff-forward-word-function | |
1814 | @findex ediff-forward-word | |
1815 | Fine differences are computed by first splitting the current difference | |
1816 | region into words and then passing the result to | |
1817 | @code{ediff-diff-program}. For the default forward word function (which is | |
1818 | @code{ediff-forward-word}), a word is a string consisting of letters, | |
1819 | @samp{-}, or @samp{_}; a string of punctuation symbols; a string of digits, | |
1820 | or a string consisting of symbols that are neither space, nor a letter. | |
1821 | ||
1822 | This default behavior is controlled by four variables: @code{ediff-word-1}, | |
1823 | ..., @code{ediff-word-4}. See the on-line documentation for these variables | |
1824 | and for the function @code{ediff-forward-word} for an explanation of how to | |
1825 | modify these variables. | |
1826 | @vindex ediff-word-1 | |
1827 | @vindex ediff-word-2 | |
1828 | @vindex ediff-word-3 | |
1829 | @vindex ediff-word-4 | |
1830 | @end table | |
1831 | ||
1832 | Sometimes, when a region has too many differences between the variants, | |
1833 | highlighting of fine differences is inconvenient, especially on | |
1834 | color displays. If that is the case, type @kbd{*} with a negative | |
1835 | prefix argument. This unhighlights fine differences for the current | |
1836 | region. | |
1837 | ||
1838 | To unhighlight fine differences in all difference regions, use the | |
1839 | command @kbd{@@}. Repeated typing of this key cycles through three | |
1840 | different states: auto-refining, no-auto-refining, and no-highlighting | |
1841 | of fine differences. | |
1842 | ||
563a450c | 1843 | @node Patch and Diff Programs |
4009494e GM |
1844 | @section Patch and Diff Programs |
1845 | ||
1846 | This section describes variables that specify the programs to be used for | |
1847 | applying patches and for computing the main difference regions (not the | |
1848 | fine difference regions): | |
1849 | ||
1850 | @table @code | |
1851 | @item ediff-diff-program | |
1852 | @itemx ediff-diff3-program | |
1853 | @vindex ediff-patch-program | |
1854 | @vindex ediff-diff-program | |
1855 | @vindex ediff-diff3-program | |
1856 | These variables specify the programs to use to produce differences | |
1857 | and do patching. | |
1858 | ||
1859 | @item ediff-diff-options | |
1860 | @itemx ediff-diff3-options | |
1861 | @vindex ediff-patch-options | |
1862 | @vindex ediff-diff-options | |
1863 | @vindex ediff-diff3-options | |
1864 | These variables specify the options to pass to the above utilities. | |
1865 | ||
1866 | In @code{ediff-diff-options}, it may be useful to specify options | |
1867 | such as @samp{-w} that ignore certain kinds of changes. However, | |
1868 | Ediff does not let you use the option @samp{-c}, as it doesn't recognize this | |
1869 | format yet. | |
1870 | ||
1871 | @item ediff-coding-system-for-read | |
1872 | @vindex ediff-coding-system-for-read | |
1873 | This variable specifies the coding system to use when reading the output | |
1874 | that the programs @code{diff3} and @code{diff} send to Emacs. The default | |
1875 | is @code{raw-text}, and this should work fine in Unix and in most | |
1876 | cases under Windows NT/95/98/2000. There are @code{diff} programs | |
1877 | for which the default option doesn't work under Windows. In such cases, | |
1878 | @code{raw-text-dos} might work. If not, you will have to experiment with | |
1879 | other coding systems or use GNU diff. | |
1880 | ||
1881 | @item ediff-patch-program | |
1882 | The program to use to apply patches. Since there are certain | |
1883 | incompatibilities between the different versions of the patch program, the | |
1884 | best way to stay out of trouble is to use a GNU-compatible version. | |
1885 | Otherwise, you may have to tune the values of the variables | |
1886 | @code{ediff-patch-options}, @code{ediff-backup-specs}, and | |
1887 | @code{ediff-backup-extension} as described below. | |
1888 | @item ediff-patch-options | |
1889 | Options to pass to @code{ediff-patch-program}. | |
1890 | ||
1891 | Note: the `-b' and `-z' options should be specified in | |
1892 | `ediff-backup-specs', not in @code{ediff-patch-options}. | |
1893 | ||
1894 | It is recommended to pass the `-f' option to the patch program, so it won't | |
1895 | ask questions. However, some implementations don't accept this option, in | |
1896 | which case the default value of this variable should be changed. | |
1897 | ||
1898 | @item ediff-backup-extension | |
1899 | Backup extension used by the patch program. Must be specified, even if | |
1900 | @code{ediff-backup-specs} is given. | |
1901 | @item ediff-backup-specs | |
1902 | Backup directives to pass to the patch program. | |
1903 | Ediff requires that the old version of the file (before applying the patch) | |
1904 | is saved in a file named @file{the-patch-file.extension}. Usually | |
1905 | `extension' is `.orig', but this can be changed by the user, and may also be | |
1906 | system-dependent. Therefore, Ediff needs to know the backup extension used | |
1907 | by the patch program. | |
1908 | ||
1909 | Some versions of the patch program let the user specify `-b backup-extension'. | |
1910 | Other versions only permit `-b', which (usually) assumes the extension `.orig'. | |
1911 | Yet others force you to use `-z<backup-extension>'. | |
1912 | ||
1913 | Note that both `ediff-backup-extension' and `ediff-backup-specs' must be | |
1914 | properly set. If your patch program takes the option `-b', but not | |
1915 | `-b extension', the variable `ediff-backup-extension' must still | |
1916 | be set so Ediff will know which extension to use. | |
1917 | ||
1918 | @item ediff-custom-diff-program | |
1919 | @itemx ediff-custom-diff-options | |
1920 | @vindex ediff-custom-diff-program | |
1921 | @vindex ediff-custom-diff-options | |
1922 | @findex ediff-save-buffer | |
1923 | Because Ediff limits the options you may want to pass to the @code{diff} | |
1924 | program, it partially makes up for this drawback by letting you save the | |
1925 | output from @code{diff} in your preferred format, which is specified via | |
1926 | the above two variables. | |
1927 | ||
1928 | The output generated by @code{ediff-custom-diff-program} (which doesn't | |
1929 | even have to be a standard-style @code{diff}!)@: is not used by Ediff. It is | |
1930 | provided exclusively so that you can | |
1931 | refer to | |
1932 | it later, send it over email, etc. For instance, after reviewing the | |
1933 | differences, you may want to send context differences to a colleague. | |
1934 | Since Ediff ignores the @samp{-c} option in | |
1935 | @code{ediff-diff-program}, you would have to run @code{diff -c} separately | |
1936 | just to produce the list of differences. Fortunately, | |
1937 | @code{ediff-custom-diff-program} and @code{ediff-custom-diff-options} | |
1938 | eliminate this nuisance by keeping a copy of a difference list in the | |
1939 | desired format in a buffer that can be displayed via the command @kbd{D}. | |
1940 | ||
1941 | @item ediff-patch-default-directory | |
1942 | @vindex ediff-patch-default-directory | |
1943 | Specifies the default directory to look for patches. | |
1944 | ||
1945 | @end table | |
1946 | ||
1947 | @noindent | |
1948 | @strong{Warning:} Ediff does not support the output format of VMS | |
1949 | @code{diff}. Instead, make sure you are using some implementation of POSIX | |
1950 | @code{diff}, such as @code{gnudiff}. | |
1951 | ||
563a450c | 1952 | @node Merging and diff3 |
4009494e GM |
1953 | @section Merging and diff3 |
1954 | ||
1955 | Ediff supports three-way comparison via the functions @code{ediff-files3} and | |
1956 | @code{ediff-buffers3}. The interface is the same as for two-way comparison. | |
1957 | In three-way comparison and merging, Ediff reports if any two difference | |
1958 | regions are identical. For instance, if the current region in buffer A | |
1959 | is the same as the region in buffer C, then the mode line of buffer A will | |
1960 | display @samp{[=diff(C)]} and the mode line of buffer C will display | |
1961 | @samp{[=diff(A)]}. | |
1962 | ||
1963 | Merging is done according to the following algorithm. | |
1964 | ||
1965 | If a difference region in one of the buffers, say B, differs from the ancestor | |
1966 | file while the region in the other buffer, A, doesn't, then the merge buffer, | |
1967 | C, gets B's region. Similarly when buffer A's region differs from | |
1968 | the ancestor and B's doesn't, A's region is used. | |
1969 | ||
1970 | @vindex ediff-default-variant | |
1971 | If both regions in buffers A and B differ from the ancestor file, Ediff | |
1972 | chooses the region according to the value of the variable | |
1973 | @code{ediff-default-variant}. If its value is @code{default-A} then A's | |
1974 | region is chosen. If it is @code{default-B} then B's region is chosen. | |
1975 | If it is @code{combined} then the region in buffer C will look like | |
1976 | this: | |
1977 | ||
1978 | @comment Use @set to avoid triggering merge conflict detectors like CVS. | |
1979 | @set seven-left <<<<<<< | |
1980 | @set seven-right >>>>>>> | |
1981 | @example | |
1982 | @value{seven-left} variant A | |
1983 | the difference region from buffer A | |
1984 | @value{seven-right} variant B | |
1985 | the difference region from buffer B | |
1986 | ####### Ancestor | |
1987 | the difference region from the ancestor buffer, if available | |
1988 | ======= end | |
1989 | @end example | |
1990 | ||
1991 | The above is the default template for the combined region. The user can | |
1992 | customize this template using the variable | |
1993 | @code{ediff-combination-pattern}. | |
1994 | ||
1995 | @vindex ediff-combination-pattern | |
1996 | The variable @code{ediff-combination-pattern} specifies the template that | |
1997 | determines how the combined merged region looks like. The template is | |
1998 | represented as a list of the form @code{(STRING1 Symbol1 STRING2 Symbol2 | |
1999 | STRING3 Symbol3 STRING4)}. The symbols here must be atoms of the form | |
2000 | @code{A}, @code{B}, or @code{Ancestor}. They determine the order in which | |
2001 | the corresponding difference regions (from buffers A, B, and the ancestor | |
1df7defd | 2002 | buffer) are displayed in the merged region of buffer C@. The strings in the |
4009494e GM |
2003 | template determine the text that separates the aforesaid regions. The |
2004 | default template is | |
2005 | ||
2006 | @smallexample | |
2007 | ("@value{seven-left} variant A" A "@value{seven-right} variant B" B | |
2008 | "####### Ancestor" Ancestor "======= end") | |
2009 | @end smallexample | |
2010 | ||
2011 | @noindent | |
2012 | (this is one long line) and the corresponding combined region is shown | |
2013 | above. The order in which the regions are shown (and the separator | |
2014 | strings) can be changed by changing the above template. It is even | |
2015 | possible to add or delete region specifiers in this template (although | |
2016 | the only possibly useful such modification seems to be the deletion of | |
2017 | the ancestor). | |
2018 | ||
2019 | In addition to the state of the difference, Ediff displays the state of the | |
2020 | merge for each region. If a difference came from buffer A by default | |
2021 | (because both regions A and B were different from the ancestor and | |
2022 | @code{ediff-default-variant} was set to @code{default-A}) then | |
2023 | @samp{[=diff(A) default-A]} is displayed in the mode line. If the | |
2024 | difference in buffer C came, say, from buffer B because the difference | |
2025 | region in that buffer differs from the ancestor, but the region in buffer A | |
2026 | does not (if merging with an ancestor) then @samp{[=diff(B) prefer-B]} is | |
2027 | displayed. The indicators default-A/B and prefer-A/B are inspired by | |
2028 | Emerge and have the same meaning. | |
2029 | ||
2030 | Another indicator of the state of merge is @samp{combined}. It appears | |
2031 | with any difference region in buffer C that was obtained by combining | |
2032 | the difference regions in buffers A and B as explained above. | |
2033 | ||
2034 | In addition to the state of merge and state of difference indicators, while | |
2035 | merging with an ancestor file or buffer, Ediff informs the user when the | |
2036 | current difference region in the (normally invisible) ancestor buffer is | |
2037 | empty via the @emph{AncestorEmpty} indicator. This helps determine if the | |
2038 | changes made to the original in variants A and B represent pure insertion | |
2039 | or deletion of text: if the mode line shows @emph{AncestorEmpty} and the | |
2040 | corresponding region in buffers A or B is not empty, this means that new | |
2041 | text was inserted. If this indicator is not present and the difference | |
2042 | regions in buffers A or B are non-empty, this means that text was | |
2043 | modified. Otherwise, the original text was deleted. | |
2044 | ||
2045 | Although the ancestor buffer is normally invisible, Ediff maintains | |
2046 | difference regions there and advances the current difference region | |
2047 | accordingly. All highlighting of difference regions is provided in the | |
2048 | ancestor buffer, except for the fine differences. Therefore, if desired, the | |
2049 | user can put the ancestor buffer in a separate frame and watch it | |
2050 | there. However, on a TTY, only one frame can be visible at any given time, | |
2051 | and Ediff doesn't support any single-frame window configuration where all | |
2052 | buffers, including the ancestor buffer, would be visible. However, the | |
2053 | ancestor buffer can be displayed by typing @kbd{/} to the control | |
2054 | window. (Type @kbd{C-l} to hide it again.) | |
2055 | ||
2056 | Note that the state-of-difference indicators @samp{=diff(A)} and | |
2057 | @samp{=diff(B)} above are not redundant, even in the presence of a | |
2058 | state-of-merge indicator. In fact, the two serve different purposes. | |
2059 | ||
2060 | For instance, if the mode line displays @samp{=diff(B) prefer(B)} and | |
2061 | you copy a difference region from buffer A to buffer C then | |
2062 | @samp{=diff(B)} will change to @samp{diff-A} and the mode line will | |
2063 | display @samp{=diff(A) prefer-B}. This indicates that the difference | |
2064 | region in buffer C is identical to that in buffer A, but originally | |
1df7defd | 2065 | buffer C's region came from buffer B@. This is useful to know because |
4009494e GM |
2066 | you can recover the original difference region in buffer C by typing |
2067 | @kbd{r}. | |
2068 | ||
2069 | ||
2070 | Ediff never changes the state-of-merge indicator, except in response to | |
2071 | the @kbd{!} command (see below), in which case the indicator is lost. | |
2072 | On the other hand, the state-of-difference indicator is changed | |
2073 | automatically by the copying/recovery commands, @kbd{a}, @kbd{b}, @kbd{r}, | |
2074 | @kbd{+}. | |
2075 | ||
2076 | The @kbd{!} command loses the information about origins of the regions | |
2077 | in the merge buffer (default-A, prefer-B, or combined). This is because | |
2078 | recomputing differences in this case means running @code{diff3} on | |
2079 | buffers A, B, and the merge buffer, not on the ancestor buffer. (It | |
2080 | makes no sense to recompute differences using the ancestor file, since | |
2081 | in the merging mode Ediff assumes that you have not edited buffers A and | |
2082 | B, but that you may have edited buffer C, and these changes are to be | |
2083 | preserved.) Since some difference regions may disappear as a result of | |
2084 | editing buffer C and others may arise, there is generally no simple way | |
2085 | to tell where the various regions in the merge buffer came from. | |
2086 | ||
2087 | In three-way comparison, Ediff tries to disregard regions that consist | |
2088 | entirely of white space. For instance, if, say, the current region in | |
2089 | buffer A consists of the white space only (or if it is empty), Ediff will | |
2090 | not take it into account for the purpose of computing fine differences. The | |
2091 | result is that Ediff can provide a better visual information regarding the | |
2092 | actual fine differences in the non-white regions in buffers B and | |
1df7defd | 2093 | C@. Moreover, if the regions in buffers B and C differ in the white space |
4009494e GM |
2094 | only, then a message to this effect will be displayed. |
2095 | ||
2096 | @vindex ediff-merge-window-share | |
2097 | In the merge mode, the share of the split between window C (the window | |
2098 | displaying the merge-buffer) and the windows displaying buffers A and B | |
2099 | is controlled by the variable @code{ediff-merge-window-share}. Its | |
2100 | default value is 0.5. To make the merge-buffer window smaller, reduce | |
2101 | this amount. | |
2102 | ||
2103 | We don't recommend increasing the size of the merge-window to more than | |
2104 | half the frame (i.e., to increase the value of | |
2105 | @code{ediff-merge-window-share}) to more than 0.5, since it would be | |
2106 | hard to see the contents of buffers A and B. | |
2107 | ||
2108 | You can temporarily shrink the merge window to just one line by | |
2109 | typing @kbd{s}. This change is temporary, until Ediff finds a reason to | |
2110 | redraw the screen. Typing @kbd{s} again restores the original window size. | |
2111 | ||
2112 | With a positive prefix argument, the @kbd{s} command will make the merge | |
2113 | window slightly taller. This change is persistent. With `@kbd{-}' or | |
2114 | with a negative prefix argument, the command @kbd{s} makes the merge | |
2115 | window slightly shorter. This change also persistent. | |
2116 | ||
2117 | @vindex ediff-show-clashes-only | |
2118 | Ediff lets you automatically ignore the regions where only one of the | |
2119 | buffers A and B disagrees with the ancestor. To do this, set the | |
2120 | variable @code{ediff-show-clashes-only} to non-@code{nil}. | |
2121 | ||
2122 | You can toggle this feature interactively by typing @kbd{$$}. | |
2123 | ||
2124 | Note that this variable affects only the show next/previous difference | |
2125 | commands. You can still jump directly to any difference region directly | |
2126 | using the command @kbd{j} (with a prefix argument specifying the difference | |
2127 | number). | |
2128 | ||
2129 | @vindex ediff-autostore-merges | |
2130 | @vindex ediff-quit-merge-hook | |
2131 | @findex ediff-maybe-save-and-delete-merge | |
2132 | The variable @code{ediff-autostore-merges} controls what happens to the | |
2133 | merge buffer when Ediff quits. If the value is @code{nil}, nothing is done | |
2134 | to the merge buffer---it will be the user's responsibility to save it. | |
2135 | If the value is @code{t}, the user will be asked where to save the buffer | |
2136 | and whether to delete it afterwards. It the value is neither @code{nil} nor | |
2137 | @code{t}, the merge buffer is saved @emph{only} if this merge session was | |
2138 | invoked from a group of related Ediff session, such as those that result | |
2139 | from @code{ediff-merge-directories}, | |
2140 | @code{ediff-merge-directory-revisions}, etc. | |
2141 | @xref{Session Groups}. This behavior is implemented in the function | |
2142 | @code{ediff-maybe-save-and-delete-merge}, which is a hook in | |
2143 | @code{ediff-quit-merge-hook}. The user can supply a different hook, if | |
2144 | necessary. | |
2145 | ||
2146 | The variable @code{ediff-autostore-merges} is buffer-local, so it can be | |
2147 | set in a per-buffer manner. Therefore, use @code{setq-default} to globally | |
2148 | change this variable. | |
2149 | ||
2150 | @vindex ediff-merge-filename-prefix | |
2151 | When merge buffers are saved automatically as directed by | |
2152 | @code{ediff-autostore-merges}, Ediff attaches a prefix to each file, as | |
2153 | specified by the variable @code{ediff-merge-filename-prefix}. The default | |
2154 | is @code{merge_}, but this can be changed by the user. | |
2155 | ||
563a450c | 2156 | @node Support for Version Control |
4009494e GM |
2157 | @section Support for Version Control |
2158 | ||
2159 | ||
2160 | Ediff supports version control and lets you compare versions of files | |
2161 | visited by Emacs buffers via the function @code{ediff-revision}. This | |
2162 | feature is controlled by the following variables: | |
2163 | ||
2164 | @table @code | |
2165 | @item ediff-version-control-package | |
2166 | @vindex ediff-version-control-package | |
2167 | A symbol. The default is @samp{vc}. | |
2168 | ||
2169 | If you are like most Emacs users, Ediff will use VC as the version control | |
2170 | package. This is the standard Emacs interface to RCS, CVS, and SCCS. | |
2171 | ||
2172 | However, if your needs are better served by other interfaces, you will | |
2173 | have to tell Ediff which version control package you are using, e.g., | |
2174 | @example | |
2175 | (setq ediff-version-control-package 'rcs) | |
2176 | @end example | |
2177 | ||
2178 | Apart from the standard @file{vc.el}, Ediff supports three other interfaces | |
2179 | to version control: @file{rcs.el}, @file{pcl-cvs.el} (recently renamed | |
2180 | pcvs.el), and @file{generic-sc.el}. The package @file{rcs.el} is written | |
2181 | by Sebastian Kremer <sk@@thp.Uni-Koeln.DE> and is available as | |
2182 | @example | |
2183 | @file{ftp.cs.buffalo.edu:pub/Emacs/rcs.tar.Z} | |
2184 | @file{ftp.uni-koeln.de:/pub/gnu/emacs/rcs.tar.Z} | |
2185 | @end example | |
2186 | @pindex @file{vc.el} | |
2187 | @pindex @file{rcs.el} | |
2188 | @pindex @file{pcl-cvs.el} | |
2189 | @pindex @file{generic-sc.el} | |
2190 | @end table | |
2191 | ||
2192 | Ediff's interface to the above packages allows the user to compare the | |
2193 | versions of the current buffer or to merge them (with or without an | |
2194 | ancestor-version). These operations can also be performed on directories | |
2195 | containing files under version control. | |
2196 | ||
2197 | In case of @file{pcl-cvs.el}, Ediff can also be invoked via the function | |
2198 | @code{run-ediff-from-cvs-buffer}---see the documentation string for this | |
2199 | function. | |
2200 | ||
563a450c | 2201 | @node Customizing the Mode Line |
4009494e GM |
2202 | @section Customizing the Mode Line |
2203 | ||
2204 | When Ediff is running, the mode line of @samp{Ediff Control Panel} | |
2205 | buffer shows the current difference number and the total number of | |
2206 | difference regions in the two files. | |
2207 | ||
2208 | The mode line of the buffers being compared displays the type of the | |
2209 | buffer (@samp{A:}, @samp{B:}, or @samp{C:}) and (usually) the file name. | |
2210 | Ediff tries to be intelligent in choosing the mode line buffer | |
2211 | identification. In particular, it works well with the | |
2212 | @file{uniquify.el} and @file{mode-line.el} packages (which improve on | |
2213 | the default way in which Emacs displays buffer identification). If you | |
2214 | don't like the way Ediff changes the mode line, you can use | |
2215 | @code{ediff-prepare-buffer-hook} to modify the mode line. | |
2216 | @vindex ediff-prepare-buffer-hook | |
2217 | @pindex @file{uniquify.el} | |
2218 | @pindex @file{mode-line.el} | |
2219 | ||
563a450c | 2220 | @node Miscellaneous |
4009494e GM |
2221 | @section Miscellaneous |
2222 | ||
2223 | Here are a few other variables for customizing Ediff: | |
2224 | ||
2225 | @table @code | |
2226 | @item ediff-split-window-function | |
2227 | @vindex ediff-split-window-function | |
2228 | Controls the way you want the window be split between file-A and file-B | |
2229 | (and file-C, if applicable). It defaults to the vertical split | |
2230 | (@code{split-window-vertically}, but you can set it to | |
2231 | @code{split-window-horizontally}, if you so wish. | |
2232 | Ediff also lets you switch from vertical to horizontal split and back | |
2233 | interactively. | |
2234 | ||
2235 | Note that if Ediff detects that all the buffers it compares are displayed in | |
2236 | separate frames, it assumes that the user wants them to be so displayed | |
2237 | and stops splitting windows. Instead, it arranges for each buffer to | |
2238 | be displayed in a separate frame. You can switch to the one-frame mode | |
2239 | by hiding one of the buffers A/B/C. | |
2240 | ||
2241 | You can also swap the windows where buffers are displayed by typing | |
2242 | @kbd{~}. | |
2243 | ||
2244 | @item ediff-merge-split-window-function | |
2245 | @vindex ediff-merge-split-window-function | |
2246 | Controls how windows are | |
2247 | split between buffers A and B in the merge mode. | |
2248 | This variable is like @code{ediff-split-window-function}, but it defaults | |
2249 | to @code{split-window-horizontally} instead of | |
2250 | @code{split-window-vertically}. | |
2251 | ||
2252 | @item ediff-make-wide-display-function | |
2253 | @vindex ediff-make-wide-display-function | |
2254 | The value is a function to be called to widen the frame for displaying | |
2255 | the Ediff buffers. See the on-line documentation for | |
2256 | @code{ediff-make-wide-display-function} for details. It is also | |
2257 | recommended to look into the source of the default function | |
2258 | @code{ediff-make-wide-display}. | |
2259 | ||
2260 | You can toggle wide/regular display by typing @kbd{m}. In the wide | |
2261 | display mode, buffers A, B (and C, when applicable) are displayed in a | |
2262 | single frame that is as wide as the entire workstation screen. This is | |
2263 | useful when files are compared side-by-side. By default, the display is | |
2264 | widened without changing its height. | |
2265 | ||
2266 | @item ediff-use-last-dir | |
2267 | @vindex ediff-use-last-dir | |
2268 | Controls the way Ediff presents the | |
2269 | default directory when it prompts the user for files to compare. If | |
2270 | @code{nil}, | |
2271 | Ediff uses the default directory of the current buffer when it | |
2272 | prompts the user for file names. Otherwise, it will use the | |
2273 | directories it had previously used for files A, B, or C, respectively. | |
2274 | ||
2275 | @item ediff-no-emacs-help-in-control-buffer | |
2276 | @vindex ediff-no-emacs-help-in-control-buffer | |
2277 | If @code{t}, makes @kbd{C-h} | |
2278 | behave like the @key{DEL} key, i.e., it will move you back to the previous | |
2279 | difference rather than invoking help. This is useful when, in an xterm | |
2280 | window or a text-only terminal, the Backspace key is bound to @kbd{C-h} and is | |
2281 | positioned more conveniently than the @key{DEL} key. | |
2282 | ||
2283 | @item ediff-toggle-read-only-function | |
2284 | @vindex ediff-toggle-read-only-function | |
2285 | This variable's value is a function that Ediff uses to toggle | |
2286 | the read-only property in its buffers. | |
2287 | ||
2288 | The default function that Ediff uses simply toggles the read-only property, | |
2289 | unless the file is under version control. For a checked-in file under | |
2290 | version control, Ediff first tries to check the file out. | |
2291 | ||
2292 | @item ediff-make-buffers-readonly-at-startup nil | |
2293 | @vindex ediff-make-buffers-readonly-at-startup | |
2294 | If @code{t}, all variant buffers are made read-only at Ediff startup. | |
2295 | ||
2296 | @item ediff-keep-variants | |
2297 | @vindex @code{ediff-keep-variants} | |
2298 | The default is @code{t}, meaning that the buffers being compared or merged will | |
2299 | be preserved when Ediff quits. Setting this to @code{nil} causes Ediff to | |
2300 | offer the user a chance to delete these buffers (if they are not modified). | |
2301 | Supplying a prefix argument to the quit command (@code{q}) temporarily | |
2302 | reverses the meaning of this variable. This is convenient when the user | |
2303 | prefers one of the behaviors most of the time, but occasionally needs the | |
2304 | other behavior. | |
2305 | ||
2306 | However, Ediff temporarily resets this variable to @code{t} if it is | |
2307 | invoked via one of the "buffer" jobs, such as @code{ediff-buffers}. | |
537b04b9 | 2308 | This is because it is all too easy to lose a day's work otherwise. |
4009494e GM |
2309 | Besides, in a "buffer" job, the variant buffers have already been loaded |
2310 | prior to starting Ediff, so Ediff just preserves status quo here. | |
2311 | ||
2312 | Using @code{ediff-cleanup-hook}, one can make Ediff delete the variants | |
2313 | unconditionally (e.g., by making @code{ediff-janitor} into one of these hooks). | |
2314 | ||
2315 | @item ediff-keep-tmp-versions | |
2316 | @vindex @code{ediff-keep-tmp-versions} | |
2317 | Default is @code{nil}. If @code{t}, the versions of the files being | |
2318 | compared or merged using operations such as @code{ediff-revision} or | |
2319 | @code{ediff-merge-revisions} are not deleted on exit. The normal action is | |
2320 | to clean up and delete these version files. | |
2321 | ||
2322 | @item ediff-grab-mouse | |
2323 | @vindex @code{ediff-grab-mouse} | |
2324 | Default is @code{t}. Normally, Ediff grabs mouse and puts it in its | |
2325 | control frame. This is useful since the user can be sure that when he | |
2326 | needs to type an Ediff command the focus will be in an appropriate Ediff's | |
2327 | frame. However, some users prefer to move the mouse by themselves. The | |
2328 | above variable, if set to @code{maybe}, will prevent Ediff from grabbing | |
2329 | the mouse in many situations, usually after commands that may take more | |
2330 | time than usual. In other situation, Ediff will continue grabbing the mouse | |
2331 | and putting it where it believes is appropriate. If the value is | |
2332 | @code{nil}, then mouse is entirely user's responsibility. | |
2333 | Try different settings and see which one is for you. | |
2334 | @end table | |
2335 | ||
2336 | ||
563a450c | 2337 | @node Notes on Heavy-duty Customization |
4009494e GM |
2338 | @section Notes on Heavy-duty Customization |
2339 | ||
2340 | Some users need to customize Ediff in rather sophisticated ways, which | |
2341 | requires different defaults for different kinds of files (e.g., SGML, | |
2342 | etc.). Ediff supports this kind of customization in several ways. First, | |
2343 | most customization variables are buffer-local. Those that aren't are | |
2344 | usually accessible from within Ediff Control Panel, so one can make them | |
2345 | local to the panel by calling make-local-variable from within | |
2346 | @code{ediff-startup-hook}. | |
2347 | ||
2348 | Second, the function @code{ediff-setup} accepts an optional sixth | |
2349 | argument which has the form @code{((@var{var-name-1} .@: @var{val-1}) | |
2350 | (@var{var-name-2} .@: @var{val-2}) @dots{})}. The function | |
2351 | @code{ediff-setup} sets the variables in the list to the respective | |
2352 | values, locally in the Ediff control buffer. This is an easy way to | |
2353 | throw in custom variables (which usually should be buffer-local) that | |
2354 | can then be tested in various hooks. | |
2355 | ||
2356 | Make sure the variable @code{ediff-job-name} and @code{ediff-word-mode} are set | |
2357 | properly in this case, as some things in Ediff depend on this. | |
2358 | ||
2359 | Finally, if you want custom-tailored help messages, you can set the | |
2360 | variables @code{ediff-brief-help-message-function} and | |
2361 | @code{ediff-long-help-message-function} | |
2362 | to functions that return help strings. | |
2363 | @vindex ediff-startup-hook | |
2364 | @findex ediff-setup | |
2365 | @vindex ediff-job-name | |
2366 | @vindex ediff-word-mode | |
2367 | @vindex ediff-brief-help-message-function | |
2368 | @vindex ediff-long-help-message-function | |
2369 | ||
2370 | When customizing Ediff, some other variables are useful, although they are | |
2371 | not user-definable. They are local to the Ediff control buffer, so this | |
2372 | buffer must be current when you access these variables. The control buffer | |
2373 | is accessible via the variable @code{ediff-control-buffer}, which is also | |
2374 | local to that buffer. It is usually used for checking if the current buffer | |
2375 | is also the control buffer. | |
2376 | ||
2377 | Other variables of interest are: | |
2378 | @table @code | |
2379 | @item ediff-buffer-A | |
2380 | The first of the data buffers being compared. | |
2381 | ||
2382 | @item ediff-buffer-B | |
2383 | The second of the data buffers being compared. | |
2384 | ||
2385 | @item ediff-buffer-C | |
2386 | In three-way comparisons, this is the third buffer being compared. | |
2387 | In merging, this is the merge buffer. | |
2388 | In two-way comparison, this variable is @code{nil}. | |
2389 | ||
2390 | @item ediff-window-A | |
1df7defd | 2391 | The window displaying buffer A@. If buffer A is not visible, this variable |
4009494e GM |
2392 | is @code{nil} or it may be a dead window. |
2393 | ||
2394 | @item ediff-window-B | |
2395 | The window displaying buffer B. | |
2396 | ||
2397 | @item ediff-window-C | |
2398 | The window displaying buffer C, if any. | |
2399 | ||
2400 | @item ediff-control-frame | |
2401 | A dedicated frame displaying the control buffer, if it exists. It is | |
2402 | non-@code{nil} only if Ediff uses the multiframe display, i.e., when | |
2403 | the control buffer is in its own frame. | |
2404 | @end table | |
2405 | ||
563a450c | 2406 | @node Credits |
4009494e GM |
2407 | @chapter Credits |
2408 | ||
2409 | Ediff was written by Michael Kifer <kifer@@cs.stonybrook.edu>. It was inspired | |
1df7defd | 2410 | by emerge.el written by Dale R. Worley <drw@@math.mit.edu>. An idea due to |
4009494e GM |
2411 | Boris Goldowsky <boris@@cs.rochester.edu> made it possible to highlight |
2412 | fine differences in Ediff buffers. Alastair Burt <burt@@dfki.uni-kl.de> | |
2413 | ported Ediff to XEmacs, Eric Freudenthal <freudent@@jan.ultra.nyu.edu> | |
2414 | made it work with VC, Marc Paquette <marcpa@@cam.org> wrote the | |
2415 | toolbar support package for Ediff, and Hrvoje Niksic <hniksic@@xemacs.org> | |
2416 | adapted it to the Emacs customization package. | |
2417 | ||
2418 | Many people provided help with bug reports, feature suggestions, and advice. | |
2419 | Without them, Ediff would not be nearly as useful as it is today. | |
2420 | Here is a hopefully full list of contributors: | |
2421 | ||
2422 | @example | |
9ff0b02b MK |
2423 | Adrian Aichner (aichner at ecf.teradyne.com), |
2424 | Drew Adams (drew.adams at oracle.com), | |
2425 | Steve Baur (steve at xemacs.org), | |
2426 | Neal Becker (neal at ctd.comsat.com), | |
1df7defd | 2427 | E. Jay Berkenbilt (ejb at ql.org), |
9ff0b02b MK |
2428 | Lennart Borgman (ennart.borgman at gmail.com) |
2429 | Alastair Burt (burt at dfki.uni-kl.de), | |
2430 | Paul Bibilo (peb at delcam.co.uk), | |
2431 | Kevin Broadey (KevinB at bartley.demon.co.uk), | |
2432 | Harald Boegeholz (hwb at machnix.mathematik.uni-stuttgart.de), | |
1df7defd PE |
2433 | Bradley A. Bosch (brad at lachman.com), |
2434 | Michael D. Carney (carney at ltx-tr.com), | |
2435 | Jin S. Choi (jin at atype.com), | |
9ff0b02b MK |
2436 | Scott Cummings (cummings at adc.com), |
2437 | Albert Dvornik (bert at mit.edu), | |
2438 | Eric Eide (eeide at asylum.cs.utah.edu), | |
2439 | Paul Eggert (eggert at twinsun.com), | |
2440 | Urban Engberg (ue at cci.dk), | |
2441 | Kevin Esler (esler at ch.hp.com), | |
2442 | Robert Estes (estes at ece.ucdavis.edu), | |
2443 | Jay Finger (jayf at microsoft.com), | |
2444 | Xavier Fornari (xavier at europe.cma.fr), | |
2445 | Eric Freudenthal (freudent at jan.ultra.nyu.edu), | |
2446 | Job Ganzevoort (Job.Ganzevoort at cwi.nl), | |
2447 | Felix Heinrich Gatzemeier (felix.g at tzemeier.info), | |
2448 | Boris Goldowsky (boris at cs.rochester.edu), | |
2449 | Allan Gottlieb (gottlieb at allan.ultra.nyu.edu), | |
2450 | Aaron Gross (aaron at bfr.co.il), | |
2451 | Thorbjoern Hansen (thorbjoern.hansen at mchp.siemens.de), | |
2452 | Marcus Harnisch (marcus_harnisch at mint-tech.com), | |
2453 | Steven E. Harris (seh at panix.com), | |
2454 | Aaron S. Hawley (Aaron.Hawley at uvm.edu), | |
2455 | Xiaoli Huang (hxl at epic.com), | |
2456 | Andreas Jaeger (aj at suse.de), | |
2457 | Lars Magne Ingebrigtsen (larsi at ifi.uio.no), | |
2458 | Larry Gouge (larry at itginc.com), | |
2459 | Karl Heuer (kwzh at gnu.org), | |
2460 | (irvine at lks.csi.com), | |
2461 | (jaffe at chipmunk.cita.utoronto.ca), | |
2462 | David Karr (dkarr at nmo.gtegsc.com), | |
2463 | Norbert Kiesel (norbert at i3.informatik.rwth-aachen.de), | |
2464 | Steffen Kilb (skilb at gmx.net), | |
2465 | Leigh L Klotz (klotz at adoc.xerox.com), | |
2466 | Fritz Knabe (Fritz.Knabe at ecrc.de), | |
2467 | Heinz Knutzen (hk at informatik.uni-kiel.d400.de), | |
2468 | Andrew Koenig (ark at research.att.com), | |
2469 | Hannu Koivisto (azure at iki.fi), | |
2470 | Ken Laprade (laprade at dw3f.ess.harris.com), | |
2471 | Will C Lauer (wcl at cadre.com), | |
2472 | Richard Levitte (levitte at e.kth.se), | |
2473 | Mike Long (mike.long at analog.com), | |
2474 | Dave Love (d.love at dl.ac.uk), | |
2475 | Martin Maechler (maechler at stat.math.ethz.ch), | |
2476 | Simon Marshall (simon at gnu.org), | |
2477 | Paul C. Meuse (pmeuse at delcomsys.com), | |
2478 | Richard Mlynarik (mly at adoc.xerox.com), | |
2479 | Stefan Monnier (monnier at cs.yale.edu), | |
2480 | Chris Murphy (murphycm at sun.aston.ac.uk), | |
2481 | Erik Naggum (erik at naggum.no), | |
2482 | Eyvind Ness (Eyvind.Ness at hrp.no), | |
2483 | Ray Nickson (nickson at cs.uq.oz.au), | |
2484 | Dan Nicolaescu (dann at ics.uci.edu), | |
2485 | David Petchey (petchey_david at jpmorgan.com), | |
2486 | Benjamin Pierce (benjamin.pierce at cl.cam.ac.uk), | |
2487 | Francois Pinard (pinard at iro.umontreal.ca), | |
2488 | Tibor Polgar (tlp00 at spg.amdahl.com), | |
2489 | David Prince (dave0d at fegs.co.uk), | |
2490 | Paul Raines (raines at slac.stanford.edu), | |
2491 | Stefan Reicher (xsteve at riic.at), | |
2492 | Charles Rich (rich at merl.com), | |
2493 | Bill Richter (richter at math.nwu.edu), | |
1df7defd | 2494 | C.S. Roberson (roberson at aur.alcatel.com), |
9ff0b02b MK |
2495 | Kevin Rodgers (kevin.rodgers at ihs.com), |
2496 | Sandy Rutherford (sandy at ibm550.sissa.it), | |
2497 | Heribert Schuetz (schuetz at ecrc.de), | |
2498 | Andy Scott (ascott at pcocd2.intel.com), | |
2499 | Axel Seibert (axel at tumbolia.ppp.informatik.uni-muenchen.de), | |
2500 | Vin Shelton (acs at xemacs.org), | |
2501 | Scott O. Sherman (Scott.Sherman at mci.com), | |
2502 | Nikolaj Schumacher (n_schumacher at web.de), | |
2503 | Richard Stallman (rms at gnu.org), | |
2504 | Richard Stanton (stanton at haas.berkeley.edu), | |
2505 | Sam Steingold (sds at goems.com), | |
2506 | Ake Stenhoff (etxaksf at aom.ericsson.se), | |
2507 | Stig (stig at hackvan.com), | |
2508 | Peter Stout (Peter_Stout at cs.cmu.edu), | |
2509 | Chuck Thompson (cthomp at cs.uiuc.edu), | |
2510 | Ray Tomlinson (tomlinso at bbn.com), | |
2511 | Raymond Toy (toy at rtp.ericsson.se), | |
2512 | Stephen J. Turnbull (stephen at xemacs.org), | |
2513 | Jan Vroonhof (vroonhof at math.ethz.ch), | |
2514 | Colin Walters (walters at cis.ohio-state.edu), | |
2515 | Philippe Waroquiers (philippe.waroquiers at eurocontrol.be), | |
2516 | Klaus Weber (gizmo at zork.north.de), | |
2517 | Ben Wing (ben at xemacs.org), | |
2518 | Tom Wurgler (twurgler at goodyear.com), | |
2519 | Steve Youngs (youngs at xemacs.org), | |
2520 | Ilya Zakharevich (ilya at math.ohio-state.edu), | |
2521 | Eli Zaretskii (eliz at is.elta.co.il) | |
4009494e GM |
2522 | @end example |
2523 | ||
563a450c | 2524 | @node GNU Free Documentation License |
4009494e GM |
2525 | @appendix GNU Free Documentation License |
2526 | @include doclicense.texi | |
2527 | ||
2528 | ||
563a450c | 2529 | @node Index |
4009494e GM |
2530 | @unnumbered Index |
2531 | @printindex cp | |
2532 | ||
4009494e | 2533 | @bye |