From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 22 Mar 2000 00:39:25 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~4554
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ae39f53387ddc5e86114ce723606eb6bc0e6e13;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a64217b471..a8a6b1717e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -14,6 +14,17 @@
 
 2000-03-21  Stefan Monnier  <monnier@cs.yale.edu>
 
+	* diff-mode.el (diff-mode-*-map): use `easy-mmode-defmap'.
+	(diff-end-of-hunk): Return the end position for use in
+	`easy-mmode-define-navigation'.
+	(diff-recenter): Remove.
+	(diff-(next|prev)-*): Rename `diff-*-(prev|next)' and defined in terms
+	of `easy-mmode-define-navigation'.
+	(diff-kill-*): Rename `diff-*-kill' (for consistency with the
+	previous renaming) and fix to use new names.
+	(diff-merge-strings): Use \n as separator: simpler, faster.
+	(diff-mode): Use `define-derived-mode'.
+
 	* derived.el (define-derived-mode): Don't autoload anymore.
 	Prefer the macro-only version provided by easy-mmode.el.