diff --git a/gtkedit/ChangeLog b/gtkedit/ChangeLog
index a10975bd7..004d38be5 100644
--- a/gtkedit/ChangeLog
+++ b/gtkedit/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-12  Pavel Roskin  <proski@gnu.org>
+
+	* edit.c: Handle CK_Shell.
+	* editcmddef.h: Define CK_Shell.
+	* editmenu.c (FileMenu): Remove C-o from the "Open file..."
+	item.
+	(FileMenuEmacs): Likewise.
+
 2001-08-06  Andrew V. Samoilov  <kai@cmail.ru>
 
 	* editcmd.c (edit_replace_prompt): Fix menu location calculation.
diff --git a/gtkedit/edit.c b/gtkedit/edit.c
index 631a0e5aa..d8893b447 100644
--- a/gtkedit/edit.c
+++ b/gtkedit/edit.c
@@ -2612,7 +2612,10 @@ int edit_execute_cmd (WEdit * edit, int command, int char_for_insertion)
     case CK_Mail:
 	edit_mail_dialog (edit);
 	break;
-#endif
+    case CK_Shell:
+	view_other_cmd ();
+	break;
+#endif /* MIDNIGHT */
 
 /* These commands are not handled and must be handled by the user application */
 #ifndef MIDNIGHT
diff --git a/gtkedit/editcmddef.h b/gtkedit/editcmddef.h
index 83b403014..70a24f96d 100644
--- a/gtkedit/editcmddef.h
+++ b/gtkedit/editcmddef.h
@@ -142,6 +142,8 @@
 #define CK_Selection_History	704
 
 #ifdef MIDNIGHT			/* cooledit now has its own full-featured script editor and executor */
+#define CK_Shell		801
+
 /*
    Process a block through a shell command: CK_Pipe_Block(i) executes shell_cmd[i].
    shell_cmd[i] must process the file ~/cooledit.block and output ~/cooledit.block
diff --git a/gtkedit/editmenu.c b/gtkedit/editmenu.c
index d13f52833..955ff185a 100644
--- a/gtkedit/editmenu.c
+++ b/gtkedit/editmenu.c
@@ -125,7 +125,7 @@ void edit_user_menu_cmd (void)          { menu_edit_cmd (1); }
 
 static menu_entry FileMenu[] =
 {
-    {' ', N_("&Open/load...     C-o"), 'O', menu_load_cmd},
+    {' ', N_("&Open file..."),         'O', menu_load_cmd},
     {' ', N_("&New              C-n"), 'N', menu_new_cmd},
     {' ', "", ' ', 0},
     {' ', N_("&Save              F2"), 'S', menu_save_cmd},
@@ -144,7 +144,7 @@ static menu_entry FileMenu[] =
 
 static menu_entry FileMenuEmacs[] =
 {
-    {' ', N_("&Open/load...     C-o"), 'O', menu_load_cmd},
+    {' ', N_("&Open file..."),         'O', menu_load_cmd},
     {' ', N_("&New            C-x k"), 'N', menu_new_cmd},
     {' ', "", ' ', 0},
     {' ', N_("&Save              F2"), 'S', menu_save_cmd},