annotate doc/misc/ediff.texi @ 109635:fc7a8c411aa3

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