- Jan 10, 2008
- Jan 09, 2008
- Nov 05, 2007
-
-
viteno authored
-
- Nov 02, 2007
-
-
michaelk authored
-
michaelk authored
-
michaelk authored
-
michaelk authored
Got rid of ediff-copy-list. * ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): do not use face-name. (ediff-test-utility,ediff-diff-mandatory-option) (ediff-reset-diff-options): removed to simplify yhe mandatory option handling on windows. (ediff-set-diff-options): added. (ediff-diff-options): changed. * ediff-vers.el (ediff-vc-internal): use ediff-vc-revision-other-window. (ediff-vc-merge-internal): use ediff-vc-revision-other-window and ediff-vc-working-revision. Require vc-hooks.
-
- Aug 28, 2007
-
-
viteno authored
-
- Aug 19, 2007
- Jun 12, 2007
-
-
viteno authored
-
michaelk authored
parenthesis. * ediff-init.el: doc strings.
-
michaelk authored
* ediff-mult.el (ediff-meta-buffer-brief-message,ediff-meta-buffer-verbose-message): new variables. (ediff-meta-buffer-message): variable deleted. (ediff-verbose-help-enabled): new variable. (ediff-toggle-verbose-help-meta-buffer): new function. (ediff-redraw-directory-group-buffer): made aware of short/verbose message options * ediff-ptch.el (ediff-context-diff-label-regexp): better regexp. (ediff-fixup-patch-map): improved heuristic.
-
- Jan 24, 2007
-
- Jan 23, 2007
-
-
michaelk authored
of message. Activate mark. (ediff-activate-mark): set transient-mark-mode to t. * ediff.el (ediff-regions-wordwise,ediff-regions-linewise): changed docstrings. * other files: 2007 copyright date added
-
- Dec 28, 2006
-
-
viteno authored
-
- Dec 23, 2006
-
-
michaelk authored
(ediff-setup-diff-regions): disallow -u in ediff-diff-options.
-
- Nov 27, 2006
-
- Nov 23, 2006
-
-
michaelk authored
condition-case.
-
- Oct 31, 2006
-
-
viteno authored
-
- Oct 23, 2006
-
-
michaelk authored
* ediff-mult.el (ediff-append-custom-diff): quote shell file arguments.
-
- Sep 23, 2006
-
-
viteno authored
-
- Sep 18, 2006
-
-
michaelk authored
* ediff.el: use ediff-add-to-history instead of add-to-history.
-
- Aug 26, 2006
-
-
viteno authored
-
- Aug 25, 2006
-
-
michaelk authored
ediff-get-directory-files-under-revision, ediff-dir-diff-copy-file): always expand filenames. * ediff-diff (ediff-test-patch-utility): catch errors. (ediff-actual-diff-options, ediff-actual-diff3-options): new variables. (ediff-set-actual-diff-options): new function. (ediff-reset-diff-options, ediff-toggle-ignore-case): use ediff-set-actual-diff-options. (ediff-extract-diffs): catch errors. (ediff-whitespace): add nonbreakable space. (ediff-same-file-contents): catch errors. * ediff-mult.el (ediff-collect-custom-diffs): save coding-system-for-read. * ediff-vers.el (ediff-keep-tmp-versions): new var. (ediff-vc-internal, ediff-vc-merge-internal): use ediff-delete-version-file. (ediff-delete-version-file): new function. * ediff-wind.el (ediff-control-frame-parameters): set frame fringes. * ediff.el (ediff-directories, ediff-directory-revisions, ediff-merge-directories, ediff-merge-directories-with-ancestor, ediff-directories-internal, ediff-merge-directory-revisions, ediff-merge-directory-revisions-with-ancestor, ediff-directories3): use read-directory-name.
-
- Feb 22, 2006
-
-
michaelk authored
fix the regular expressions.
- Feb 20, 2006
-
-
viteno authored
-
- Feb 19, 2006
-
-
michaelk authored
ediff-ignore-case-option3, ediff-actual-diff-options, ediff-actual-diff3-options): new variables to control case sensitivity. (ediff-make-diff2-buffer, ediff-setup-fine-diff-regions, ediff-setup-diff-regions3): made aware of case-sensitivity. (ediff-toggle-ignore-case): new function. (ediff-extract-diffs, ediff-extract-diffs3): preserve point in buffers. * ediff-help.el (ediff-long-help-message-narrow2, ediff-long-help-message-compare2, ediff-long-help-message-compare3, ediff-long-help-message-word-mode): add ignore-case command. (ediff-help-for-quick-help): add ignore-case command. * ediff-merg.el: move provide to the end. * ediff-ptch.el: move provide to the end. * ediff-wind.el: move provide to the end. * ediff-mult.el: move provide to the end. (ediff-set-meta-overlay): enable follow-link. * ediff.el: move provide to the end. Break recursive load cycle in eval-when-compile. (ediff-patch-buffer): better heuristics. * ediff-util.el: move provide to the end. Break recursive load cycle in eval-when-compile. (ediff-setup-keymap): add binding for #c. Replaced some defsubsts with defuns. (ediff-submit-report): pass the values of ediff-diff3-program, ediff-diff3-options.
-
- Dec 05, 2005
-
- Nov 29, 2005
-
-
michaelk authored
preserve user position.
-
- Nov 25, 2005
- Nov 16, 2005
-
-
viteno authored
-
- Nov 15, 2005
-
-
michaelk authored
operation
-
- Nov 07, 2005
-
-
viteno authored
-
- Nov 04, 2005
-
-
michaelk authored
merging. * ediff-util.el (ediff-previous-difference): don't skip regions that have merge clashes.
-
- Oct 06, 2005
-
-
viteno authored
-