Commits

Show all
Author Commit Message Labels Comments Date
viteno
Increment VERSION in Makefile
Tags
ediff-1_71
viteno
Increment VERSION in Makefile
Tags
ediff-1_70
michaelk
* ediff-util.el (ediff-make-temp-file): use the coding system of the buffer for which file is created.
viteno
Increment VERSION in Makefile
Tags
ediff-1_69
michaelk
* ediff-ptch.el (ediff-context-diff-label-regexp): spurious parenthesis. * ediff-init.el: doc strings.
michaelk
2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu> * 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 reg…
viteno
Increment VERSION in Makefile
Tags
2 tags
michaelk
* ediff-util.el (ediff-clone-buffer-for-region-comparison): change text 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
viteno
Increment VERSION in Makefile
Tags
ediff-1_67
michaelk
* ediff-diff.el (ediff-diff-options): clarify docstring. (ediff-setup-diff-regions): disallow -u in ediff-diff-options.
viteno
Increment VERSION in Makefile
Tags
2 tags
michaelk
* ediff-diff.el (ediff-exec-process, ediff-same-file-contents): remove condition-case.
viteno
Increment VERSION in Makefile
Tags
ediff-1_65
michaelk
* ediff-diff.el (ediff-same-file-contents): expand file names. * ediff-mult.el (ediff-append-custom-diff): quote shell file arguments.
viteno
Increment VERSION in Makefile
Tags
ediff-1_64
michaelk
* ediff-util.el (ediff-add-to-history): new function. * ediff.el: use ediff-add-to-history instead of add-to-history.
viteno
Increment VERSION in Makefile
Tags
ediff-1_63
michaelk
* ediff-mult.el (ediff-intersect-directories, 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-di…
viteno
Increment VERSION in Makefile
Tags
2 tags
michaelk
* ediff-diff.el (ediff-setup-diff-regions, ediff-setup-diff-regions3): fix the regular expressions.
viteno
Increment VERSION in Makefile
Tags
ediff-1_61
michaelk
* ediff-diff.el (ediff-ignore-case, ediff-ignore-case-option, 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…
viteno
Increment VERSION in Makefile
Tags
2 tags
michaelk
* ediff-wind (ediff-setup-control-frame, ediff-make-wide-display): preserve user position.
viteno
Increment VERSION in Makefile
Tags
ediff-1_59
michaelk
* ediff-wind (ediff-make-wide-display): Slight simplification. * ediff.el (ediff-date): Changed the date of last update.
viteno
Increment VERSION in Makefile
Tags
ediff-1_58
michaelk
* ediff-util (ediff-make-temp-file): use proper file-name-handler operation
viteno
Increment VERSION in Makefile
Tags
ediff-1_57
michaelk
* ediff-merge.el (ediff-merge-region-is-non-clash): return t, if not merging. * ediff-util.el (ediff-previous-difference): don't skip regions that have merge clashes.
  1. Prev
  2. Next