Commits

Show all
Author Commit Message Labels Comments Date
viteno
Increment VERSION in Makefile
Tags
ediff-1_78
michaelk
* ediff-init.el (ediff-coding-system): use escape-quoted in case of XEmacs. * ediff-merg.el (ediff-merge-region-is-non-clash-to-skip, ediff-merge-region-is-non-clash, ediff-skip-merge-region-if-changed-from-default-p): use defun. Also check if the job is really a merge job. * ediff.el (ediff-current-file): new function. * Changes from the Emacs main trunk.
viteno
Increment VERSION in Makefile
Tags
2 tags
michaelk
* ediff-hook.el: added tooltips to Emacs menus. * ediff.el: changed date of last update.
viteno
Increment VERSION in Makefile
Tags
ediff-1_76
michaelk
* ediff-util.el (ediff-toggle-multiframe): Check if control window is live. (ediff-save-buffer): Let window-min-height to 2. * ediff-wind.el (ediff-setup-windows-plain-compare): Avoid selecting the minibuffer. * ediff*.el, ediff.texi: Copied changes from Emacs CVS.
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.
  1. Prev
  2. Next