diff --git a/ChangeLog b/ChangeLog
index 7fa88dff0cc2fad02770cabfaba2b0b4d22a8686..fa02a941923eff8675ff312264273bdc486ef851 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 18 16:47:02 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (translate_key_event): Produce
+	C-m, not C-j for return. Handle Escape.
+
 2002-10-22  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkstatusbar.c (gtk_statusbar_get_type): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7fa88dff0cc2fad02770cabfaba2b0b4d22a8686..fa02a941923eff8675ff312264273bdc486ef851 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Oct 18 16:47:02 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (translate_key_event): Produce
+	C-m, not C-j for return. Handle Escape.
+
 2002-10-22  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkstatusbar.c (gtk_statusbar_get_type): 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7fa88dff0cc2fad02770cabfaba2b0b4d22a8686..fa02a941923eff8675ff312264273bdc486ef851 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Fri Oct 18 16:47:02 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (translate_key_event): Produce
+	C-m, not C-j for return. Handle Escape.
+
 2002-10-22  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkstatusbar.c (gtk_statusbar_get_type): 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7fa88dff0cc2fad02770cabfaba2b0b4d22a8686..fa02a941923eff8675ff312264273bdc486ef851 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Oct 18 16:47:02 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (translate_key_event): Produce
+	C-m, not C-j for return. Handle Escape.
+
 2002-10-22  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkstatusbar.c (gtk_statusbar_get_type): 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7fa88dff0cc2fad02770cabfaba2b0b4d22a8686..fa02a941923eff8675ff312264273bdc486ef851 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Oct 18 16:47:02 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (translate_key_event): Produce
+	C-m, not C-j for return. Handle Escape.
+
 2002-10-22  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkstatusbar.c (gtk_statusbar_get_type): 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7fa88dff0cc2fad02770cabfaba2b0b4d22a8686..fa02a941923eff8675ff312264273bdc486ef851 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Oct 18 16:47:02 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (translate_key_event): Produce
+	C-m, not C-j for return. Handle Escape.
+
 2002-10-22  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkstatusbar.c (gtk_statusbar_get_type): 
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index a675734de61951d3d8e4b54b96c31aa903f04f33..ceef45d9f7bec0cf6467a3b675f60aae76b9ca9e 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -576,11 +576,16 @@ translate_key_event (GdkDisplay *display,
       if (event->key.string)
 	event->key.length = bytes_written;
     }
+  else if (event->key.keyval == GDK_Escape)
+    {
+      event->key.length = 1;
+      event->key.string = g_strdup ("\033");
+    }
   else if (event->key.keyval == GDK_Return ||
 	  event->key.keyval == GDK_KP_Enter)
     {
       event->key.length = 1;
-      event->key.string = g_strdup ("\n");
+      event->key.string = g_strdup ("\r");
     }
 
   if (!event->key.string)