# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 969555150 0
# Node ID 28cd92291814a656a01b6f2000d6fbd20b23a3c7
# Parent  e5a0c71206119eb7934f820786eaa711fcfabf76
*** empty log message ***

diff -r e5a0c7120611 -r 28cd92291814 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Sep 21 16:52:23 2000 +0000
+++ b/lisp/ChangeLog	Thu Sep 21 16:52:30 2000 +0000
@@ -1,3 +1,16 @@
+2000-09-21  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* diff-mode.el (diff-file-header-face): Reset to its previous value.
+	(diff-hunk-text): Correctly use offsets rather than buffer-positions.
+	(diff-xor): New function.
+	(diff-find-source-location): Use it.  Fix a stupid name clash.
+	(diff-hunk-status-msg): New function.
+	(diff-apply-hunk): Drop args OTHER-FILE, DRY-RUN, POPUP and NOERROR.
+	(diff-test-hunk): Use diff-find-source-location.
+	(diff-goto-source): Favor the `reverse'.
+	(diff-hunk-text): Properly handle one-sided context diffs.
+	(diff-apply-hunk): When done, advance to the next hunk.
+
 2000-09-21  Gerd Moellmann  <gerd@gnu.org>
 
 	* add-log.el (change-log-date-face, change-log-name-face)