ediff--delete-temp-files-on-kill-emacs | () |
ediff-add-to-history | (HISTORY-VAR NEWELT &optional MAXELT KEEP-ALL) |
ediff-arrange-autosave-in-merge-jobs | (MERGE-BUFFER-FILE) |
ediff-buffer-type | (BUFFER) |
ediff-change-saved-variable | (VAR VALUE BUF-TYPE) |
ediff-clear-diff-vector | (VEC-VAR &optional FINE-DIFFS-ALSO) |
ediff-clone-buffer-for-current-diff-comparison | (BUFF REG-NAME) |
ediff-clone-buffer-for-region-comparison | (BUFF REGION-NAME) |
ediff-clone-buffer-for-window-comparison | (BUFF WIND REGION-NAME) |
ediff-copy-A-to-B | (ARG) |
ediff-copy-A-to-C | (ARG) |
ediff-copy-B-to-A | (ARG) |
ediff-copy-B-to-C | (ARG) |
ediff-copy-C-to-A | (ARG) |
ediff-copy-C-to-B | (ARG) |
ediff-copy-diff | (N FROM-BUF-TYPE TO-BUF-TYPE &optional BATCH-INVOCATION REG-TO-COPY) |
ediff-copy-list | (ARG) |
ediff-deactivate-mark | (&optional FORCE) |
ediff-diff-at-point | (BUF-TYPE &optional POS WHICH-DIFF) |
ediff-diff-to-diff | (ARG &optional KEYS) |
ediff-dispose-of-variant-according-to-user | (BUFF BUFFTYPE ASK KEEP-VARIANTS) |
ediff-empty-diff-region-p | (N BUF-TYPE) |
ediff-file-checked-in-p | (FILE) |
ediff-file-checked-out-p | (FILE) |
ediff-file-compressed-p | (FILE) |
ediff-filename-magic-p | (FILE) |
ediff-focus-on-regexp-matches | (N) |
ediff-format-bindings-of | (FUNC-DEF) |
ediff-get-diff-posn | (BUF-TYPE POS &optional N CONTROL-BUF) |
ediff-get-lines-to-region-end | (BUF-TYPE &optional N CTL-BUF) |
ediff-get-lines-to-region-start | (BUF-TYPE &optional DIFF-NUM CTL-BUF) |
ediff-get-region-contents | (N BUF-TYPE CTRL-BUF &optional START END) |
ediff-get-region-size-coefficient | (BUF-TYPE OP &optional N CTL-BUF) |
ediff-hide-regexp-matches | (N) |
ediff-highlight-diff | (N) |
ediff-highlight-diff-in-one-buffer | (N BUF-TYPE) |
ediff-inferior-compare-regions | () |
ediff-intersection | (SEQUENCE1 SEQUENCE2 &optional TESTFN) |
ediff-janitor | (ASK KEEP-VARIANTS) |
ediff-jump-to-difference | (DIFFERENCE-NUMBER) |
ediff-jump-to-difference-at-point | (ARG) |
ediff-kill-bottom-toolbar | (&rest ARGUMENTS) |
ediff-make-bottom-toolbar | (&rest ARGUMENTS) |
ediff-make-bullet-proof-overlay | (BEG END BUFF) |
ediff-make-cloned-buffer | (BUFF REGION-NAME) |
ediff-make-current-diff-overlay | (TYPE) |
ediff-make-empty-tmp-file | (PREFIX &optional IGNORED) |
ediff-make-indirect-buffer | (BASE-BUF INDIRECT-BUF-NAME) |
ediff-make-or-kill-fine-diffs | (ARG) |
ediff-make-temp-file | (BUFF &optional PREFIX GIVEN-FILE START END) |
ediff-maybe-checkout | (BUF) |
ediff-maybe-save-and-delete-merge | (&optional SAVE-AND-CONTINUE) |
ediff-member | (ELT LIS COMPARISON-FUNC) |
ediff-minibuffer-with-setup-hook | (FUN &rest BODY) |
ediff-mode | () |
ediff-next-difference | (&optional ARG) |
ediff-nuke-selective-display | (&rest ARGUMENTS) |
ediff-operate-on-windows | (OPERATION ARG) |
ediff-other-buffer | (EXCL-BUFF-LST) |
ediff-place-flags-in-buffer | (BUF-TYPE BUFFER CTL-BUFFER DIFF) |
ediff-place-flags-in-buffer1 | (BUF-TYPE CTL-BUFFER DIFF-NO) |
ediff-pop-diff | (N BUF-TYPE) |
ediff-position-region | (BEG END POS JOB-NAME) |
ediff-previous-difference | (&optional ARG) |
ediff-print-diff-vector | (DIFF-VECTOR-VAR) |
ediff-profile | () |
ediff-quit | (REVERSE-DEFAULT-KEEP-VARIANTS) |
ediff-read-file-name | (PROMPT DEFAULT-DIR DEFAULT-FILE &optional NO-DIRS) |
ediff-really-quit | (REVERSE-DEFAULT-KEEP-VARIANTS) |
ediff-recenter | (&optional NO-REHIGHLIGHT) |
ediff-recenter-one-window | (BUF-TYPE) |
ediff-remove-flags-from-buffer | (BUFFER OVERLAY) |
ediff-restore-diff | (ARG &optional KEY) |
ediff-restore-diff-in-merge-buffer | (ARG) |
ediff-restore-highlighting | (&optional CTL-BUF) |
ediff-restore-variables | (VARS ASSOC-LIST) |
ediff-revert-buffers-then-recompute-diffs | (NOCONFIRM) |
ediff-save-buffer | (ARG) |
ediff-save-buffer-in-file | (BUFFER FILE) |
ediff-save-diff-region | (N BUF-TYPE REG) |
ediff-save-variables | (VARS) |
ediff-scroll-horizontally | (&optional ARG) |
ediff-scroll-vertically | (&optional ARG) |
ediff-select-difference | (N) |
ediff-set-difference | (SEQUENCE1 SEQUENCE2 &optional TESTFN) |
ediff-set-keys | () |
ediff-setup | (BUFFER-A FILE-A BUFFER-B FILE-B BUFFER-C FILE-C STARTUP-HOOKS SETUP-PARAMETERS &optional MERGE-BUFFER-FILE) |
ediff-setup-control-buffer | (CTL-BUF) |
ediff-setup-keymap | () |
ediff-show-diff-output | (ARG) |
ediff-status-info | () |
ediff-submit-report | () |
ediff-suspend | () |
ediff-swap-buffers | () |
ediff-test-save-region | (N BUF-TYPE) |
ediff-toggle-autorefine | () |
ediff-toggle-help | () |
ediff-toggle-hilit | () |
ediff-toggle-multiframe | () |
ediff-toggle-narrow-region | () |
ediff-toggle-read-only | (&optional BUF) |
ediff-toggle-regexp-match | () |
ediff-toggle-show-ancestor | () |
ediff-toggle-show-clashes-only | () |
ediff-toggle-skip-changed-regions | () |
ediff-toggle-split | () |
ediff-toggle-use-toolbar | () |
ediff-toggle-wide-display | () |
ediff-unhighlight-diff | () |
ediff-unhighlight-diff-in-one-buffer | (BUF-TYPE) |
ediff-unhighlight-diffs-totally-in-one-buffer | (BUF-TYPE) |
ediff-union | (SEQUENCE1 SEQUENCE2 &optional TESTFN) |
ediff-unique-buffer-name | (PREFIX SUFFIX) |
ediff-unselect-and-select-difference | (N &optional FLAG NO-RECENTER) |
ediff-unselect-difference | (N) |
ediff-update-diffs | () |
ediff-verify-file-buffer | (&optional FILE-MAGIC) |
ediff-verify-file-merge-buffer | (FILE) |
ediff-whitespace-diff-region-p | (N BUF-TYPE) |
ediff-write-merge-buffer-and-maybe-kill | (BUF FILE &optional SHOW-FILE SAVE-AND-CONTINUE) |