File: emerge.el.html

Defined variables (53)

emerge-A-bufferThe buffer in which the A variant is stored.
emerge-A-buffer-valuesRemembers emerge-saved-variables for emerge-A-buffer.
emerge-B-bufferThe buffer in which the B variant is stored.
emerge-B-buffer-valuesRemembers emerge-saved-variables for emerge-B-buffer.
emerge-after-flagFlag placed below the highlighted block of code.
emerge-ancestor-bufferThe buffer in which the ancestor variant is stored,
emerge-auto-advanceIf non-nil, emerge-select-A and emerge-select-B automatically advance to
emerge-basic-keymapKeymap of Emerge commands.
emerge-before-flagFlag placed above the highlighted block of code.
emerge-combine-versions-templateTemplate for ‘emerge-combine-versions’ to combine the two versions.
emerge-command-prefixCommand prefix for Emerge commands in ‘edit’ mode.
emerge-current-differenceThe difference that is currently selected.
emerge-default-last-directoriesIf nil, default dir for filenames in emerge is ‘default-directory’.
emerge-diff-ok-lines-regexpRegexp that matches normal output lines from ‘emerge-diff-program’.
emerge-diff-optionsOptions to pass to ‘emerge-diff-program’ and ‘emerge-diff3-program’.
emerge-diff-programName of the program which compares two files.
emerge-diff3-ok-lines-regexpRegexp that matches normal output lines from ‘emerge-diff3-program’.
emerge-diff3-programName of the program which compares three files.
emerge-difference-listVector of differences between the variants, and markers in the buffers to
emerge-edit-keymapThe local keymap for the merge buffer, with the emerge commands defined in
emerge-edit-modeIndicator for emerge-mode edit submode.
emerge-execute-line-deletionsIf non-nil: ‘emerge-execute-line’ makes no output if an input was deleted.
emerge-fast-keymapLocal keymap used in Emerge ‘fast’ mode.
emerge-fast-modeIndicator for emerge-mode fast submode.
emerge-last-dir-ALast directory for the first file of an ‘emerge-files...’ command.
emerge-last-dir-BLast directory for the second file of an ‘emerge-files...’ command.
emerge-last-dir-ancestorLast directory for the ancestor file of an ‘emerge-files...’ command.
emerge-last-dir-outputLast directory for the output file of an ‘emerge-files...’ command.
emerge-last-revision-ALast RCS revision used for first file of an ‘emerge-revisions...’ command.
emerge-last-revision-BLast RCS revision used for second file of an ‘emerge-revisions...’ command.
emerge-last-revision-ancestorLast RCS revision used for ancestor file of an ‘emerge-revisions...’ command.
emerge-match-diff-linePattern to match lines produced by diff that describe differences.
emerge-merge-bufferThe buffer in which the merged file is manipulated.
emerge-merge-directories-filename-regexpRegexp describing files to be processed by ‘emerge-merge-directories’.
emerge-merging-valuesValues to be assigned to emerge-saved-variables during a merge.
emerge-metacharsNo longer used. Emerge now uses ‘shell-quote-argument’.
emerge-min-visible-linesNumber of lines to show above and below the flags when displaying a difference.
emerge-modeNon-nil if Emerge mode is enabled.
emerge-mode-hookHook run after entering or leaving ‘emerge-mode’.
emerge-number-of-differencesNumber of differences found.
emerge-old-keymapThe original local keymap for the merge buffer.
emerge-output-descriptionDescribes output destination of emerge, for ‘emerge-file-names’.
emerge-process-local-variablesNon-nil if Emerge should process local-variables lists in merge buffers.
emerge-quit-hookHooks to run in the merge buffer after the merge has been finished.
emerge-rcs-ci-programName of the program that checks in RCS revisions.
emerge-rcs-co-programName of the program that checks out RCS revisions.
emerge-saved-variablesVariables and properties of a buffer to save, modify and restore during a merge.
emerge-select-hookHook to run after a difference has been selected.
emerge-skip-prefersIf non-nil, differences for which there is a preference are automatically
emerge-startup-hookHook to run in the merge buffer after the merge has been set up.
emerge-temp-file-modeMode for Emerge temporary files.
emerge-temp-file-prefixPrefix to put on Emerge temporary file names.
emerge-unselect-hookHook to run after a difference has been unselected.

Defined functions (107)

emerge--current-beg(DIFF-VECTOR SIDE)
emerge--current-end(DIFF-VECTOR SIDE)
emerge-abort()
emerge-auto-advance(ARG)
emerge-buffers(BUFFER-A BUFFER-B &optional STARTUP-HOOKS QUIT-HOOKS)
emerge-buffers-with-ancestor(BUFFER-A BUFFER-B BUFFER-ANCESTOR &optional STARTUP-HOOKS QUIT-HOOKS)
emerge-combine-versions(&optional FORCE)
emerge-combine-versions-edit(DIFF-VECTOR COMBINE-TEMPLATE)
emerge-combine-versions-internal(COMBINE-TEMPLATE FORCE)
emerge-combine-versions-register(CHAR &optional FORCE)
emerge-command-exit(FILE-OUT)
emerge-compare-buffers(BUFFER-X X-BEGIN X-END BUFFER-Y Y-BEGIN Y-END)
emerge-convert-diffs-to-markers(A-BUFFER B-BUFFER MERGE-BUFFER LINENO-LIST)
emerge-copy-as-kill-A()
emerge-copy-as-kill-B()
emerge-copy-modes(BUFFER)
emerge-count-matches-string(STRING REGEXP)
emerge-default-A()
emerge-default-B()
emerge-define-key-if-possible(KEYMAP KEY DEFINITION)
emerge-defvar-local(SYMBOL VALUE &optional DOC)
emerge-edit-mode()
emerge-execute-line()
emerge-extract-diffs(DIFF-BUFFER)
emerge-extract-diffs3(DIFF-BUFFER)
emerge-fast-mode()
emerge-file-names()
emerge-files(ARG FILE-A FILE-B FILE-OUT &optional STARTUP-HOOKS QUIT-HOOKS)
emerge-files-exit(FILE-OUT)
emerge-files-internal(FILE-A FILE-B &optional STARTUP-HOOKS QUIT-HOOKS OUTPUT-FILE)
emerge-files-remote(FILE-A FILE-B FILE-OUT)
emerge-files-with-ancestor(ARG FILE-A FILE-B FILE-ANCESTOR FILE-OUT &optional STARTUP-HOOKS QUIT-HOOKS)
emerge-files-with-ancestor-internal(FILE-A FILE-B FILE-ANCESTOR &optional STARTUP-HOOKS QUIT-HOOKS OUTPUT-FILE)
emerge-files-with-ancestor-remote(FILE-A FILE-B FILE-ANC FILE-OUT)
emerge-find-difference(ARG)
emerge-find-difference-A(ARG)
emerge-find-difference-B(ARG)
emerge-find-difference-merge(ARG)
emerge-find-difference1(ARG LOCATION BEGIN END)
emerge-force-define-key(KEYMAP KEY DEFINITION)
emerge-get-diff3-group(FILE)
emerge-goto-line(DESIRED-LINE CURRENT-LINE)
emerge-hash-string-into-string(S)
emerge-insert-A(ARG)
emerge-insert-B(ARG)
emerge-join-differences(ARG)
emerge-jump-to-difference(N)
emerge-line-number-in-buf(VALID-DIFF BEGIN-MARKER END-MARKER)
emerge-line-numbers()
emerge-make-auto-save-file-name()
emerge-make-diff-list(FILE-A FILE-B)
emerge-make-diff3-list(FILE-A FILE-B FILE-ANCESTOR)
emerge-make-temp-file(PREFIX &optional DIR-FLAG SUFFIX TEXT)
emerge-mark-difference(ARG)
emerge-merge-directories(A-DIR B-DIR ANCESTOR-DIR OUTPUT-DIR)
emerge-mode(&optional ARG)
emerge-new-flags()
emerge-next-difference()
emerge-operate-on-windows(OPERATION ARG)
emerge-place-flags-in-buffer(BUFFER DIFFERENCE BEFORE-INDEX AFTER-INDEX)
emerge-place-flags-in-buffer1(DIFFERENCE BEFORE-INDEX AFTER-INDEX)
emerge-position-region(BEG END POS)
emerge-prepare-error-list(OK-REGEXP)
emerge-previous-difference()
emerge-query-and-call(COMMAND)
emerge-query-save-buffer()
emerge-query-write-file()
emerge-quit(ARG)
emerge-read-file-name(PROMPT ALTERNATIVE-DEFAULT-DIR DEFAULT-FILE A-FILE MUST-MATCH)
emerge-really-quit(ARG)
emerge-recenter(&optional ARG)
emerge-remember-buffer-characteristics()
emerge-remote-exit(FILE-OUT EXIT-FUNC)
emerge-remove-flags-in-buffer(BUFFER BEFORE AFTER)
emerge-restore-buffer-characteristics()
emerge-restore-variables(VARS VALUES)
emerge-revision-with-ancestor-internal(FILE REVISION-A REVISION-B ANCESTOR &optional STARTUP-HOOKS QUIT-HOOKS OUTPUT-FILE)
emerge-revisions(ARG FILE REVISION-A REVISION-B &optional STARTUP-HOOKS QUIT-HOOKS)
emerge-revisions-internal(FILE REVISION-A REVISION-B &optional STARTUP-HOOKS QUIT-HOOKS OUTPUT-FILE)
emerge-revisions-with-ancestor(ARG FILE REVISION-A REVISION-B ANCESTOR &optional STARTUP-HOOKS QUIT-HOOKS)
emerge-save-variables(VARS)
emerge-scroll-down(&optional ARG)
emerge-scroll-left(&optional ARG)
emerge-scroll-reset()
emerge-scroll-right(&optional ARG)
emerge-scroll-up(&optional ARG)
emerge-select-A(&optional FORCE)
emerge-select-A-edit(DIFF-VECTOR)
emerge-select-B(&optional FORCE)
emerge-select-B-edit(DIFF-VECTOR)
emerge-select-difference(N)
emerge-select-version(FORCE A-VERSION B-VERSION NEITHER-VERSION)
emerge-set-combine-template(STRING &optional LOCALIZE)
emerge-set-combine-versions-template(START END &optional LOCALIZE)
emerge-set-merge-mode(MODE)
emerge-setup(BUFFER-A FILE-A BUFFER-B FILE-B STARTUP-HOOKS QUIT-HOOKS OUTPUT-FILE)
emerge-setup-windows(BUFFER-A BUFFER-B MERGE-BUFFER &optional POS)
emerge-setup-with-ancestor(BUFFER-A FILE-A BUFFER-B FILE-B BUFFER-ANCESTOR FILE-ANCESTOR &optional STARTUP-HOOKS QUIT-HOOKS OUTPUT-FILE)
emerge-show-file-name()
emerge-skip-prefers(ARG)
emerge-split-difference()
emerge-trim-difference()
emerge-unique-buffer-name(PREFIX SUFFIX)
emerge-unselect-and-select-difference(N &optional SUPPRESS-DISPLAY)
emerge-unselect-difference(N)
emerge-unslashify-name(S)
emerge-write-and-delete(FILE-OUT)

Defined faces (0)