File: ediff-diff.el.html

Defined variables (29)

ediff-actual-diff-optionsThe actual options used in comparison.
ediff-actual-diff3-optionsThe actual options used in comparison.
ediff-auto-refineIf ‘on’, Ediff auto-highlights fine diffs for the current diff region.
ediff-auto-refine-limitAuto-refine only the regions of this size (in bytes) or less.
ediff-cmp-optionsOptions to pass to ‘ediff-cmp-program’.
ediff-cmp-programUtility to use to determine if two files are identical.
ediff-custom-diff-optionsOptions to pass to ‘ediff-custom-diff-program’.
ediff-custom-diff-programProgram to use for generating custom diff output for saving it in a file.
ediff-diff-ok-lines-regexpRegexp that matches normal output lines from ‘ediff-diff-program’.
ediff-diff-optionsOptions to pass to ‘ediff-diff-program’.
ediff-diff-programProgram to use for generating the differential of the two files.
ediff-diff-statusKeeps the status of the current diff in 3-way jobs.
ediff-diff3-ok-lines-regexpRegexp that matches normal output lines from ‘ediff-diff3-program’.
ediff-diff3-optionsOptions to pass to ‘ediff-diff3-program’.
ediff-diff3-programProgram to be used for three-way comparison.
ediff-forward-word-functionFunction to call to move to the next word.
ediff-ignore-caseIf t, skip over difference regions that differ only in letter case.
ediff-ignore-case-optionOption that causes the diff program to ignore case of letters.
ediff-ignore-case-option3Option that causes the diff3 program to ignore case of letters.
ediff-ignore-similar-regionsIf t, skip difference regions that differ only in white space and line breaks.
ediff-match-diff-linePattern to match lines produced by diff that describe differences.
ediff-match-diff3-linePattern to match lines produced by diff3 that describe differences.
ediff-setup-diff-regions-functionValue is a function symbol depending on the kind of job is to be done.
ediff-shellThe shell used to run diff and patch.
ediff-whitespaceCharacters constituting white space.
ediff-word-1Characters that constitute words of type 1.
ediff-word-2Characters that constitute words of type 2.
ediff-word-3Characters that constitute words of type 3.
ediff-word-4Characters that constitute words of type 4.

Defined functions (29)

ediff-convert-diffs-to-overlays(DIFF-LIST)
ediff-convert-fine-diffs-to-overlays(DIFF-LIST REGION-NUM)
ediff-copy-to-buffer(BEG END IN-BUFFER OUT-BUFFER)
ediff-delete-all-matches(REGEX FILE-LIST-LIST)
ediff-exec-process(PROGRAM BUFFER SYNCH OPTIONS &rest FILES)
ediff-extract-diffs(DIFF-BUFFER WORD-MODE &optional BOUNDS)
ediff-extract-diffs3(DIFF-BUFFER WORD-MODE THREE-WAY-COMP &optional BOUNDS)
ediff-forward-word()
ediff-get-diff3-group(FILE)
ediff-goto-word(N BUF &optional FLAG)
ediff-install-fine-diff-if-necessary(N)
ediff-make-diff2-buffer(DIFF-BUFFER FILE1 FILE2)
ediff-make-fine-diffs(&optional N FLAG)
ediff-prepare-error-list(OK-REGEXP DIFF-BUFF)
ediff-process-filter(PROC STRING)
ediff-process-sentinel(PROCESS SIGNAL)
ediff-same-contents(D1 D2 &optional FILTER-RE)
ediff-same-file-contents(F1 F2)
ediff-same-file-contents-lists(ENTRIES-1 ENTRIES-2 FILTER-RE)
ediff-set-diff-options(SYMBOL VALUE)
ediff-set-diff-overlays-in-one-buffer(BUF-TYPE DIFF-LIST)
ediff-set-fine-diff-properties(N &optional DEFAULT)
ediff-set-fine-diff-properties-in-one-buffer(BUF-TYPE N &optional DEFAULT)
ediff-set-fine-overlays-for-combined-merge(DIFF-LIST REG-NUM)
ediff-set-fine-overlays-in-one-buffer(BUF-TYPE DIFF-LIST REGION-NUM)
ediff-setup-diff-regions(FILE-A FILE-B FILE-C)
ediff-setup-diff-regions3(FILE-A FILE-B FILE-C)
ediff-setup-fine-diff-regions(FILE-A FILE-B FILE-C REG-NUM)
ediff-wordify(BEG END IN-BUFFER OUT-BUFFER &optional CONTROL-BUF)

Defined faces (0)