diff --git a/ChangeLog b/ChangeLog
index 1c458a15f..1fcfb90d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-06-05  Pavel Roskin  <proski@gnu.org>
 
+	* edit/edit_key_translator.c [HAVE_CHARSET]: Add charset
+	conversion support.
+	From Walery Studennikov <hqsoftware@mail.ru>.
+
 	* extraconf.h [HAVE_X]: Undefine HAVE_TEXTMODE_X11_SUPPORT.
 
 2001-06-01  Pavel Roskin  <proski@gnu.org>
diff --git a/edit/edit_key_translator.c b/edit/edit_key_translator.c
index 3ece101f5..a06ccaefd 100644
--- a/edit/edit_key_translator.c
+++ b/edit/edit_key_translator.c
@@ -145,6 +145,16 @@
 	break;
     }
 
+#ifdef HAVE_CHARSET
+    if (x_key == XCTRL('t')) {
+	do_select_codepage();
+
+	edit->force = REDRAW_COMPLETELY;
+	command = CK_Refresh;
+	goto fin;
+    }
+#endif
+
     if (x_key == XCTRL ('q')) {
 	char_for_insertion = edit_raw_key_query (_(" Insert Literal "), _(" Press any key: "), 0);
 	goto fin;
@@ -268,10 +278,17 @@
 	}
     }
 /* an ordinary insertable character */
+
+#ifndef HAVE_CHARSET
     if (x_key < 256 && is_printable (x_key)) {
 	char_for_insertion = x_key;
+#else
+    if (x_key < 256 && is_printable (conv_input [x_key])) {
+	char_for_insertion = conv_input [x_key];
+#endif
 	goto fin;
     }
+
 /* other commands */
     i = 0;
     while (key_map[i] != x_key && (key_map[i] || key_map[i + 1]))