# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 953689793 0
# Node ID 58835ebb9f63e5cea3629c2162c13e77abde2641
# Parent  21d27711125fa53c2fb23dd8850533541782ab67
*** empty log message ***

diff -r 21d27711125f -r 58835ebb9f63 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Mar 22 01:10:09 2000 +0000
+++ b/lisp/ChangeLog	Wed Mar 22 01:49:53 2000 +0000
@@ -1,3 +1,25 @@
+2000-03-21  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* log-view.el (log-view-(msg|file)-(prev|next)): Rename from
+	log-view-*-(message|file) and use easy-mmode-define-navigation.
+	(log-view-message-re): Match SCCS format as well.
+	And match the revision line rather than the dashed separator line.
+	(log-view-mode): Use the new define-derived-mode.
+	(log-view-current-tag): Fill in with an actual implementation.
+
+	* cvs-status.el (cvs-status-(prev|next)): Rename from
+	cvs-status-(prev|next)-entry and use easy-mmode-define-navigation.
+	(cvs-tree-dstr-*): Rename from cvstree-dstr-* and use two ascii chars
+	to let the output "breathe" a little more (more readable).
+	(cvs-status-mode): Use the new define-derived-mode.
+
+	* smerge-mode.el (smerge-auto-leave): New function and variable.
+	(smerge-basic-map): Rename from smerge-basic-keymap.
+	Change the bindings for smerge-diff-*.
+	(smerge-*-map): Use easy-mmode-defmap.
+	(smerge-(next|prev)): Use easy-mmode-define-navigation.
+	(smerge-keep-*): Use smerge-auto-leave.
+
 2000-03-21  Jason Rumney  <jasonr@gnu.org>
 
 	* cus-edit.el (custom-button-face): Use 3D look for w32.