# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1096930813 0
# Node ID 360e84818bf3109264ff74e744309b45aebd2358
# Parent  0201b31364c4932fa73c222f2c889bb53c6e9724
*** empty log message ***

diff -r 0201b31364c4 -r 360e84818bf3 etc/ChangeLog
--- a/etc/ChangeLog	Mon Oct 04 22:38:22 2004 +0000
+++ b/etc/ChangeLog	Mon Oct 04 23:00:13 2004 +0000
@@ -1,3 +1,8 @@
+2004-10-04  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* enriched.doc: Update for new bindings of `set-left-margin' and
+	`set-right-margin'.
+
 2004-10-04  Kim F. Storm  <storm@cua.dk>
 
 	* DEBUG: Mention pp and ff commands.
diff -r 0201b31364c4 -r 360e84818bf3 etc/NEWS
--- a/etc/NEWS	Mon Oct 04 22:38:22 2004 +0000
+++ b/etc/NEWS	Mon Oct 04 23:00:13 2004 +0000
@@ -99,6 +99,11 @@
 * Changes in Emacs 21.4
 
 +++
+** In Enriched mode, `set-left-margin' and `set-right-margin' are now
+by default bound to `C-c [' and `C-c ]' instead of the former `C-c C-l'
+and `C-c C-r'.
+
++++
 ** In processing a local variables list, Emacs strips the prefix and
 suffix are from every line before processing all the lines.
 
diff -r 0201b31364c4 -r 360e84818bf3 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Oct 04 22:38:22 2004 +0000
+++ b/lisp/ChangeLog	Mon Oct 04 23:00:13 2004 +0000
@@ -1,3 +1,9 @@
+2004-10-04  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* textmodes/enriched.el (enriched-mode-map): Give
+	`set-left-margin' and `set-right-margin' bindings that follow the
+	minor mode conventions.
+
 2004-10-03  Stefan  <monnier@iro.umontreal.ca>
 
 	* textmodes/tex-mode.el (tex-dvi-view-command): Use `yap' on w32.