Ticket #2404: added forgotten shotrcuts of mcedit.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>

lib/tty/key.c

@@ -191,6 +191,7 @@ const key_code_name_t key_name_conv_tab[] = {
     { (int) '\\',	"backslash",	N_("Backslash key"),	"\\" },
     { (int) '#',	"number",	N_("Number sign #"),	"#" },
     { (int) '#',	"hash",		N_("Number sign #"),	"#" },
+    { (int) '@',	"at",		N_("At"),		"@" },
 
     /* meta keys */
     { KEY_M_CTRL,	"control",	N_("Ctrl"),	"C" },

misc/mc.keymap.default

@@ -17,8 +17,8 @@ EditBackSpace = backspace
 EditDelete = delete
 EditPageUp = pgup
 EditPageDown = pgdn
-EditWordLeft = ctrl-left
+EditWordLeft = ctrl-left; ctrl-z
-EditWordRight = ctrl-right
+EditWordRight = ctrl-right; ctrl-x
 EditHome = home
 EditEnd = end
 EditTab = tab
@@ -111,7 +111,7 @@ EditRefresh = ctrl-l
 EditGoto = alt-l
 EditManPage =
 EditSort = alt-t
-EditMail =
+EditMail = alt-m
 EditCancel =
 EditComplete =
 

misc/mc.keymap.emacs

@@ -1,5 +1,5 @@
 [editor]
-EditXStore = meta-w
+EditXStore = alt-w
 EditXPaste = ctrl-y
 EditXCut = ctrl-w
 
@@ -7,20 +7,20 @@ EditDeleteLine = ctrl-y
 EditDeleteToLineEnd = ctrl-k
 EditDeleteToLineBegin =
 
-EditLeft = left
+EditLeft = left; ctrl-b
-EditRight = right
+EditRight = right; ctrl-f
-EditUp = up
+EditUp = up; ctrl-p
-EditDown = down
+EditDown = down; ctrl-n
 EditEnter = enter
 EditReturn = shift-enter
 EditBackSpace = backspace
 EditDelete = delete
-EditPageUp = pgup
+EditPageUp = pgup; alt-v
-EditPageDown = pgdn
+EditPageDown = pgdn; ctrl-v
-EditWordLeft = ctrl-left
+EditWordLeft = ctrl-left; alt-b
-EditWordRight = ctrl-right
+EditWordRight = ctrl-right; alt-f
-EditHome = home
+EditHome = home; ctrl-a
-EditEnd = end
+EditEnd = end; ctrl-e
 EditTab = tab
 EditUndo = ctrl-u
 EditBeginningOfText = ctrl-home; alt-lt
@@ -36,13 +36,13 @@ EditParagraphDown =
 EditSave = f2
 EditLoad =
 EditSaveas = f12
-EditMark = f3
+EditMark = f3; ctrl-at
 EditCopy = f5
 EditMove = f6
 EditRemove = f8
 EditMarkAll =
 EditUnmark =
-EditFind = f7
+EditFind = f7; ctrl-s
 
 EditShiftBlockLeft =
 EditShiftBlockRight =
@@ -119,7 +119,7 @@ EditUtil =
 EditTypeLoadPython =
 EditFindFile =
 EditCtags =
-EditMatchBracket = alt-b
+EditMatchBracket =
 EditTerminal =
 EditTerminalApp =
 EditExtCmd = alt-u

src/keybind.c

@@ -780,7 +780,9 @@ const global_keymap_t default_editor_keymap[] = {
     { KEY_M_CTRL | KEY_UP,                  CK_Scroll_Up,                   "C-Up" },
     { KEY_M_CTRL | KEY_DOWN,                CK_Scroll_Down,                 "C-Down" },
     { KEY_M_CTRL | KEY_LEFT,                CK_Word_Left,                   "C-Left" },
+    { XCTRL ('z'),                          CK_Word_Left,                   "C-z" },
     { KEY_M_CTRL | KEY_RIGHT,               CK_Word_Right,                  "C-Right" },
+    { XCTRL ('x'),                          CK_Word_Right,                  "C-x" },
     { KEY_M_CTRL | KEY_IC,                  CK_XStore,                      "C-Insert" },
     { KEY_M_CTRL | KEY_DC,                  CK_Remove,                      "C-Delete" },
 
@@ -796,6 +798,10 @@ const global_keymap_t default_editor_keymap[] = {
     { XCTRL ('r'),                          CK_Begin_Record_Macro,          "C-r" },
     { XCTRL ('r'),                          CK_End_Record_Macro,            "C-r" },
     { XCTRL ('a'),                          CK_Execute_Macro,               "C-a" },
+    { XCTRL ('f'),                          CK_Save_Block,                  "C-f" },
+    /* Spell check */
+    { XCTRL ('p'),                          CK_Pipe_Block (1),              "C-p" },
+    { XCTRL ('y'),                          CK_Delete_Line,                 "C-y" },
 
     /* Shift */
     { KEY_M_SHIFT | KEY_NPAGE,              CK_Page_Down_Highlight,         "S-PgDn" },
@@ -848,6 +854,8 @@ const global_keymap_t default_editor_keymap[] = {
     { ALT ('i'),                            CK_Prev_Bookmark,               "M-i" },
     { ALT ('j'),                            CK_Next_Bookmark,               "M-j" },
     { ALT ('o'),                            CK_Flush_Bookmarks,             "M-o" },
+    { ALT ('b'),                            CK_Match_Bracket,               "M-b" },
+    { ALT ('m'),                            CK_Mail,                        "M-m" },
 
     { XCTRL ('x'),                          CK_Ext_Mode,                    "C-x" },