File: ediff-init.el.html

Defined variables (96)

ediff-after-flag-eolFlag placed after highlighted block of differences that ends at end of line.
ediff-after-flag-molFlag placed after a highlighted block of differences, if block ends in mid-line.
ediff-after-setup-control-frame-hookHooks run after setting up the frame to display Ediff Control Panel.
ediff-after-setup-windows-hookHooks to run after Ediff sets its window configuration.
ediff-ancestor-bufferAncestor buffer.
ediff-autostore-mergesSave the results of merge jobs automatically.
ediff-before-flag-bolFlag placed before highlighted block of differences at beginning of a line.
ediff-before-flag-molFlag placed before highlighted block of differences that starts mid-line.
ediff-before-setup-control-frame-hookHooks run before setting up the frame to display Ediff Control Panel.
ediff-before-setup-hookHooks to run before Ediff begins to set up windows and buffers.
ediff-before-setup-windows-hookHooks to run before Ediff sets its window configuration.
ediff-buffer-AThe buffer in which the A variant is stored.
ediff-buffer-BThe buffer in which the B variant is stored.
ediff-buffer-CThe buffer in which the C variant is stored or where the merge buffer lives.
ediff-buffer-alistAssociation between ‘buff-type’ and ‘ediff-buffer-*’.
ediff-buffer-values-orig-AThe original values of ‘ediff-protected-variables’ for buffer A.
ediff-buffer-values-orig-AncestorThe original values of ‘ediff-protected-variables’ for buffer Ancestor.
ediff-buffer-values-orig-BThe original values of ‘ediff-protected-variables’ for buffer B.
ediff-buffer-values-orig-CThe original values of ‘ediff-protected-variables’ for buffer C.
ediff-buffer-values-orig-alistAssociation between buff-type and ‘ediff-buffer-values-orig-*’.
ediff-cleanup-hookHooks to run on exiting Ediff, before killing the control and variant buffers.
ediff-coding-system-for-readCoding system for read to use when running the diff program as a subprocess.
ediff-coding-system-for-writeCoding system for write to use when writing out difference regions.
ediff-control-bufferThe Ediff control buffer.
ediff-control-buffer-numberSame as ‘ediff-control-buffer-suffix’, but without "<,>".
ediff-control-buffer-suffixThe suffix of the control buffer name.
ediff-current-diff-face-AFace for highlighting the selected difference in buffer A.
ediff-current-diff-face-AncestorFace for highlighting the selected difference in buffer Ancestor.
ediff-current-diff-face-BFace for highlighting the selected difference in buffer B.
ediff-current-diff-face-CFace for highlighting the selected difference in buffer C.
ediff-current-diff-overlay-AOverlay for the current difference region in buffer A.
ediff-current-diff-overlay-AncestorOverlay for the current difference region in the ancestor buffer.
ediff-current-diff-overlay-BOverlay for the current difference region in buffer B.
ediff-current-diff-overlay-COverlay for the current difference region in buffer C.
ediff-current-differenceThe difference that is currently selected.
ediff-custom-diff-bufferLike ‘ediff-diff-buffer’, but contains context diff.
ediff-debug-bufferBuffer to display debug info.
ediff-diff-bufferBuffer containing the output of diff, which is used to step through files.
ediff-display-help-hookHooks run after preparing the help message.
ediff-error-bufferBuffer containing the output of diff when diff returns errors.
ediff-even-diff-face-AFace for highlighting even-numbered non-current differences in buffer A.
ediff-even-diff-face-AncestorFace for highlighting even-numbered non-current differences in buffer Ancestor.
ediff-even-diff-face-BFace for highlighting even-numbered non-current differences in buffer B.
ediff-even-diff-face-CFace for highlighting even-numbered non-current differences in buffer C.
ediff-fine-diff-bufferBuffer used for diff-style fine differences between regions.
ediff-fine-diff-face-AFace for highlighting the fine differences in buffer A.
ediff-fine-diff-face-AncestorFace for highlighting the fine differences in buffer Ancestor.
ediff-fine-diff-face-BFace for highlighting the fine differences in buffer B.
ediff-fine-diff-face-CFace for highlighting the fine differences in buffer C.
ediff-focus-on-regexp-matches-functionFunction to use in determining which regions to focus on.
ediff-force-facesIf t, Ediff will think that it is running on a display that supports faces.
ediff-hide-regexp-matches-functionFunction to use in determining which regions to hide.
ediff-highlight-all-diffsIf nil, only the selected differences are highlighted.
ediff-keep-variantsNil means prompt to remove unmodified buffers A/B/C at session end.
ediff-keymap-setup-hookHook run just after the default bindings in Ediff keymap are set up.
ediff-load-hookHook run after Ediff is loaded. Can be used to change defaults.
ediff-make-buffers-readonly-at-startupMake all variant buffers read-only when Ediff starts up.
ediff-merge-filename-prefixPrefix to be attached to saved merge buffers.
ediff-merge-store-fileFile where the result of the merge is to be saved. Internal.
ediff-metacharsRegexp matching characters that must be quoted with ‘\’ in shell command line.
ediff-mode-hookHook run just after ‘ediff-mode’ is set up in the control buffer.
ediff-msg-bufferBuffer used for messages.
ediff-no-emacs-help-in-control-bufferNon-nil means C-h should not invoke Emacs help in control buffer.
ediff-number-of-differencesNumber of differences found.
ediff-odd-diff-face-AFace for highlighting odd-numbered non-current differences in buffer A.
ediff-odd-diff-face-AncestorFace for highlighting odd-numbered non-current differences in buffer Ancestor.
ediff-odd-diff-face-BFace for highlighting odd-numbered non-current differences in buffer B.
ediff-odd-diff-face-CFace for highlighting odd-numbered non-current differences in buffer C.
ediff-prepare-buffer-hookHooks run after buffers A, B, and C are set up.
ediff-quit-hookHooks to run in the Ediff control buffer after finishing Ediff.
ediff-quit-widenedNon-nil means: when finished, Ediff widens buffers A/B.
ediff-regexp-focus-ARegexp that determines buf A regions to focus on when skipping to diff.
ediff-regexp-focus-BRegexp that determines buf B regions to focus on when skipping to diff.
ediff-regexp-focus-CRegexp that determines buf C regions to focus on when skipping to diff.
ediff-regexp-hide-ARegexp that determines buf A regions to ignore when skipping to diff.
ediff-regexp-hide-BRegexp that determines buf B regions to ignore when skipping to diff.
ediff-regexp-hide-CRegexp that determines buf C regions to ignore when skipping to diff.
ediff-select-hookHooks to run after a difference has been selected.
ediff-show-ancestorIf non-nil, show ancestor buffer in 3way merges and refine it.
ediff-skip-diff-region-functionFunction that determines the next/previous diff region to show.
ediff-start-narrowedNon-nil means start narrowed, if doing ediff-windows-* or ediff-regions-*.
ediff-startup-hookHooks to run in the control buffer after Ediff has been set up and is ready.
ediff-suspend-hookHooks to run in the Ediff control buffer when Ediff is suspended.
ediff-temp-file-ATemporary file used for refining difference regions in buffer A.
ediff-temp-file-BTemporary file used for refining difference regions in buffer B.
ediff-temp-file-CTemporary file used for refining difference regions in buffer C.
ediff-temp-file-modeMode for Ediff temporary files.
ediff-temp-file-prefixThe directory for writing temporary files.
ediff-temp-indirect-bufferIf t, the buffer is a temporary indirect buffer.
ediff-this-buffer-ediff-sessionsList of ediff control panels associated with each buffer A/B/C/Ancestor.
ediff-tmp-bufferTemporary buffer used for computing fine differences.
ediff-toggle-read-only-functionFunction to be used to toggle read-only status of the buffer.
ediff-unselect-hookHooks to run after a difference has been unselected.
ediff-use-facesIf t, differences are highlighted using faces, if device supports faces.
ediff-version-control-packageVersion control package used.
ediff-windows-job

Defined functions (83)

ediff-abbrev-jobname(JOBNAME)
ediff-abbreviate-file-name(FILE &optional DIR)
ediff-ancestor-metajob(&optional METAJOB)
ediff-background-face(BUF-TYPE DIF-NUM)
ediff-barf-if-not-control-buffer(&optional META-BUF-P)
ediff-buffer-live-p(BUF)
ediff-char-to-buftype(ARG)
ediff-clear-fine-diff-vector(DIFF-RECORD)
ediff-clear-fine-differences(N)
ediff-clear-fine-differences-in-one-buffer(N BUF-TYPE)
ediff-collect-diffs-metajob(&optional METAJOB)
ediff-color-display-p(&optional DISPLAY)
ediff-comparison-metajob3(&optional METAJOB)
ediff-convert-standard-filename(FILENAME)
ediff-defvar-local(SYMBOL VALUE &optional DOC)
ediff-delete-overlay(OVERLAY)
ediff-display-pixel-height(&optional DISPLAY)
ediff-display-pixel-width(&optional DISPLAY)
ediff-empty-overlay-p(OVERL)
ediff-event-buffer(EVENT)
ediff-event-key(ARGUMENT)
ediff-event-point(EVENT)
ediff-file-attributes(FILENAME ATTR-NUMBER)
ediff-file-modtime(FILENAME)
ediff-file-remote-p(FILE &optional IDENTIFICATION CONNECTED)
ediff-file-size(FILENAME)
ediff-frame-char-height(&optional FRAME)
ediff-frame-char-width(&optional FRAME)
ediff-frame-iconified-p(FRAME)
ediff-frame-unsplittable-p(FRAME)
ediff-get-buffer(ARG)
ediff-get-diff-overlay(N BUF-TYPE)
ediff-get-diff-overlay-from-diff-record(DIFF-REC)
ediff-get-difference(N BUF-TYPE)
ediff-get-fine-diff-vector(N BUF-TYPE)
ediff-get-fine-diff-vector-from-diff-record(DIFF-REC)
ediff-get-next-window(WIND PREV-WIND)
ediff-get-state-of-ancestor(N)
ediff-get-state-of-diff(N BUF-TYPE)
ediff-get-state-of-merge(N)
ediff-get-symbol-from-alist(BUF-TYPE ALIST)
ediff-get-value-according-to-buffer-type(BUF-TYPE LIST)
ediff-has-gutter-support-p(&rest ARGUMENTS)
ediff-hide-face(&rest ARGUMENTS)
ediff-in-control-buffer-p(&optional META-BUF-P)
ediff-key-press-event-p(EVENT)
ediff-kill-buffer-carefully(BUF)
ediff-listable-file(FILE-NAME)
ediff-make-overlay(BEG END &optional BUFFER FRONT-ADVANCE REAR-ADVANCE)
ediff-mark-diff-as-space-only(N FLAG)
ediff-merge-metajob(&optional METAJOB)
ediff-message-if-verbose(STRING &rest ARGS)
ediff-metajob3(&optional METAJOB)
ediff-mouse-event-p(OBJECT)
ediff-move-overlay(OVERLAY BEG END &optional BUFFER)
ediff-no-fine-diffs-p(N)
ediff-nonempty-string-p(STRING)
ediff-one-filegroup-metajob(&optional METAJOB)
ediff-overlay-buffer(OVERLAY)
ediff-overlay-end(OVERL)
ediff-overlay-get(OVERLAY PROP)
ediff-overlay-put(OVERLAY PROP VALUE)
ediff-overlay-start(OVERL)
ediff-overlayp(OBJECT)
ediff-paint-background-regions(&optional UNHIGHLIGHT)
ediff-paint-background-regions-in-one-buffer(BUF-TYPE UNHIGHLIGHT)
ediff-patch-metajob(&optional METAJOB)
ediff-read-event(&optional PROMPT INHERIT-INPUT-METHOD SECONDS)
ediff-region-help-echo(EXTENT-OR-WINDOW &optional OVERLAY POINT)
ediff-reset-mouse(&optional FRAME DO-NOT-GRAB-MOUSE)
ediff-revision-metajob(&optional METAJOB)
ediff-set-face-pixmap(FACE PIXMAP)
ediff-set-fine-diff-vector(N BUF-TYPE FINE-VEC)
ediff-set-overlay-face(EXTENT FACE)
ediff-set-state-of-diff(N BUF-TYPE VAL)
ediff-set-state-of-merge(N VAL)
ediff-show-all-diffs(N)
ediff-strip-last-dir(DIR)
ediff-valid-difference-p(&optional N)
ediff-window-display-p(&optional ARG1)
ediff-window-visible-p(WIND)
ediff-with-current-buffer(BUFFER &rest BODY)
ediff-with-syntax-table(TABLE &rest BODY)

Defined faces (16)

ediff-current-diff-AFace for highlighting the selected difference in buffer A.
ediff-current-diff-AncestorFace for highlighting the selected difference in buffer Ancestor.
ediff-current-diff-BFace for highlighting the selected difference in buffer B.
ediff-current-diff-CFace for highlighting the selected difference in buffer C.
ediff-even-diff-AFace for highlighting even-numbered non-current differences in buffer A.
ediff-even-diff-AncestorFace for highlighting even-numbered non-current differences in ancestor buffer.
ediff-even-diff-BFace for highlighting even-numbered non-current differences in buffer B.
ediff-even-diff-CFace for highlighting even-numbered non-current differences in buffer C.
ediff-fine-diff-AFace for highlighting the refinement of the selected diff in buffer A.
ediff-fine-diff-AncestorFace for highlighting refinement of the selected diff in the ancestor buffer. At present, this face is not used and no fine differences are computed for the ancestor buffer.
ediff-fine-diff-BFace for highlighting the refinement of the selected diff in buffer B.
ediff-fine-diff-CFace for highlighting the refinement of the selected diff in buffer C.
ediff-odd-diff-AFace for highlighting odd-numbered non-current differences in buffer A.
ediff-odd-diff-AncestorFace for highlighting odd-numbered non-current differences in ancestor buffer.
ediff-odd-diff-BFace for highlighting odd-numbered non-current differences in buffer B.
ediff-odd-diff-CFace for highlighting odd-numbered non-current differences in buffer C.