ediff / ChangeLog

2001-04-08  Steve Youngs  <>

	* Makefile (REQUIRES): Add prog-modes because diff-mode.el
	has moved there.

2001-03-17  Michael Kifer  <>
	* ediff-util.el: Copyright years.
	(ediff-choose-syntax-table): New function.
	(ediff-setup): Use ediff-choose-syntax-table.
	* ediff-init.el (ediff-with-syntax-table): New macro, uses
	* ediff.el: Date of last update, copyright years.
	* ediff-wind (ediff-setup-control-frame): Nill->nil.
2001-02-24  Michael Kifer  <>
	* ediff.texi: Fixed some typos
2001-02-12  Michael Kifer  <>
	* ediff-diff.el (ediff-make-diff2-buffer): Removed bogus checks
	for remote files.
	(ediff-coding-system-for-read): replaced the no-conversion default
	with raw-text.
	* ediff-init.el: Removed :version from defcustom vars.
	* ediff-util.el (ediff-compute-custom-diffs-maybe): Better
	handling of the diff mode
	* ediff.texi: Added ediff-coding-system-for-read.
2001-01-19  Michael Kifer  <>
	* ediff.el (ediff-patch-file): use better defaults.
	* ediff-vers.el: fix for 8+3 DOS file systems
	* ediff.texi: add credits.
2001-01-19  Colin Walters <>
	* ediff-util.el (ediff-compare-custom-diffs-maybe): put diff in
	diff mode, if available.
2001-01-19  Vin Shelton <>
	* ediff-hook.el (ediff-xemacs-init-menus): fixed add-menu-button
2001-01-19  Steve Youngs  <>

	* ediff-init.el (subst-char-in-string): Define and use it, unless
	it's already defined.

2001-01-17  Stephen J. Turnbull  <>

	* Makefile:  Add edebug to REQUIRES (for def-edebug-spec).
2000-12-25  Michael Kifer  <>
	* ediff-init.el (ediff-quit-hook,ediff-suspend-hook): changed
	initialization; use add-hook.
	(ediff-file-remote-p): use file-local-copy.
	* ediff-ptch.el (ediff-prompt-for-patch-buffer): improved defaults.
	* ediff.el (ediff-patch-buffer): bug fix.
	(ediff-revision): allow selection of the file at the prompt.
2000-11-24  Michael Kifer  <>
	* ediff-diff.el: Moved variables around to have it compile under NT.
	* ediff-help.el (ediff-use-long-help-message): made it customizable.
	* ediff-init.el (ediff-abbrev-jobname): use capitalize.
	* ediff-wind.el (ediff-skip-unsuitable-frames): deleted the
	redundant skip-small-frames test.
2000-10-29  Michael Kifer  <>
	* ediff-wind.el (ediff-setup-control-frame): enclose
	face-attribute in condition-case to avoid errors in older emacsen.
2000-10-29  Michael Kifer  <>
	* ediff-init.el (ediff-before-setup-hook): new hook.
	Several typos fixed in various docstrings.
	* ediff-merg.el (ediff-show-clashes-only): docstring typo fixed.
	* ediff-nult.el (ediff-before-session-group-setup-hooks): new
	(ediff-show-meta-buffer): run ediff-before-session-group-setup-hooks.
	* ediff-util.el (ediff-setup): run ediff-before-setup-hook.
	(ediff-other-buffer): use selected buffers if in Buffer-menu buffer.
	(ediff-get-selected-buffers): new function.
	* ediff-vers.el (ediff-vc-internal,ediff-rcs-internal,
	ediff-vc-merge-internal,ediff-rcs-merge-internal): use
	* ediff-wind.el (ediff-skip-unsuitable-frames): more robust
	termination check in while loop.
	* ediff.el (ediff-get-default-file-name): better defaults when in
	dired buffer.
	ediff-merge-files-with-ancestor): use ediff-get-default-file-name.
2000-07-05  Michael Kifer  <>
	* ediff-diff.el (ediff-wordify): use syntax table.
	* ediff-init.el (ediff-has-face-support-p): use
	(ediff-color-display-p): use display-color-p, changed to defun
	from defsubst.
	Got rid of special cases for NeXT and OS/2.
	* ediff-wind.el (ediff-setup-control-frame): set proper modeline
2000-06-05  Michael Kifer  <>
	* ediff-init.el (ediff-has-face-support-p): make it paint faces on
	* ediff-diff.el (ediff-exec-process): use --binary for fine
	differences whenever apropriate.
2000-05-25  Michael Kifer  <>
	* ediff-diff.el (ediff-exec-process): delete --binary option from
	non-buffer ediff jobs.
2000-05-24  Michael Kifer  <>
	* ediff-diff.el (ediff-forward-word): take syntactic word class into
	ediff-reset-diff-options): utilities for proper initialization of
	ediff-diff-options and ediff-diff3-options on Windows.
	* ediff-init.el (ediff-merge-filename-prefix): new customizable
	* ediff-mult.el (ediff-filegroup-action): use
2000-2-28  Michael Kifer  <>
	* ediff-wind.el: minor comment changes.
	* ediff.el: copyright notice date fix.
1999-12-15  Gunnar Evermann  <>

	* ediff-help.el (ediff-customize): Add autoload cookie.

1999-11-24  Michael Kifer  <>
	* ediff*el: replaced old-style backquotes.
	* ediff-merge
	changed to support the new format for ediff-combination-pattern.
	* ediff-diff (ediff-set-fine-overlays-in-one-buffer):
	changed to support the new format for ediff-combination-pattern.
	* ediff.texi: Describe the new format for
1999-11-01  Michael Kifer  <> 
	* ediff-diff.el (ediff-cmp-options): new var.
	(ediff-same-file-contents): use ediff-cmp-options.
	* ediff-ptch.el (ediff-prompt-for-patch-buffer,
	ediff-get-patch-buffer): use current buffer if it appears to be a
	* ediff-util.el (ediff-file-checked-in-p): don't consider CVS
	files checked in.
	(ediff-make-temp-file,ediff-make-empty-tmp-file):  Make sure you
	are writing to a newly created empty file.
	* ediff.texi: minor improvements.
1999-08-18  Michael Kifer  <> 
	* ediff-init.el (ediff-temp-file-prefix): better initialization
	* eviff-vers.el (ediff-vc-merge-internal): small buglet fix
	* ediff.el: comment change
1999-05-27  SL Baur  <>

	* Makefile: bump version number.

1999-05-16  Michael Kifer  <> 
	* ediff.el, ediff-util.el: Enable ediff-merge-directories-* to be
	called with a parameter that specifies the directory where the
	merged files are to be saved.
1999-04-06  Andreas Jaeger  <>

	* ediff.texi: Add comma to satisfy texinfo 3.12f+'s grammar

1999-03-03  Michael Kifer  <> 
	* ediff-mult.el (ediff-get-directory-files-under-revision): Use
	absolute file names.
1999-03-03  Adrian Aichner  <>

        * ediff-init.el (stipple-pixmap): Locate "stipple" library in
        x-bitmap-file-path if bound, else try to locate it in
        mswindows-bitmap-file-path, if bound.
1999-02-16  Michael Kifer  <> 
	* ediff-help.el (ediff-customize): new command.
	* ediff-hooks.el: added menu item for customizing ediff.
1999-02-06  SL Baur  <>

	* ediff-init.el (stipple-pixmap): Move x bitmap dependency to

1999-01-18  Michael Kifer  <> 
	* ediff-patch.el: (ediff-patch-buffer-internal): changed message.
1998-12-09  SL Baur  <>

	* ediff-tbar.el (ediff-toolbar-icon-directory): Don't assume there 
	is always toolbar support.

1998-10-8  Michael Kifer  <> 
        * ediff-util.el (ediff-cleanup-mess): fixed the case of dead windows. 
        make sure you are in a good frame before deleting other 
        * ediff-mult.el (ediff-show-session-group-hook): new default. 
        * ediff-vers.el (ediff-pcl-cvs-view-revision): 
        first cd to the file directory. reportedly works 
        better with remote files. 
        * ediff-vers.el (ediff-pcl-cvs-internal, ediff-pcl-cvs-merge-internal):
        use file-name-nondirectory when passing files to CVS. 
1998-07-20  Michael Kifer  <>

	* ediff-help.el (ediff-long-help-message-merge): default changed.

	* ediff-util.el (ediff-status-info): updated.
	(ediff-toggle-skip-changed-regions): new function.
	(ediff-next-difference, ediff-previous-difference):
	now skips white space correctly in the merge mode.
	ediff-maybe-save-and-delete-merge): changed to give more options to
	the user. 
	(ediff-other-buffer): no longer skips mail buffers.

	* ediff-merg.el (ediff-skip-merge-regions-that-differ-from-default):
	new variable.
	ediff-merge-changed-from-default-p): new functions.

	* ediff-wind.el (ediff-control-frame-parameters):
	improved, to reduce distraction.
	(ediff-skip-unsuitable-frames): make it skip small windows. 

	* ediff-diff.el, ediff-init.el: Improved comments.

	* ediff-mult.el (ediff-hide-marked-sessions):
	make it redraw the meta buffer.
	(ediff-collect-custom-diffs): make the diff buffer read-only, not
	(ediff-mark-for-hiding, ediff-mark-for-operation): renamed to *-at-pos.
	(ediff-mark-session-for-hiding, ediff-mark-session-for-operation,
	ediff-unmark-all-for-operation, ediff-unmark-all-for-hiding): new
	(ediff-setup-meta-map): changed bindings.

	* ediff.el, ediff-init.el, ediff-ptch.el, ediff-help.el,
	ediff-diff.el, ediff-tbar.el, ediff-wind.el, ediff-mult.el: Removed
	function quotes around lambdas. 
	* ediff.texi: add section about $*.

1998-04-27  SL Baur  <>

	* dumped-lisp.el: removed.

1998-02-25  SL Baur  <>

	* ediff-tbar.el (ediff-toolbar-icon-directory): New variable.
	(ediff-toolbar-next-icon): Use it.
	(ediff-toolbar-previous-icon): Ditto.
	(ediff-toolbar-A-icon): Ditto.
	(ediff-toolbar-B-icon): Ditto.
	(ediff-toolbar-toggle-split-icon): Ditto.
	(ediff-toolbar-save-icon): Ditto.
	(ediff-toolbar-quit-icon): Ditto.
	(ediff-toolbar-help-icon): Ditto.
	(ediff-toolbar-refresh-icon): Ditto.
	(ediff-toolbar-refine-icon): Ditto.

	* ediff.texi: Add direntry section for automated installation.

1998-01-24  SL Baur  <>

	* Makefile (VERSION): Update to package standard 1.0.
	* Ditto.

1998-01-03  SL Baur  <>

	* Makefile: Update to newer package interface.

1997-12-25  SL Baur  <>

	* Makefile: Created.