Commits

Show all
Author Commit Message Labels Comments Date
viteno
Increment VERSION in Makefile
Tags
ediff-1_75
michaelk
* ediff*.el: replace 3-argument 'require' statements with 1-argument ones (wrapped in if's). For compatibility with the current stable version of XEmacs.
michaelk
* ediff*el: replaced load with require in eval-when-compile. * ediff-hook: deleted all invocations of (autoload ...). * ediff-util.el (ediff-setup): make window-min-height a local variable in ediff control window, and set its min height to 2. (ediff-setup-control-buffer): dedicate the control window. (ediff-toggle-multiframe): undedicate control window. Work directly with ediff-setup-windows-multiframe and ediff-setup-windows-plain. * ediff-wind (…
viteno
Increment VERSION in Makefile
Tags
ediff-1_74
michaelk
* ediff*.el: uncommented declare-function.
viteno
Increment VERSION in Makefile
Tags
ediff-1_73
michaelk
* ediff*.el: many minor changes from the emacs tree. * ediff-util (eqiff-quit): autoraise minibuffer. * ediff-diff (ediff-convert-fine-diffs-to-overlays): make it a defin instead of defsubst.
viteno
Increment VERSION in Makefile
Tags
ediff-1_72
michaelk
changed REQUIRES
michaelk
typo
michaelk
* ediff-vers (ediff-vc-working-revision): add a quote.
michaelk
* ediff-util.el (ediff-make-current-diff-overlay): do not use face-name. 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): u…
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…
  1. Prev
  2. Next