ediff / ChangeLog

1999-11-24  Michael Kifer  <kifer@cs.sunysb.edu>
	
	* ediff*el: replaced old-style backquotes.
	
	* ediff-merge
	(ediff-looks-like-combined-merge,ediff-get-combined-region):
	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
	ediff-combination-pattern.
		
1999-11-01  Michael Kifer  <kifer@cs.sunysb.edu> 
	
	* 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
	patch.
	
	* 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  <kifer@cs.sunysb.edu> 
	
	* 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  <steve@xemacs.org>

	* Makefile: bump version number.

1999-05-16  Michael Kifer  <kifer@cs.sunysb.edu> 
	
	* 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  <aj@arthur.rhein-neckar.de>

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

1999-03-03  Michael Kifer  <kifer@cs.sunysb.edu> 
	
	* ediff-mult.el (ediff-get-directory-files-under-revision): Use
	absolute file names.
	
1999-03-03  Adrian Aichner  <aichner@ecf.teradyne.com>

        * 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  <kifer@cs.sunysb.edu> 
	
	* ediff-help.el (ediff-customize): new command.
	
	* ediff-hooks.el: added menu item for customizing ediff.
	
1999-02-06  SL Baur  <steve@xemacs.org>

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

1999-01-18  Michael Kifer  <kifer@cs.sunysb.edu> 
	
	* ediff-patch.el: (ediff-patch-buffer-internal): changed message.
	
1998-12-09  SL Baur  <steve@altair.xemacs.org>

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

1998-10-8  Michael Kifer  <kifer@cs.sunysb.edu> 
 
        * ediff-util.el (ediff-cleanup-mess): fixed the case of dead windows. 
        make sure you are in a good frame before deleting other 
        windows. 
 
        * 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  <kifer@cs.sunysb.edu>

	* 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-write-merge-buffer-and-maybe-kill,
	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-skip-merge-region-if-changed-from-default-p,
	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
	modified. 
	(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
	functions. 
	(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  <steve@altair.xemacs.org>

	* dumped-lisp.el: removed.

1998-02-25  SL Baur  <steve@altair.xemacs.org>

	* 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  <steve@altair.xemacs.org>

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

1998-01-03  SL Baur  <steve@altair.xemacs.org>

	* Makefile: Update to newer package interface.

1997-12-25  SL Baur  <steve@altair.xemacs.org>

	* Makefile: Created.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.