Refinement of Difference Regions Customization Merging and diff3
This section describes variables that specify the programs to be used for applying patches and for computing the main difference regions (not the fine difference regions):
ediff-diff-program
ediff-diff3-program
|
These variables specify the programs to use to produce differences and do patching. |
ediff-diff-options
ediff-diff3-options
|
These variables specify the options to pass to the above utilities.
In |
ediff-patch-program
|
The program to use to apply patches. Since there are certain
incompatibilities between the different versions of the patch program, the
best way to stay out of trouble is to use a GNU-compatible version.
Otherwise, you may have to tune the values of the variables
|
ediff-patch-options
|
Options to pass to ediff-patch-program .
Note: the `-b' and `-z' options should be specified in
`ediff-backup-specs', not in It is recommended to pass the `-f' option to the patch program, so it won't ask questions. However, some implementations don't accept this option, in which case the default value of this variable should be changed. |
ediff-backup-extension
|
Backup extension used by the patch program. Must be specified, even if
|
ediff-backup-specs
|
Backup directives to pass to the patch program.
Ediff requires that the old version of the file (before applying the patch)
is saved in a file named `the-patch-file.extension '. Usually
`extension' is `.orig', but this can be changed by the user, and may also be
system-dependent. Therefore, Ediff needs to know the backup extension used
by the patch program.
Some versions of the patch program let the user specify `-b backup-extension'. Other versions only permit `-b', which (usually) assumes the extension `.orig'. Yet others force you to use `-z<backup-extension>'. Note that both `ediff-backup-extension' and `ediff-backup-specs' must be properly set. If your patch program takes the option `-b', but not `-b extension', the variable `ediff-backup-extension' must still be set so Ediff will know which extension to use. |
ediff-custom-diff-program
ediff-custom-diff-options
|
Because Ediff limits the options you may want to pass to the
The output generated by |
ediff-patch-default-directory
|
Specifies the default directory to look for patches. |
Warning: Ediff does not support the output format of VMS
diff
. Instead, make sure you are using some implementation of POSIX
diff
, such as gnudiff
.