Unification of keybinding names.

Most of keybind names are changed to unify that names.
Details see in doc/keybind-migration.txt file.

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

doc/keybind-migration.txt

@@ -1,4 +1,3 @@
-
 This file describes how keybind names used in mc.keymap.* files
 are changed in 4.8.* releases.
 
@@ -7,53 +6,479 @@ are changed in 4.8.* releases.
 +---------------------------------+-------------------------+-----------------------------------------+
 |                                            [main] section                                           |
 +---------------------------------+-------------------------+-----------------------------------------+
-|                                 |                         |                                         |
+| CmdCopy                         | Copy                    |                                         |
+| CmdRename                       | Move                    |                                         |
+| CmdDelete                       | Delete                  |                                         |
+| CmdMkdir                        | MakeDir                 |                                         |
+| ShowCommandLine                 | Shell                   |                                         |
+| CmdMenu                         | Menu                    |                                         |
+| CmdMenuLastSelected             | MenuLastSelected        |                                         |
+| CmdUserMenu                     | UserMenu                |                                         |
+| CmdEditMcMenu                   | EditUserMenu            |                                         |
+| CmdHelp                         | Help                    |                                         |
+| CmdHistory                      | History                 |                                         |
+| CmdEdit                         | Edit                    |                                         |
+| CmdEditForceInternal            | EditForceInternal       |                                         |
+| CmdView                         | View                    |                                         |
+| CmdViewFile                     | ViewFile                |                                         |
+| CmdFilteredView                 | ViewFiltered            |                                         |
+| CmdFind                         | Find                    |                                         |
+| CmdReread                       | Reread                  |                                         |
+| CmdSingleDirsize                | DirSize                 |                                         |
+| CmdDialogList                   | ScreenList              |                                         |
+| CmdSuspend                      | Suspend                 |                                         |
+| CmdCopyCurrentPathname          | PutCurrentPath          |                                         |
+| CmdCopyOtherPathname            | PutOtherPath            |                                         |
+| CmdSelect                       | Select                  |                                         |
+| CmdUnselect                     | Unselect                |                                         |
+| CmdReverseSelection             | SelectInvert            |                                         |
+| CmdQuickChdir                   | HotList                 |                                         |
+| CmdSwapPanel                    | Swap                    |                                         |
+| CmdListing                      | PanelListing            |                                         |
+| CmdToggleListing                | PanelListingSwitch      |                                         |
+| CmdChangeListing                | PanelListingChange      |                                         |
+| CmdToggleShowHidden             | ShowHidden              |                                         |
+| CmdTogglePanelsSplit            | SplitVertHoriz          |                                         |
+| CmdQuickCd                      | CdQuick                 |                                         |
+| CmdConfigureBox                 | Options                 |                                         |
+| CmdLayout                       | OptionsLayout           |                                         |
+| CmdPanelOptions                 | OptionsPanel            |                                         |
+| CmdConfirmBox                   | OptionsConfirm          |                                         |
+| CmdDisplayBitsBox               | OptionsDisplayBits      |                                         |
+| CmdConfigureVfs                 | OptionsVfs              |                                         |
+| CmdSaveSetup                    | SaveSetup               |                                         |
+| CmdEditExtFile                  | EditExtensionsFile      |                                         |
+| CmdEditFhlFile                  | EditFileHighlightFile   |                                         |
+| CmdFilter                       | Filter                  |                                         |
+| CmdFishlink                     | ConnectFish             |                                         |
+| CmdFtplink                      | ConnectFtp              |                                         |
+| CmdSmblink                      | ConnectSmb              |                                         |
+| CmdUndelete                     | Undelete                |                                         |
+| CmdQuit                         | Quit                    |                                         |
+| CmdQuietQuit                    | QuitQuiet               |                                         |
+| ExtMap1                         | ExtendedKeyMap          |                                         |
+| CmdEditUserMenu                 |                         | Unused. Removed                         |
 +---------------------------------+-------------------------+-----------------------------------------+
 |                                          [main:xmap] section                                        |
 +---------------------------------+-------------------------+-----------------------------------------+
-|                                 |                         |                                         |
+| CmdChmod                        | ChangeMode              |                                         |
+| CmdChown                        | ChangeOwn               |                                         |
+| CmdCompareDirs                  | CompareDirs             |                                         |
+| CmdDiffView                     | CompareFiles            |                                         |
+| CmdInfo                         | PanelInfo               |                                         |
+| CmdQuickView                    | PanelQuickView          |                                         |
+| CmdLink                         | Link                    |                                         |
+| CmdSymlink                      | LinkSymbolic            |                                         |
+| CmdRelativeSymlink              | LinkSymbolicRelative    |                                         |
+| CmdEditSymlink                  | LinkSymbolicEdit        |                                         |
+| CmdExternalPanelize             | ExternalPanelize        |                                         |
+| CmdReselectVfs                  | VfsList                 |                                         |
+| CmdJobs                         | Jobs                    |                                         |
+| CmdAddHotlist                   | HotListAdd              |                                         |
+| CmdCopyCurrentPathname          | PutCurrentPath          |                                         |
+| CmdCopyOtherPathname            | PutOtherPath            |                                         |
+| CmdCopyCurrentTagged            | PutCurrentTagged        |                                         |
+| CmdCopyOtherTagged              | PutOtherTagged          |                                         |
+| CmdCopyCurrentReadlink          | PutCurrentLink          |                                         |
+| CmdCopyOtherReadlink            | PutOtherLink            |                                         |
 +---------------------------------+-------------------------+-----------------------------------------+
 |                                            [panel] section                                          |
 +---------------------------------+-------------------------+-----------------------------------------+
-|                                 |                         |                                         |
+| PanelMoveUp                     | Up                      |                                         |
+| PanelMoveDown                   | Down                    |                                         |
+| PanelMoveLeft                   | Left                    |                                         |
+| PanelMoveRight                  | Right                   |                                         |
+| PanelPrevPage                   | PageUp                  |                                         |
+| PanelNextPage                   | PageDown                |                                         |
+| PanelMoveHome                   | Top                     |                                         |
+| PanelMoveEnd                    | Bottom                  |                                         |
+| PanelGotoTopFile                | TopOnScreen             |                                         |
+| PanelGotoMiddleFile             | MiddleOnScreen          |                                         |
+| PanelGotoBottomFile             | BottomOnScreen          |                                         |
+| PanelCopyLocal                  | CopySingle              |                                         |
+| PanelRenameLocal                | MoveSingle              |                                         |
+| PanelDeleteLocal                | DeleteSingle            |                                         |
+| PanelStartSearch                | Search                  |                                         |
+| PanelSetPanelEncoding           | SelectCodepage          |                                         |
+| PanelDirectoryHistoryList       | History                 |                                         |
+| PanelDirectoryHistoryNext       | HistoryNext             |                                         |
+| PanelDirectoryHistoryPrev       | HistoryPrev             |                                         |
+| PanelEditNew                    | EditNew                 |                                         |
+| PanelViewSimple                 | ViewRaw                 |                                         |
+| PanelSelect                     | Select                  |                                         |
+| PanelUnselect                   | Unselect                |                                         |
+| PanelReverseSelection           | SelectInvert            |                                         |
+| PanelSyncOtherPanel             | PanelOtherSync          |                                         |
+| PanelChdirOtherPanel            | PanelOtherCd            |                                         |
+| PanelChdirToReadlink            | PanelOtherCdLink        |                                         |
+| PanelGotoChildDir               | CdChild                 |                                         |
+| PanelGotoParentDir              | CdParent                |                                         |
+| PanelSmartGotoParentDir         | CdParentSmart           |                                         |
+| PanelMarkFile                   | Mark                    |                                         |
+| PanelMarkDown                   | MarkDown                |                                         |
+| PanelMarkUp                     | MarkUp                  |                                         |
+| PanelDoEnter                    | Enter                   |                                         |
+| PanelSelectSortOrder            | Sort                    |                                         |
+| PanelReverseSort                | SortReverse             |                                         |
+| PanelToggleSortOrderPrev        | SortPrev                |                                         |
+| PanelToggleSortOrderNext        | SortNext                |                                         |
+| PanelSortOrderByName            | SortByName              |                                         |
+| PanelSortOrderByExt             | SortByExt               |                                         |
+| PanelSortOrderBySize            | SortBySize              |                                         |
+| PanelSortOrderByMTime           | SortByMTime             |                                         |
 +---------------------------------+-------------------------+-----------------------------------------+
 |                                           [dialog] section                                          |
 +---------------------------------+-------------------------+-----------------------------------------+
-|                                 |                         |                                         |
+| DialogOK                        | Ok                      |                                         |
+| DialogCancel                    | Cancel                  |                                         |
+| DialogPrevItem                  | Up, Left                | Left should not be used                 |
+| DialogNextItem                  | Down, Right             | Right should not be used                |
+| DialogHelp                      | Help                    |                                         |
+| DialogRefresh                   | Refresh                 |                                         |
+| DialogSuspend                   | Suspend                 |                                         |
+| CmdDialogList                   | ScreenList              |                                         |
+| CmdDialogNext                   | ScreenNext              |                                         |
+| CmdDialogPrev                   | ScreenPrev              |                                         |
 +---------------------------------+-------------------------+-----------------------------------------+
 |                                            [input] section                                          |
 +---------------------------------+-------------------------+-----------------------------------------+
-|                                 |                         |                                         |
+| InputBol                        | Home                    |                                         |
+| InputEol                        | End                     |                                         |
+| InputMoveLeft                   | Left                    |                                         |
+| InputMoveRight                  | Right                   |                                         |
+| InputBackwardChar               |                         | Removed. 'Left' is used instead         |
+| InputForwardChar                |                         | Removed. 'Right' is used instead        |
+| InputWordLeft                   | WordLeft                |                                         |
+| InputBackwardWord               |                         | Removed. 'WordLeft' is used instead     |
+| InputWordRight                  | WordRight               |                                         |
+| InputForwardWord                |                         | Removed. 'WordRight' is used instead    |
+| InputDeleteChar                 | Delete                  |                                         |
+| InputBackwardDelete             | Backspace               |                                         |
+| InputBackwardKillWord           | DeleteToWordBegin       |                                         |
+| InputKillWord                   | DeleteToWordEnd         |                                         |
+| InputKillLine                   | DeleteToEnd             |                                         |
+| InputKillRegion                 | Remove                  |                                         |
+| InputClearLine                  | Clear                   |                                         |
+| InputComplete                   | Complete                |                                         |
+| InputSetMark                    | Mark                    |                                         |
+| InputLeftHighlight              | MarkLeft                |                                         |
+| InputRightHighlight             | MarkRight               |                                         |
+| InputWordLeftHighlight          | MarkToWordBegin         |                                         |
+| InputWordRightHighlight         | MarkToWordEnd           |                                         |
+| InputBolHighlight               | MarkToHome              |                                         |
+| InputEolHighlight               | MarkToEnd               |                                         |
+| InputHistoryPrev                | HistoryPrev             |                                         |
+| InputHistoryNext                | HistoryNext             |                                         |
+| InputHistoryShow                | History                 |                                         |
+| InputXCut                       | Cut                     |                                         |
+| InputXStore                     | Store                   |                                         |
+| InputXPaste                     | Paste                   |                                         |
+| InputYank                       | Yank                    |                                         |
 +---------------------------------+-------------------------+-----------------------------------------+
 |                                           [listbox] section                                         |
 +---------------------------------+-------------------------+-----------------------------------------+
-|                                 |                         |                                         |
+| ListboxMoveUp                   | Up                      |                                         |
+| ListboxMoveDown                 | Down                    |                                         |
+| ListboxMovePgUp                 | PageUp                  |                                         |
+| ListboxMovePgDn                 | PageDown                |                                         |
+| ListboxMoveHome                 | Top                     |                                         |
+| ListboxMoveEnd                  | Bottom                  |                                         |
+| ListboxDeleteItem               | Delete                  |                                         |
+| ListboxDeleteAll                | Clear                   |                                         |
 +---------------------------------+-------------------------+-----------------------------------------+
 |                                            [tree] section                                           |
 +---------------------------------+-------------------------+-----------------------------------------+
-|                                 |                         |                                         |
+| TreeMoveUp                      | Up                      |                                         |
+| TreeMoveDown                    | Down                    |                                         |
+| TreeMoveLeft                    | Left                    |                                         |
+| TreeMoveRight                   | Right                   |                                         |
+| TreeMovePgUp                    | PageUp                  |                                         |
+| TreeMovePgDn                    | PageDown                |                                         |
+| TreeMoveHome                    | Top                     |                                         |
+| TreeMoveEnd                     | Bottom                  |                                         |
+| TreeCopy                        | Copy                    |                                         |
+| TreeMove                        | Move                    |                                         |
+| TreeRemove                      | Delete                  |                                         |
+| TreeHelp                        | Help                    |                                         |
+| TreeStartSearch                 | Search                  |                                         |
+| TreeRescan                      | Reread                  |                                         |
+| TreeToggleNav                   | ToggleNavigation        |                                         |
+| TreeForget                      | Forget                  |                                         |
+| TreeOpen                        | Enter                   |                                         |
 +---------------------------------+-------------------------+-----------------------------------------+
 |                                            [help] section                                           |
 +---------------------------------+-------------------------+-----------------------------------------+
-|                                 |                         |                                         |
+| HelpIndex                       | Index                   |                                         |
+| HelpBack                        | Back                    |                                         |
+| HelpMoveUp                      | Up                      |                                         |
+| HelpMoveDown                    | Down                    |                                         |
+| HelpMovePgUp                    | PageUp                  |                                         |
+| HelpMovePgDn                    | PageDown                |                                         |
+| HelpMoveHalfPgUp                | HalfPageUp              |                                         |
+| HelpMoveHalfPgDn                | HalfPageDown            |                                         |
+| HelpMoveTop                     | Top                     |                                         |
+| HelpMoveBottom                  | Bottom                  |                                         |
+| HelpSelectLink                  | Enter                   |                                         |
+| HelpNextLink                    | LinkNext                |                                         |
+| HelpPrevLink                    | LinkPrev                |                                         |
+| HelpNextNode                    | NodeNext                |                                         |
+| HelpPrevNode                    | NodePrev                |                                         |
+| HelpHelp                        | Help                    |                                         |
+| HelpQuit                        | Quit                    |                                         |
 +---------------------------------+-------------------------+-----------------------------------------+
 |                                           [editor] section                                          |
 +---------------------------------+-------------------------+-----------------------------------------+
-|                                 |                         |                                         |
+| EditEnter                       | Enter                   |                                         |
+| EditUp                          | Up                      |                                         |
+| EditDown                        | Down                    |                                         |
+| EditLeft                        | Left                    |                                         |
+| EditRight                       | Right                   |                                         |
+| EditHome                        | Home                    |                                         |
+| EditEnd                         | End                     |                                         |
+| EditPageUp                      | PageUp                  |                                         |
+| EditPageDown                    | PageDown                |                                         |
+| EditBeginningOfText             | Top                     |                                         |
+| EditEndOfText                   | Bottom                  |                                         |
+| EditBeginPage                   | TopOnScreen             |                                         |
+| EditEndPage                     | BottomOnScreen          |                                         |
+| EditParagraphUp                 | ParagraphUp             |                                         |
+| EditParagraphDown               | ParagraphDown           |                                         |
+| EditParagraphFormat             | ParagraphFormat         |                                         |
+| EditRemove                      | Remove                  |                                         |
+| EditDelete                      | Delete                  |                                         |
+| EditBackSpace                   | BackSpace               |                                         |
+| EditWordLeft                    | WordLeft                |                                         |
+| EditWordRight                   | WordRight               |                                         |
+| EditDeleteWordLeft              | DeleteToWordBegin       |                                         |
+| EditDeleteWordRight             | DeleteToWordEnd         |                                         |
+| EditDeleteLine                  | DeleteLine              |                                         |
+| EditDeleteToLineBegin           | DeleteToHome            |                                         |
+| EditDeleteToLineEnd             | DeleteToEnd             |                                         |
+| EditReturn                      | Return                  |                                         |
+| EditTab                         | Tab                     |                                         |
+| EditToggleInsert                | InsertOverwrite         |                                         |
+| EditUndo                        | Undo                    |                                         |
+| EditRedo                        | Redo                    |                                         |
+| EditInsertLiteral               | InsertLiteral           |                                         |
+| EditMenu                        | Menu                    |                                         |
+| EditUserMenu                    | UserMenu                |                                         |
+|                                 | EditUserMenu            | Added to edit the user menu of editor   |
+| EditSelectionHistory            | History                 |                                         |
+| EditHelp                        | Help                    |                                         |
+| EditFind                        | Search                  |                                         |
+| EditFindAgain                   | SearchContinue          |                                         |
+| EditReplace                     | Replace                 |                                         |
+| EditReplaceAgain                | ReplaceContinue         |                                         |
+| EditCompleteWord                |                         | Removed. 'Complete' is used instead     |
+| EditComplete                    | Complete                |                                         |
+| EditLoad                        | EditFile                |                                         |
+| EditInsertFile                  | InsertFile              |                                         |
+| EditSave                        | Save                    |                                         |
+| EditSaveas                      | SaveAs                  |                                         |
+| EditSaveBlock                   | BlockSave               |                                         |
+| EditShiftBlockLeft              | BlockShiftLeft          |                                         |
+| EditShiftBlockRight             | BlockShiftRight         |                                         |
+| EditMark                        | Mark                    |                                         |
+| EditColumnMark                  | MarkColumn              |                                         |
+| EditMarkAll                     | MarkAll                 |                                         |
+| EditLeftHighlight               | MarkLeft                |                                         |
+| EditRightHighlight              | MarkRight               |                                         |
+| EditUpHighlight                 | MarkUp                  |                                         |
+| EditDownHighlight               | MarkDown                |                                         |
+| EditPageUpHighlight             | MarkPageUp              |                                         |
+| EditPageDownHighlight           | MarkPageDown            |                                         |
+| EditParagraphUpHighlight        | MarkParagraphUp         |                                         |
+| EditParagraphDownHighlight      | MarkParagraphDown       |                                         |
+| EditWordLeftHighlight           | MarkToWordBegin         |                                         |
+| EditWordRightHighlight          | MarkToWordEnd           |                                         |
+| EditHomeHighlight               | MarkToHome              |                                         |
+| EditEndHighlight                | MarkToEnd               |                                         |
+| EditBeginningOfTextHighlight    | MarkToFileBegin         |                                         |
+| EditEndOfTextHighlight          | MarkToFileEnd           |                                         |
+| EditBeginPageHighlight          | MarkToPageBegin         |                                         |
+| EditEndPageHighlight            | MarkToPageEnd           |                                         |
+| EditScrollUpHighlight           | MarkScrollUp            |                                         |
+| EditScrollDownHighlight         | MarkScrollDown          |                                         |
+| EditLeftAltHighlight            | MarkColumnLeft          |                                         |
+| EditRightAltHighlight           | MarkColumnRight         |                                         |
+| EditUpAltHighlight              | MarkColumnUp            |                                         |
+| EditDownAltHighlight            | MarkColumnDown          |                                         |
+| EditPageUpAltHighlight          | MarkColumnPageUp        |                                         |
+| EditPageDownAltHighlight        | MarkColumnPageDown      |                                         |
+| EditParagraphUpAltHighlight     | MarkColumnParagraphUp   |                                         |
+| EditParagraphDownAltHighlight   | MarkColumnParagraphDown |                                         |
+| EditScrollUpAltHighlight        | MarkColumnScrollUp      |                                         |
+| EditScrollDownAltHighlight      | MarkColumnScrollDown    |                                         |
+| EditUnmark                      | Unmark                  |                                         |
+| EditCopy                        | Copy                    |                                         |
+| EditMove                        | Move                    |                                         |
+| EditScrollUp                    | ScrollUp                |                                         |
+| EditScrollDown                  | ScrollDown              |                                         |
+| EditGoto                        | Goto                    |                                         |
+| EditToggleLineState             | ShowNumbers             |                                         |
+| EditToggleTabTWS                | ShowTabTws              |                                         |
+| EditToggleShowMargin            | ShowMargin              |                                         |
+| EditToggleSyntax                | SyntaxOnOff             |                                         |
+| EditChooseSyntax                | SyntaxChoose            |                                         |
+| EditToggleBookmark              | Bookmark                |                                         |
+| EditNextBookmark                | BookmarkNext            |                                         |
+| EditPrevBookmark                | BookmarkPrev            |                                         |
+| EditFlushBookmarks              | BookmarkFlush           |                                         |
+| EditFindDefinition              | Find                    |                                         |
+| EditLoadNextFile                | FileNext                |                                         |
+| EditLoadPrevFile                | FilePrev                |                                         |
+| EditXCut                        | Cut                     |                                         |
+| EditXStore                      | Store                   |                                         |
+| EditXPaste                      | Paste                   |                                         |
+| EditShell                       | Shell                   |                                         |
+| EditRefresh                     | Refresh                 |                                         |
+| EditSort                        | Sort                    |                                         |
+| EditOptions                     | Options                 |                                         |
+| EditSaveMode                    | OptionsSaveMode         |                                         |
+| EditMatchBracket                | MatchBracket            |                                         |
+| EditDate                        | Date                    |                                         |
+| EditMail                        | Mail                    |                                         |
+| EditQuit                        | Quit                    |                                         |
+| EditAbout                       | About                   |                                         |
+| EditExtMode                     | ExtendedKeyMap          |                                         |
+| EditExtCmd                      | ExternalCommand         |                                         |
+| EditBeginRecordMacro            | MacroStartRecord        |                                         |
+| EditEndRecordMacro              | MacroStopRecord         |                                         |
+| EditBeginOrEndMacro             | MacroStartStopRecord    |                                         |
+| EditDeleteMacro                 | MacroDelete             |                                         |
+| CmdLearnKeys                    | LearnKeys               |                                         |
+| EditFindFile                    |                         | Unused. Removed                         |
+| EditExecuteMacro                |                         | Unused. Removed                         |
+| EditWordLeftAltHighlight        |                         | Unused. Removed                         |
+| EditWordRightAltHighlight       |                         | Unused. Removed                         |
+| EditHomeAltHighlight            |                         | Unused. Removed                         |
+| EditEndAltHighlight             |                         | Unused. Removed                         |
+| EditBeginningOfTextAltHighlight |                         | Unused. Removed                         |
+| EditEndOfTextAltHighlight       |                         | Unused. Removed                         |
+| EditBeginPageAltHighlight       |                         | Unused. Removed                         |
+| EditEndPageAltHighlight         |                         | Unused. Removed                         |
+| EditSaveAndQuit                 |                         | Unused. Removed                         |
+| EditCheckSaveAndQuit            |                         | Unused. Removed                         |
+| EditNewWindow                   |                         | Unused. Removed                         |
+| EditSaveDesktop                 |                         | Unused. Removed                         |
+| EditTerminal                    |                         | Unused. Removed                         |
+| EditTerminalApp                 |                         | Unused. Removed                         |
+| EditTypeLoadPython              |                         | Unused. Removed                         |
+| EditUtil                        |                         | Unused. Removed                         |
+| EditRunAnother                  |                         | Unused. Removed                         |
+| EditDebugStart                  |                         | Unused. Removed                         |
+| EditDebugStop                   |                         | Unused. Removed                         |
+| EditDebugToggleBreak            |                         | Unused. Removed                         |
+| EditDebugClear                  |                         | Unused. Removed                         |
+| EditDebugNext                   |                         | Unused. Removed                         |
+| EditDebugStep                   |                         | Unused. Removed                         |
+| EditDebugBackTrace              |                         | Unused. Removed                         |
+| EditDebugContinue               |                         | Unused. Removed                         |
+| EditDebugEnterCommand           |                         | Unused. Removed                         |
+| EditDebugUntilCurser            |                         | Unused. Removed                         |
+| EditCycle                       |                         | Unused. Removed                         |
+| EditMaximize                    |                         | Unused. Removed                         |
+| EditManPage                     |                         | Unused. Removed                         |
+| EditCtags                       |                         | Unused. Removed                         |
 +---------------------------------+-------------------------+-----------------------------------------+
 |                                        [editor:xmap] section                                        |
 +---------------------------------+-------------------------+-----------------------------------------+
-|                                 |                         |                                         |
+| EditExecuteMacro                |                         | Unused. Removed                         |
 +---------------------------------+-------------------------+-----------------------------------------+
 |                                          [viewer] section                                           |
 +---------------------------------+-------------------------+-----------------------------------------+
-|                                 |                         |                                         |
+| ViewMoveUp                      | Up                      |                                         |
+| ViewMoveDown                    | Down                    |                                         |
+| ViewMoveLeft                    | Left                    |                                         |
+| ViewMoveRight                   | Right                   |                                         |
+| ViewMoveToBol                   | Home                    |                                         |
+| ViewMoveToEol                   | End                     |                                         |
+| ViewMovePgUp                    | PageUp                  |                                         |
+| ViewMovePgDn                    | PageDown                |                                         |
+| ViewMoveHalfPgUp                | HalfPageUp              |                                         |
+| ViewMoveHalfPgDn                | HalfPageDown            |                                         |
+| ViewMoveTop                     | Top                     |                                         |
+| ViewMoveBottom                  | Bottom                  |                                         |
+| ViewHelp                        | Help                    |                                         |
+| ViewSearch                      | Search                  |                                         |
+| ViewSearchContinue              | SearchContinue          |                                         |
+| ViewGoto                        | Goto                    |                                         |
+| ViewNextFile                    | FileNext                |                                         |
+| ViewPrevFile                    | FilePrev                |                                         |
+| ViewToggleHexMode               | HexMode                 |                                         |
+| ViewToggleWrapMode              | WrapMode                |                                         |
+| ViewToggleMagicMode             | MagicMode               |                                         |
+| ViewToggleNroffMode             | NroffMode               |                                         |
+| ViewToggleRuler                 | Ruler                   |                                         |
+| ViewNewBookmark                 | Bookmark                |                                         |
+| ViewGotoBookmark                | BookmarkGoto            |                                         |
+| ShowCommandLine                 | Shell                   |                                         |
+| ViewQuit                        | Quit                    |                                         |
 +---------------------------------+-------------------------+-----------------------------------------+
 |                                        [viewer:hex] section                                         |
 +---------------------------------+-------------------------+-----------------------------------------+
-|                                 |                         |                                         |
+| ViewMoveUp                      | Up                      |                                         |
+| ViewMoveDown                    | Down                    |                                         |
+| ViewMoveLeft                    | Left                    |                                         |
+| ViewMoveRight                   | Right                   |                                         |
+| ViewMoveLeft10                  | LeftQuick               |                                         |
+| ViewMoveRight10                 | RightQuick              |                                         |
+| ViewMoveToBol                   | Home                    |                                         |
+| ViewMoveToEol                   | End                     |                                         |
+| ViewMovePgUp                    | PageUp                  |                                         |
+| ViewMovePgDn                    | PageDown                |                                         |
+| ViewMoveTop                     | Top                     |                                         |
+| ViewMoveBottom                  | Bottom                  |                                         |
+| ViewHelp                        | Help                    |                                         |
+| ViewSearch                      | Search                  |                                         |
+| ViewSearchContinue              | SearchContinue          |                                         |
+| ViewHexEditSave                 | Save                    |                                         |
+| ViewGoto                        | Goto                    |                                         |
+| ViewToggleHexMode               | HexMode                 |                                         |
+| ViewToggleHexEditMode           | HexEditMode             |                                         |
+| ViewToggleHexNavMode            | ToggleNavigation        |                                         |
+| ViewToggleMagicMode             | MagicMode               |                                         |
+| ViewToggleNroffMode             | NroffMode               |                                         |
+| ShowCommandLine                 | Shell                   |                                         |
+| ViewQuit                        | Quit                    |                                         |
 +---------------------------------+-------------------------+-----------------------------------------+
 |                                        [diffviewer] section                                         |
 +---------------------------------+-------------------------+-----------------------------------------+
-|                                 |                         |                                         |
+| DiffUp                          | Up                      |                                         |
+| DiffDown                        | Down                    |                                         |
+| DiffLeft                        | Left                    |                                         |
+| DiffRight                       | Right                   |                                         |
+| DiffQuickLeft                   | LeftQuick               |                                         |
+| DiffQuickRight                  | RightQuick              |                                         |
+| DiffHome                        | Home                    |                                         |
+| DiffEnd                         |                         | Unused. Removed                         |
+| DiffPageUp                      | PageUp                  |                                         |
+| DiffPageDown                    | PageDown                |                                         |
+| DiffBOF                         | Top                     |                                         |
+| DiffEOF                         | Bottom                  |                                         |
+| DiffHelp                        | Help                    |                                         |
+| DiffSearch                      | Search                  |                                         |
+| DiffSearchContinue              | SearchContinue          |                                         |
+| DiffRedo                        | Redo                    |                                         |
+| DiffSave                        | Save                    |                                         |
+| DiffGoto                        | Goto                    |                                         |
+| DiffSwapPanel                   | Swap                    |                                         |
+| DiffFull                        | SplitFull               |                                         |
+| DiffEqual                       | SplitEqual              |                                         |
+| DiffSplitMore                   | SplitMore               |                                         |
+| DiffSplitLess                   | SplitLess               |                                         |
+| DiffSetTab2                     | Tab2                    |                                         |
+| DiffSetTab3                     | Tab3                    |                                         |
+| DiffSetTab4                     | Tab4                    |                                         |
+| DiffSetTab8                     | Tab8                    |                                         |
+| DiffEditCurrent                 | Edit                    |                                         |
+| DiffEditOther                   | EditOther               |                                         |
+| DiffNextHunk                    | HunkNext                |                                         |
+| DiffPrevHunk                    | HunkPrev                |                                         |
+| DiffMergeCurrentHunk            | Merge                   |                                         |
+| DiffDisplaySymbols              | ShowSymbols             |                                         |
+| DiffDisplayNumbers              | ShowNumbers             |                                         |
+| DiffOptions                     | Options                 |                                         |
+| ShowCommandLine                 | Shell                   |                                         |
+| DiffQuit                        | Quit                    |                                         |
 +---------------------------------+-------------------------+-----------------------------------------+

lib/keybind.c

@@ -45,486 +45,288 @@
 
 static name_keymap_t command_names[] = {
     /* common */
+    {"Enter", CK_Enter},
+    {"Up", CK_Up},
+    {"Down", CK_Down},
+    {"Left", CK_Left},
+    {"Right", CK_Right},
+    {"LeftQuick", CK_LeftQuick},
+    {"RightQuick", CK_RightQuick},
+    {"Home", CK_Home},
+    {"End", CK_End},
+    {"PageUp", CK_PageUp},
+    {"PageDown", CK_PageDown},
+    {"HalfPageUp", CK_HalfPageUp},
+    {"HalfPageDown", CK_HalfPageDown},
+    {"Top", CK_Top},
+    {"Bottom", CK_Bottom},
+    {"TopOnScreen", CK_TopOnScreen},
+    {"MiddleOnScreen", CK_MiddleOnScreen},
+    {"BottomOnScreen", CK_BottomOnScreen},
+    {"WordLeft", CK_WordLeft},
+    {"WordRight", CK_WordRight},
+    {"Copy", CK_Copy},
+    {"Move", CK_Move},
+    {"Delete", CK_Delete},
+    {"MakeDir", CK_MakeDir},
+    {"ChangeMode", CK_ChangeMode},
+    {"ChangeOwn", CK_ChangeOwn},
+    {"ChangeOwnAdvanced", CK_ChangeOwnAdvanced},
+    {"Remove", CK_Remove},
+    {"BackSpace", CK_BackSpace},
+    {"Undo", CK_Undo},
+    {"Redo", CK_Redo},
+    {"Clear", CK_Clear},
+    {"Menu", CK_Menu},
+    {"MenuLastSelected", CK_MenuLastSelected},
+    {"UserMenu", CK_UserMenu},
+    {"EditUserMenu", CK_EditUserMenu},
+    {"Search", CK_Search},
+    {"SearchContinue", CK_SearchContinue},
+    {"Replace", CK_Replace},
+    {"ReplaceContinue", CK_ReplaceContinue},
+    {"Help", CK_Help},
+    {"Shell", CK_Shell},
+    {"Edit", CK_Edit},
+    {"EditNew", CK_EditNew},
+#ifdef HAVE_CHARSET
     {"SelectCodepage", CK_SelectCodepage},
-    {"ShowCommandLine", CK_ShowCommandLine},
-    {"ExtMap1", CK_StartExtMap1},
-    {"ExtMap2", CK_StartExtMap2},
+#endif
+    {"History", CK_History},
+    {"HistoryNext", CK_HistoryNext},
+    {"HistoryPrev", CK_HistoryPrev},
+    {"Complete", CK_Complete},
+    {"Save", CK_Save},
+    {"SaveAs", CK_SaveAs},
+    {"Goto", CK_Goto},
+    {"Reread", CK_Reread},
+    {"Refresh", CK_Refresh},
+    {"Suspend", CK_Suspend},
+    {"Swap", CK_Swap},
+    {"HotList", CK_HotList},
+    {"SelectInvert", CK_SelectInvert},
+    {"ScreenList", CK_ScreenList},
+    {"ScreenNext", CK_ScreenNext},
+    {"ScreenPrev", CK_ScreenPrev},
+    {"FileNext", CK_FileNext},
+    {"FilePrev", CK_FilePrev},
+    {"DeleteToWordBegin", CK_DeleteToWordBegin},
+    {"DeleteToWordEnd", CK_DeleteToWordEnd},
+    {"Cut", CK_Cut},
+    {"Store", CK_Store},
+    {"Paste", CK_Paste},
+    {"Mark", CK_Mark},
+    {"MarkLeft", CK_MarkLeft},
+    {"MarkRight", CK_MarkRight},
+    {"MarkUp", CK_MarkUp},
+    {"MarkDown", CK_MarkDown},
+    {"MarkToWordBegin", CK_MarkToWordBegin},
+    {"MarkToWordEnd", CK_MarkToWordEnd},
+    {"MarkToHome", CK_MarkToHome},
+    {"MarkToEnd", CK_MarkToEnd},
+    {"ToggleNavigation", CK_ToggleNavigation},
+    {"Sort", CK_Sort},
+    {"Options", CK_Options},
+    {"LearnKeys", CK_LearnKeys},
+    {"Bookmark", CK_Bookmark},
+    {"Quit", CK_Quit},
+    {"QuitQuiet", CK_QuitQuiet},
+    {"ExtendedKeyMap", CK_ExtendedKeyMap},
 
     /* main commands */
-    {"CmdHelp", CK_HelpCmd},
-    {"CmdMenu", CK_MenuCmd},
-    {"CmdChmod", CK_ChmodCmd},
-    {"CmdMenuLastSelected", CK_MenuLastSelectedCmd},
-    {"CmdSingleDirsize", CK_SingleDirsizeCmd},
-    {"CmdCopyCurrentPathname", CK_CopyCurrentPathname},
-    {"CmdCopyOtherPathname", CK_CopyOtherPathname},
-    {"CmdSuspend", CK_SuspendCmd},
-    {"CmdToggleListing", CK_ToggleListingCmd},
-    {"CmdChownAdvanced", CK_ChownAdvancedCmd},
-    {"CmdChown", CK_ChownCmd},
-    {"CmdCompareDirs", CK_CompareDirsCmd},
-    {"CmdConfigureBox", CK_ConfigureBox},
-    {"CmdConfigureVfs", CK_ConfigureVfs},
-    {"CmdConfirmBox", CK_ConfirmBox},
-    {"CmdCopy", CK_CopyCmd},
-    {"CmdDelete", CK_DeleteCmd},
-    {"CmdDirsizes", CK_DirsizesCmd},
-    {"CmdDisplayBitsBox", CK_DisplayBitsBox},
-    {"CmdEdit", CK_EditCmd},
 #ifdef USE_INTERNAL_EDIT
-    {"CmdEditForceInternal", CK_EditForceInternalCmd},
+    {"EditForceInternal", CK_EditForceInternal},
+#endif
+    {"View", CK_View},
+    {"ViewRaw", CK_ViewRaw},
+    {"ViewFile", CK_ViewFile},
+    {"ViewFiltered", CK_ViewFiltered},
+    {"Find", CK_Find},
+    {"DirSize", CK_DirSize},
+    {"PanelListingSwitch", CK_PanelListingSwitch},
+    {"CompareDirs", CK_CompareDirs},
+#ifdef USE_DIFF_VIEW
+    {"CompareFiles", CK_CompareFiles},
 #endif
-    {"CmdEditExtFile", CK_EditExtFileCmd},
-    {"CmdEditFhlFile", CK_EditFhlFileCmd},
-    {"CmdEditMcMenu", CK_EditMcMenuCmd},
-    {"CmdEditSymlink", CK_EditSymlinkCmd},
-    {"CmdEditSyntax", CK_EditSyntaxCmd},
-    {"CmdEditUserMenu", CK_EditUserMenuCmd},
-    {"CmdExternalPanelize", CK_ExternalPanelize},
-    {"CmdFilter", CK_FilterCmd},
-    {"CmdFilteredView", CK_FilteredViewCmd},
-    {"CmdFind", CK_FindCmd},
+    {"OptionsVfs", CK_OptionsVfs},
+    {"OptionsConfirm", CK_OptionsConfirm},
+    {"OptionsDisplayBits", CK_OptionsDisplayBits},
+    {"EditExtensionsFile", CK_EditExtensionsFile},
+    {"EditFileHighlightFile", CK_EditFileHighlightFile},
+    {"LinkSymbolicEdit", CK_LinkSymbolicEdit},
+    {"ExternalPanelize", CK_ExternalPanelize},
+    {"Filter", CK_Filter},
 #ifdef ENABLE_VFS_FISH
-    {"CmdFishlink", CK_FishlinkCmd},
+    {"ConnectFish", CK_ConnectFish},
 #endif
 #ifdef ENABLE_VFS_FTP
-    {"CmdFtplink", CK_FtplinkCmd},
+    {"ConnectFtp", CK_ConnectFtp},
 #endif
-    {"CmdHistory", CK_HistoryCmd},
-    {"CmdInfo", CK_InfoCmd},
+#ifdef ENABLE_VFS_SMB
+    {"ConnectSmb", CK_ConnectSmb},
+#endif
+    {"PanelInfo", CK_PanelInfo},
 #ifdef WITH_BACKGROUND
-    {"CmdJobs", CK_JobsCmd},
+    {"Jobs", CK_Jobs},
 #endif
-    {"CmdLayout", CK_LayoutBox},
-    {"CmdLearnKeys", CK_LearnKeys},
-    {"CmdLink", CK_LinkCmd},
-    {"CmdChangeListing", CK_ChangeListingCmd},
-    {"CmdListing", CK_ListingCmd},
+    {"OptionsLayout", CK_OptionsLayout},
+    {"Link", CK_Link},
+    {"PanelListingChange", CK_PanelListingChange},
+    {"PanelListing", CK_PanelListing},
 #ifdef LISTMODE_EDITOR
-    {"CmdListmodeCmd", CK_ListmodeCmd}.
-#endif
-    {"CmdMkdir", CK_MkdirCmd},
-    {"CmdPanelOptions", CK_PanelOptionsBox},
-    {"CmdQuickCd", CK_QuickCdCmd},
-    {"CmdQuickChdir", CK_QuickChdirCmd},
-    {"CmdQuickView", CK_QuickViewCmd},
-    {"CmdQuietQuit", CK_QuietQuitCmd},
-    {"CmdRelativeSymlink", CK_RelativeSymlinkCmd},
-    {"CmdRename", CK_RenameCmd},
-    {"CmdReread", CK_RereadCmd},
-    {"CmdReselectVfs", CK_ReselectVfs},
-    {"CmdReverseSelection", CK_ReverseSelectionCmd},
-    {"CmdSaveSetup", CK_SaveSetupCmd},
-    {"CmdSelect", CK_SelectCmd},
-#ifdef ENABLE_VFS_SMB
-    {"CmdSmblinkCmd", CK_SmblinkCmd},
+    {"ListMode", CK_ListMode}.
 #endif
-    {"CmdSwapPanel", CK_SwapCmd},
-    {"CmdSymlink", CK_SymlinkCmd},
-    {"CmdTree", CK_TreeCmd},
-    {"CmdTreeBox", CK_TreeBoxCmd},
+    {"OptionsPanel", CK_OptionsPanel},
+    {"CdQuick", CK_CdQuick},
+    {"PanelQuickView", CK_PanelQuickView},
+    {"LinkSymbolicRelative", CK_LinkSymbolicRelative},
+    {"VfsList", CK_VfsList},
+    {"SaveSetup", CK_SaveSetup},
+    {"LinkSymbolic", CK_LinkSymbolic},
+    {"PanelTree", CK_PanelTree},
+    {"Tree", CK_Tree},
 #ifdef ENABLE_VFS_UNDELFS
-    {"CmdUndelete", CK_UndeleteCmd},
+    {"Undelete", CK_Undelete},
 #endif
-    {"CmdUnselect", CK_UnselectCmd},
-    {"CmdUserMenu", CK_UserMenuCmd},
-    {"CmdUserFileMenu", CK_UserFileMenuCmd},
-    {"CmdView", CK_ViewCmd},
-    {"CmdViewFile", CK_ViewFileCmd},
-    {"CmdCopyCurrentReadlink", CK_CopyCurrentReadlink},
-    {"CmdCopyOtherReadlink", CK_CopyOtherReadlink},
-    {"CmdAddHotlist", CK_AddHotlist},
-    {"CmdQuit", CK_QuitCmd},
-    {"CmdCopyCurrentTagged", CK_CopyCurrentTagged},
-    {"CmdCopyOtherTagged", CK_CopyOtherTagged},
-    {"CmdToggleShowHidden", CK_ToggleShowHidden},
-    {"CmdTogglePanelsSplit", CK_TogglePanelsSplit},
-#ifdef USE_DIFF_VIEW
-    {"CmdDiffView", CK_DiffViewCmd},
-#endif
-    {"CmdDialogList", CK_DialogListCmd},
-    {"CmdDialogNext", CK_DialogNextCmd},
-    {"CmdDialogPrev", CK_DialogPrevCmd},
+    {"PutCurrentLink", CK_PutCurrentLink},
+    {"PutOtherLink", CK_PutOtherLink},
+    {"HotListAdd", CK_HotListAdd},
+    {"ShowHidden", CK_ShowHidden},
+    {"SplitVertHoriz", CK_SplitVertHoriz},
+    {"PutCurrentPath", CK_PutCurrentPath},
+    {"PutOtherPath", CK_PutOtherPath},
+    {"PutCurrentTagged", CK_PutCurrentTagged},
+    {"PutOtherTagged", CK_PutOtherTagged},
+    {"Select", CK_Select},
+    {"Unselect", CK_Unselect},
 
     /* panel */
-    {"PanelChdirOtherPanel", CK_PanelChdirOtherPanel},
-    {"PanelChdirToReadlink", CK_PanelChdirToReadlink},
-    {"PanelCopyLocal", CK_PanelCmdCopyLocal},
-    {"PanelDeleteLocal", CK_PanelCmdDeleteLocal},
-    {"PanelDoEnter", CK_PanelCmdDoEnter},
-    {"PanelEditNew", CK_PanelCmdEditNew},
-    {"PanelRenameLocal", CK_PanelCmdRenameLocal},
-    {"PanelReverseSelection", CK_PanelCmdReverseSelection},
-    {"PanelSelect", CK_PanelCmdSelect},
-    {"PanelUnselect", CK_PanelCmdUnselect},
-    {"PanelViewSimple", CK_PanelCmdViewSimple},
-    {"PanelGotoParentDir", CK_PanelGotoParentDir},
-    {"PanelGotoChildDir", CK_PanelGotoChildDir},
-    {"PanelDirectoryHistoryList", CK_PanelDirectoryHistoryList},
-    {"PanelDirectoryHistoryNext", CK_PanelDirectoryHistoryNext},
-    {"PanelDirectoryHistoryPrev", CK_PanelDirectoryHistoryPrev},
-    {"PanelGotoBottomFile", CK_PanelGotoBottomFile},
-    {"PanelGotoMiddleFile", CK_PanelGotoMiddleFile},
-    {"PanelGotoTopFile", CK_PanelGotoTopFile},
-    {"PanelMarkFile", CK_PanelMarkFile},
-    {"PanelMarkFileDown", CK_PanelMarkFileDown},
-    {"PanelMarkFileUp", CK_PanelMarkFileUp},
-    {"PanelMoveUp", CK_PanelMoveUp},
-    {"PanelMoveDown", CK_PanelMoveDown},
-    {"PanelMoveLeft", CK_PanelMoveLeft},
-    {"PanelMoveRight", CK_PanelMoveRight},
-    {"PanelMoveEnd", CK_PanelMoveEnd},
-    {"PanelMoveHome", CK_PanelMoveHome},
-    {"PanelNextPage", CK_PanelNextPage},
-    {"PanelPrevPage", CK_PanelPrevPage},
-#ifdef HAVE_CHARSET
-    {"PanelSetPanelEncoding", CK_PanelSetPanelEncoding},
-#endif
-    {"PanelStartSearch", CK_PanelStartSearch},
-    {"PanelSyncOtherPanel", CK_PanelSyncOtherPanel},
-    {"PanelToggleSortOrderNext", CK_PanelToggleSortOrderNext},
-    {"PanelToggleSortOrderPrev", CK_PanelToggleSortOrderPrev},
-    {"PanelSelectSortOrder", CK_PanelSelectSortOrder},
-    {"PanelReverseSort", CK_PanelReverseSort},
-    {"PanelSortOrderByName", CK_PanelSortOrderByName},
-    {"PanelSortOrderByExt", CK_PanelSortOrderByExt},
-    {"PanelSortOrderBySize", CK_PanelSortOrderBySize},
-    {"PanelSortOrderByMTime", CK_PanelSortOrderByMTime},
-    {"PanelSmartGotoParentDir", CK_PanelSmartGotoParentDir},
+    {"PanelOtherCd", CK_PanelOtherCd},
+    {"PanelOtherCdLink", CK_PanelOtherCdLink},
+    {"CopySingle", CK_CopySingle},
+    {"MoveSingle", CK_MoveSingle},
+    {"DeleteSingle", CK_DeleteSingle},
+    {"CdParent", CK_CdParent},
+    {"CdChild", CK_CdChild},
+    {"PanelOtherSync", CK_PanelOtherSync},
+    {"SortNext", CK_SortNext},
+    {"SortPrev", CK_SortPrev},
+    {"SortReverse", CK_SortReverse},
+    {"SortByName", CK_SortByName},
+    {"SortByExt", CK_SortByExt},
+    {"SortBySize", CK_SortBySize},
+    {"SortByMTime", CK_SortByMTime},
+    {"CdParentSmart", CK_CdParentSmart},
 
     /* dialog */
-    {"DialogOK", CK_DialogOK},
-    {"DialogCancel", CK_DialogCancel},
-    {"DialogPrevItem", CK_DialogPrevItem},
-    {"DialogNextItem", CK_DialogNextItem},
-    {"DialogHelp", CK_DialogHelp},
-    {"DialogSuspend", CK_DialogSuspend},
-    {"DialogRefresh", CK_DialogRefresh},
+    {"Ok", CK_Ok},
+    {"Cancel", CK_Cancel},
 
     /* input line */
-    {"InputBol", CK_InputBol},
-    {"InputEol", CK_InputEol},
-    {"InputMoveLeft", CK_InputMoveLeft},
-    {"InputWordLeft", CK_InputWordLeft},
-    {"InputBackwardChar", CK_InputBackwardChar},
-    {"InputBackwardWord", CK_InputBackwardWord},
-    {"InputMoveRight", CK_InputMoveRight},
-    {"InputWordRight", CK_InputWordRight},
-    {"InputForwardChar", CK_InputForwardChar},
-    {"InputForwardWord", CK_InputForwardWord},
-    {"InputBackwardDelete", CK_InputBackwardDelete},
-    {"InputDeleteChar", CK_InputDeleteChar},
-    {"InputKillWord", CK_InputKillWord},
-    {"InputBackwardKillWord", CK_InputBackwardKillWord},
-    {"InputSetMark", CK_InputSetMark},
-    {"InputKillRegion", CK_InputKillRegion},
-    {"InputYank", CK_InputYank},
-    {"InputKillLine", CK_InputKillLine},
-    {"InputHistoryPrev", CK_InputHistoryPrev},
-    {"InputHistoryNext", CK_InputHistoryNext},
-    {"InputHistoryShow", CK_InputHistoryShow},
-    {"InputComplete", CK_InputComplete},
-    {"InputXStore", CK_InputKillSave},
-    {"InputXPaste", CK_InputPaste},
-    {"InputClearLine", CK_InputClearLine},
-    {"InputLeftHighlight", CK_InputLeftHighlight},
-    {"InputRightHighlight", CK_InputRightHighlight},
-    {"InputWordLeftHighlight", CK_InputWordLeftHighlight},
-    {"InputWordRightHighlight", CK_InputWordRightHighlight},
-    {"InputBolHighlight", CK_InputBolHighlight},
-    {"InputEolHighlight", CK_InputEolHighlight},
-
-    /* listbox */
-    {"ListboxMoveUp", CK_ListboxMoveUp},
-    {"ListboxMoveDown", CK_ListboxMoveDown},
-    {"ListboxMoveHome", CK_ListboxMoveHome},
-    {"ListboxMoveEnd", CK_ListboxMoveEnd},
-    {"ListboxMovePgUp", CK_ListboxMovePgUp},
-    {"ListboxMovePgDn", CK_ListboxMovePgDn},
-    {"ListboxDeleteItem", CK_ListboxDeleteItem},
-    {"ListboxDeleteAll", CK_ListboxDeleteAll},
+    {"Yank", CK_Yank},
 
     /* help */
-    {"HelpHelp", CK_HelpHelp},
-    {"HelpIndex", CK_HelpIndex},
-    {"HelpBack", CK_HelpBack},
-    {"HelpQuit", CK_HelpQuit},
-    {"HelpMoveUp", CK_HelpMoveUp},
-    {"HelpMoveDown", CK_HelpMoveDown},
-    {"HelpMovePgDn", CK_HelpMovePgDn},
-    {"HelpMovePgUp", CK_HelpMovePgUp},
-    {"HelpMoveHalfPgDn", CK_HelpMoveHalfPgDn},
-    {"HelpMoveHalfPgUp", CK_HelpMoveHalfPgUp},
-    {"HelpMoveTop", CK_HelpMoveTop},
-    {"HelpMoveBottom", CK_HelpMoveBottom},
-    {"HelpSelectLink", CK_HelpSelectLink},
-    {"HelpNextLink", CK_HelpNextLink},
-    {"HelpPrevLink", CK_HelpPrevLink},
-    {"HelpNextNode", CK_HelpNextNode},
-    {"HelpPrevNode", CK_HelpPrevNode},
+    {"Index", CK_Index},
+    {"Back", CK_Back},
+    {"LinkNext", CK_LinkNext},
+    {"LinkPrev", CK_LinkPrev},
+    {"NodeNext", CK_NodeNext},
+    {"NodePrev", CK_NodePrev},
 
     /* tree */
-    {"TreeHelp", CK_TreeHelp},
-    {"TreeForget", CK_TreeForget},
-    {"TreeToggleNav", CK_TreeToggleNav},
-    {"TreeCopy", CK_TreeCopy},
-    {"TreeMove", CK_TreeMove},
-    {"TreeMake", CK_TreeMake},
-    {"TreeMoveUp", CK_TreeMoveUp},
-    {"TreeMoveDown", CK_TreeMoveDown},
-    {"TreeMoveLeft", CK_TreeMoveLeft},
-    {"TreeMoveRight", CK_TreeMoveRight},
-    {"TreeMoveHome", CK_TreeMoveHome},
-    {"TreeMoveEnd", CK_TreeMoveEnd},
-    {"TreeMovePgUp", CK_TreeMovePgUp},
-    {"TreeMovePgDn", CK_TreeMovePgDn},
-    {"TreeOpen", CK_TreeOpen},
-    {"TreeRescan", CK_TreeRescan},
-    {"TreeStartSearch", CK_TreeStartSearch},
-    {"TreeRemove", CK_TreeRemove},
+    {"Forget", CK_Forget},
 
-#ifdef USE_INTERNAL_EDIT
-    {"EditNoCommand", CK_Ignore_Key},
-    {"EditIgnoreKey", CK_Ignore_Key},
-    {"EditBackSpace", CK_BackSpace},
-    {"EditDelete", CK_Delete},
-    {"EditEnter", CK_Enter},
-    {"EditPageUp", CK_Page_Up},
-    {"EditPageDown", CK_Page_Down},
-    {"EditLeft", CK_Left},
-    {"EditRight", CK_Right},
-    {"EditWordLeft", CK_Word_Left},
-    {"EditWordRight", CK_Word_Right},
-    {"EditUp", CK_Up},
-    {"EditDown", CK_Down},
-    {"EditHome", CK_Home},
-    {"EditEnd", CK_End},
-    {"EditTab", CK_Tab},
-    {"EditUndo", CK_Undo},
-    {"EditRedo", CK_Redo},
-    {"EditBeginningOfText", CK_Beginning_Of_Text},
-    {"EditEndOfText", CK_End_Of_Text},
-    {"EditScrollUp", CK_Scroll_Up},
-    {"EditScrollDown", CK_Scroll_Down},
-    {"EditReturn", CK_Return},
-    {"EditBeginPage", CK_Begin_Page},
-    {"EditEndPage", CK_End_Page},
-    {"EditDeleteWordLeft", CK_Delete_Word_Left},
-    {"EditDeleteWordRight", CK_Delete_Word_Right},
-    {"EditParagraphUp", CK_Paragraph_Up},
-    {"EditParagraphDown", CK_Paragraph_Down},
-    {"EditMenu", CK_Menu},
-    {"EditSave", CK_Save},
-    {"EditLoad", CK_Load},
-    {"EditNew", CK_New},
-    {"EditSaveas", CK_Save_As},
-    {"EditMark", CK_Mark},
-    {"EditCopy", CK_Copy},
-    {"EditMove", CK_Move},
-    {"EditRemove", CK_Remove},
-    {"EditMarkAll", CK_Mark_All},
-    {"EditUnmark", CK_Unmark},
-    {"EditMarkWord", CK_Mark_Word},
-    {"EditMarkLine", CK_Mark_Line},
-    {"EditSaveBlock", CK_Save_Block},
-    {"EditColumnMark", CK_Column_Mark},
-    {"EditFind", CK_Find},
-    {"EditFindAgain", CK_Find_Again},
-    {"EditReplace", CK_Replace},
-    {"EditReplaceAgain", CK_Replace_Again},
-    {"EditCompleteWord", CK_Complete_Word},
-#if 0
-    {"EditDebugStart", CK_Debug_Start},
-    {"EditDebugStop", CK_Debug_Stop},
-    {"EditDebugToggleBreak", CK_Debug_Toggle_Break},
-    {"EditDebugClear", CK_Debug_Clear},
-    {"EditDebugNext", CK_Debug_Next},
-    {"EditDebugStep", CK_Debug_Step},
-    {"EditDebugBackTrace", CK_Debug_Back_Trace},
-    {"EditDebugContinue", CK_Debug_Continue},
-    {"EditDebugEnterCommand", CK_Debug_Enter_Command},
-    {"EditDebugUntilCurser", CK_Debug_Until_Curser},
+#if defined (USE_INTERNAL_EDIT) || defined (USE_DIFF_VIEW)
+    {"ShowNumbers", CK_ShowNumbers},
 #endif
-    {"EditInsertFile", CK_Insert_File},
-    {"EditQuit", CK_Quit},
-    {"EditToggleInsert", CK_Toggle_Insert},
-    {"EditHelp", CK_Help},
-    {"EditDate", CK_Date},
-    {"EditRefresh", CK_Refresh},
-    {"EditGoto", CK_Goto},
-    {"EditDeleteLine", CK_Delete_Line},
-    {"EditDeleteToLineEnd", CK_Delete_To_Line_End},
-    {"EditDeleteToLineBegin", CK_Delete_To_Line_Begin},
-    {"EditManPage", CK_Man_Page},
-    {"EditSort", CK_Sort},
+
+#ifdef USE_INTERNAL_EDIT
+    {"Tab", CK_Tab},
+    {"ScrollUp", CK_ScrollUp},
+    {"ScrollDown", CK_ScrollDown},
+    {"Return", CK_Return},
+    {"ParagraphUp", CK_ParagraphUp},
+    {"ParagraphDown", CK_ParagraphDown},
+    {"EditFile", CK_EditFile},
+    {"MarkWord", CK_MarkWord},
+    {"MarkLine", CK_MarkLine},
+    {"MarkAll", CK_MarkAll},
+    {"Unmark", CK_Unmark},
+    {"MarkColumn", CK_MarkColumn},
+    {"BlockSave", CK_BlockSave},
+    {"InsertFile", CK_InsertFile},
+    {"InsertOverwrite", CK_InsertOverwrite},
+    {"Date", CK_Date},
+    {"DeleteLine", CK_DeleteLine},
+    {"DeleteToHome", CK_DeleteToHome},
+    {"DeleteToEnd", CK_DeleteToEnd},
     {"EditMail", CK_Mail},
-    {"EditCancel", CK_Cancel},
-    {"EditComplete", CK_Complete},
-    {"EditParagraphFormat", CK_Paragraph_Format},
-    {"EditUtil", CK_Util},
-    {"EditTypeLoadPython", CK_Type_Load_Python},
-    {"EditFindFile", CK_Find_File},
-    {"EditCtags", CK_Ctags},
-    {"EditMatchBracket", CK_Match_Bracket},
-    {"EditTerminal", CK_Terminal},
-    {"EditTerminalApp", CK_Terminal_App},
-    {"EditExtCmd", CK_ExtCmd},
-    {"EditUserMenu", CK_User_Menu},
-    {"EditBeginRecordMacro", CK_Begin_Record_Macro},
-    {"EditEndRecordMacro", CK_End_Record_Macro},
-    {"EditBeginEndRepeat", CK_Begin_End_Repeat},
-    {"EditDeleteMacro", CK_Delete_Macro},
-    {"EditToggleBookmark", CK_Toggle_Bookmark},
-    {"EditFlushBookmarks", CK_Flush_Bookmarks},
-    {"EditNextBookmark", CK_Next_Bookmark},
-    {"EditPrevBookmark", CK_Prev_Bookmark},
-    {"EditPageUpHighlight", CK_Page_Up_Highlight},
-    {"EditPageDownHighlight", CK_Page_Down_Highlight},
-    {"EditLeftHighlight", CK_Left_Highlight},
-    {"EditRightHighlight", CK_Right_Highlight},
-    {"EditWordLeftHighlight", CK_Word_Left_Highlight},
-    {"EditWordRightHighlight", CK_Word_Right_Highlight},
-    {"EditUpHighlight", CK_Up_Highlight},
-    {"EditDownHighlight", CK_Down_Highlight},
-    {"EditHomeHighlight", CK_Home_Highlight},
-    {"EditEndHighlight", CK_End_Highlight},
-    {"EditBeginningOfTextHighlight", CK_Beginning_Of_Text_Highlight},
-    {"EditEndOfTextHighlight", CK_End_Of_Text_Highlight},
-    {"EditBeginPageHighlight", CK_Begin_Page_Highlight},
-    {"EditEndPageHighlight", CK_End_Page_Highlight},
-    {"EditScrollUpHighlight", CK_Scroll_Up_Highlight},
-    {"EditScrollDownHighlight", CK_Scroll_Down_Highlight},
-    {"EditParagraphUpHighlight", CK_Paragraph_Up_Highlight},
-    {"EditParagraphDownHighlight", CK_Paragraph_Down_Highlight},
-    {"EditPageUpAltHighlight", CK_Page_Up_Alt_Highlight},
-    {"EditPageDownAltHighlight", CK_Page_Down_Alt_Highlight},
-    {"EditLeftAltHighlight", CK_Left_Alt_Highlight},
-    {"EditRightAltHighlight", CK_Right_Alt_Highlight},
-    {"EditWordLeftAltHighlight", CK_Word_Left_Alt_Highlight},
-    {"EditWordRightAltHighlight", CK_Word_Right_Alt_Highlight},
-    {"EditUpAltHighlight", CK_Up_Alt_Highlight},
-    {"EditDownAltHighlight", CK_Down_Alt_Highlight},
-    {"EditHomeAltHighlight", CK_Home_Alt_Highlight},
-    {"EditEndAltHighlight", CK_End_Alt_Highlight},
-    {"EditBeginningOfTextAltHighlight", CK_Beginning_Of_Text_Alt_Highlight},
-    {"EditEndOfTextAltHighlight", CK_End_Of_Text_Alt_Highlight},
-    {"EditBeginPageAltHighlight", CK_Begin_Page_Alt_Highlight},
-    {"EditEndPageAltHighlight", CK_End_Page_Alt_Highlight},
-    {"EditScrollUpAltHighlight", CK_Scroll_Up_Alt_Highlight},
-    {"EditScrollDownAltHighlight", CK_Scroll_Down_Alt_Highlight},
-    {"EditParagraphUpAltHighlight", CK_Paragraph_Up_Alt_Highlight},
-    {"EditParagraphDownAltHighlight", CK_Paragraph_Down_Alt_Highlight},
-    {"EditShiftBlockLeft", CK_Shift_Block_Left},
-    {"EditShiftBlockRight", CK_Shift_Block_Right},
-    {"EditXStore", CK_XStore},
-    {"EditXCut", CK_XCut},
-    {"EditXPaste", CK_XPaste},
-    {"EditSelectionHistory", CK_Selection_History},
-    {"EditShell", CK_Shell},
-    {"EditInsertLiteral", CK_Insert_Literal},
-    {"EditBeginOrEndMacro", CK_Begin_End_Macro},
-    {"EditExtMode", CK_Ext_Mode},
-    {"EditToggleLineState", CK_Toggle_Line_State},
-    {"EditToggleTabTWS", CK_Toggle_Tab_TWS},
-    {"EditToggleSyntax", CK_Toggle_Syntax},
-    {"EditToggleShowMargin", CK_Toggle_Show_Margin},
-    {"EditFindDefinition", CK_Find_Definition},
-    {"EditLoadPrevFile", CK_Load_Prev_File},
-    {"EditLoadNextFile", CK_Load_Next_File},
-    {"EditOptions", CK_Edit_Options},
-    {"EditSaveMode", CK_Edit_Save_Mode},
-    {"EditChooseSyntax", CK_Choose_Syntax},
-    {"EditAbout", CK_About},
-#if 0
-    {"EditFocusNext", CK_Focus_Next},
-    {"EditFocusPrev", CK_Focus_Prev},
-    {"EditHeightInc", CK_Height_Inc},
-    {"EditHeightDec", CK_Height_Dec},
-    {"EditMake", CK_Make},
-    {"EditErrorNext", CK_Error_Next},
-    {"EditErrorPrev", CK_Error_Prev},
-    {"EditSaveDesktop", CK_Save_Desktop},
-    {"EditNewWindow", CK_New_Window},
-    {"EditCycle", CK_Cycle},
-    {"EditSaveAndQuit", CK_Save_And_Quit},
-    {"EditRunAnother", CK_Run_Another},
-    {"EditCheckSaveAndQuit", CK_Check_Save_And_Quit},
-    {"EditMaximize", CK_Maximize},
-#endif
+    {"ParagraphFormat", CK_ParagraphFormat},
+    {"MatchBracket", CK_MatchBracket},
+    {"ExternalCommand", CK_ExternalCommand},
+    {"MacroStartRecord", CK_MacroStartRecord},
+    {"MacroStopRecord", CK_MacroStopRecord},
+    {"MacroStartStopRecord", CK_MacroStartStopRecord},
+    {"MacroDelete", CK_MacroDelete},
+    {"RepeatStartStopRecord", CK_RepeatStartStopRecord},
+    {"BookmarkFlush", CK_BookmarkFlush},
+    {"BookmarkNext", CK_BookmarkNext},
+    {"BookmarkPrev", CK_BookmarkPrev},
+    {"MarkPageUp", CK_MarkPageUp},
+    {"MarkPageDown", CK_MarkPageDown},
+    {"MarkToFileBegin", CK_MarkToFileBegin},
+    {"MarkToFileEnd", CK_MarkToFileEnd},
+    {"MarkToPageBegin", CK_MarkToPageBegin},
+    {"MarkToPageEnd", CK_MarkToPageEnd},
+    {"MarkScrollUp", CK_MarkScrollUp},
+    {"MarkScrollDown", CK_MarkScrollDown},
+    {"MarkParagraphUp", CK_MarkParagraphUp},
+    {"MarkParagraphDown", CK_MarkParagraphDown},
+    {"MarkColumnPageUp", CK_MarkColumnPageUp},
+    {"MarkColumnPageDown", CK_MarkColumnPageDown},
+    {"MarkColumnLeft", CK_MarkColumnLeft},
+    {"MarkColumnRight", CK_MarkColumnRight},
+    {"MarkColumnUp", CK_MarkColumnUp},
+    {"MarkColumnDown", CK_MarkColumnDown},
+    {"MarkColumnScrollUp", CK_MarkColumnScrollUp},
+    {"MarkColumnScrollDown", CK_MarkColumnScrollDown},
+    {"MarkColumnParagraphUp", CK_MarkColumnParagraphUp},
+    {"MarkColumnParagraphDown", CK_MarkColumnParagraphDown},
+    {"BlockShiftLeft", CK_BlockShiftLeft},
+    {"BlockShiftRight", CK_BlockShiftRight},
+    {"InsertLiteral", CK_InsertLiteral},
+    {"ShowTabTws", CK_ShowTabTws},
+    {"SyntaxOnOff", CK_SyntaxOnOff},
+    {"SyntaxChoose", CK_SyntaxChoose},
+    {"ShowMargin", CK_ShowMargin},
+    {"OptionsSaveMode", CK_OptionsSaveMode},
+    {"About", CK_About},
 #endif /* USE_INTERNAL_EDIT */
 
     /* viewer */
-    {"ViewHelp", CK_ViewHelp},
-    {"ViewToggleWrapMode", CK_ViewToggleWrapMode},
-    {"ViewToggleHexEditMode", CK_ViewToggleHexEditMode},
-    {"ViewQuit", CK_ViewQuit},
-    {"ViewToggleHexMode", CK_ViewToggleHexMode},
-    {"ViewGoto", CK_ViewGoto},
-    {"ViewHexEditSave", CK_ViewHexEditSave},
-    {"ViewSearch", CK_ViewSearch},
-    {"ViewToggleMagicMode", CK_ViewToggleMagicMode},
-    {"ViewToggleNroffMode", CK_ViewToggleNroffMode},
-    {"ViewContinueSearch", CK_ViewContinueSearch},
-    {"ViewGotoBookmark", CK_ViewGotoBookmark},
-    {"ViewNewBookmark", CK_ViewNewBookmark},
-    {"ViewMoveUp", CK_ViewMoveUp},
-    {"ViewMoveDown", CK_ViewMoveDown},
-    {"ViewMoveLeft", CK_ViewMoveLeft},
-    {"ViewMoveRight", CK_ViewMoveRight},
-    {"ViewMoveLeft10", CK_ViewMoveLeft10},
-    {"ViewMoveRight10", CK_ViewMoveRight10},
-    {"ViewMovePgDn", CK_ViewMovePgDn},
-    {"ViewMovePgUp", CK_ViewMovePgUp},
-    {"ViewMoveHalfPgDn", CK_ViewMoveHalfPgDn},
-    {"ViewMoveHalfPgUp", CK_ViewMoveHalfPgUp},
-    {"ViewMoveToBol", CK_ViewMoveToBol},
-    {"ViewMoveToEol", CK_ViewMoveToEol},
-    {"ViewMoveTop", CK_ViewMoveTop},
-    {"ViewMoveBottom", CK_ViewMoveBottom},
-    {"ViewNextFile", CK_ViewNextFile},
-    {"ViewPrevFile", CK_ViewPrevFile},
-    {"ViewToggleRuler", CK_ViewToggleRuler},
-    {"ViewToggleHexNavMode", CK_ViewToggleHexNavMode},
+    {"WrapMode", CK_WrapMode},
+    {"HexEditMode", CK_HexEditMode},
+    {"HexMode", CK_HexMode},
+    {"MagicMode", CK_MagicMode},
+    {"NroffMode", CK_NroffMode},
+    {"BookmarkGoto", CK_BookmarkGoto},
+    {"Ruler", CK_Ruler},
 
 #ifdef USE_DIFF_VIEW
     /* diff viewer */
-    {"DiffDisplaySymbols", CK_DiffDisplaySymbols},
-    {"DiffDisplayNumbers", CK_DiffDisplayNumbers},
-    {"DiffFull", CK_DiffFull},
-    {"DiffEqual", CK_DiffEqual},
-    {"DiffSplitMore", CK_DiffSplitMore},
-    {"DiffSplitLess", CK_DiffSplitLess},
-    {"DiffShowDiff", CK_DiffShowDiff},
-    {"DiffSetTab2", CK_DiffSetTab2},
-    {"DiffSetTab3", CK_DiffSetTab3},
-    {"DiffSetTab4", CK_DiffSetTab4},
-    {"DiffSetTab8", CK_DiffSetTab8},
-    {"DiffSwapPanel", CK_DiffSwapPanel},
-    {"DiffRedo", CK_DiffRedo},
-    {"DiffNextHunk", CK_DiffNextHunk},
-    {"DiffPrevHunk", CK_DiffPrevHunk},
-    {"DiffGoto", CK_DiffGoto},
-    {"DiffEditCurrent", CK_DiffEditCurrent},
-    {"DiffEditOther", CK_DiffEditOther},
-    {"DiffSearch", CK_DiffSearch},
-    {"DiffContinueSearch", CK_DiffContinueSearch},
-    {"DiffEOF", CK_DiffEOF},
-    {"DiffBOF", CK_DiffBOF},
-    {"DiffDown", CK_DiffDown},
-    {"DiffUp", CK_DiffUp},
-    {"DiffQuickLeft", CK_DiffQuickLeft},
-    {"DiffQuickRight", CK_DiffQuickRight},
-    {"DiffLeft", CK_DiffLeft},
-    {"DiffRight", CK_DiffRight},
-    {"DiffPageDown", CK_DiffPageDown},
-    {"DiffPageUp", CK_DiffPageUp},
-    {"DiffHome", CK_DiffHome},
-    {"DiffEnd", CK_DiffEnd},
-    {"DiffQuit", CK_DiffQuit},
-    {"DiffHelp", CK_DiffHelp},
-    {"DiffMergeCurrentHunk", CK_DiffMergeCurrentHunk},
-    {"DiffSave", CK_DiffSave},
-    {"DiffOptions", CK_DiffOptions},
+    {"ShowSymbols", CK_ShowSymbols},
+    {"SplitFull", CK_SplitFull},
+    {"SplitEqual", CK_SplitEqual},
+    {"SplitMore", CK_SplitMore},
+    {"SplitLess", CK_SplitLess},
+    {"Tab2", CK_Tab2},
+    {"Tab3", CK_Tab3},
+    {"Tab4", CK_Tab4},
+    {"Tab8", CK_Tab8},
+    {"HunkNext", CK_HunkNext},
+    {"HunkPrev", CK_HunkPrev},
+    {"EditOther", CK_EditOther},
+    {"Merge", CK_Merge},
 #endif /* USE_DIFF_VIEW */
 
     {NULL, CK_Ignore_Key}

lib/keybind.h

@@ -15,481 +15,289 @@
 #define CK_Ignore_Key   0
 
 /* common */
+#define CK_Enter             3
+#define CK_Up                10
+#define CK_Down              11
+#define CK_Left              6
+#define CK_Right             7
+#define CK_Home              12
+#define CK_End               13
+#define CK_LeftQuick         9027
+#define CK_RightQuick        9028
+#define CK_PageUp            4
+#define CK_PageDown          5
+#define CK_HalfPageUp        1015
+#define CK_HalfPageDown      1014
+#define CK_Top               17
+#define CK_Bottom            18
+#define CK_TopOnScreen       8019
+#define CK_MiddleOnScreen    8018
+#define CK_BottomOnScreen    8017
+#define CK_WordLeft          8
+#define CK_WordRight         9
+#define CK_Copy              202
+#define CK_Move              203
+#define CK_Delete            2
+#define CK_MakeDir           7045
+#define CK_ChangeMode        7003
+#define CK_ChangeOwn         7005
+#define CK_ChangeOwnAdvanced 7004
+#define CK_Remove            204
+#define CK_BackSpace         1
+#define CK_Redo              16
+#define CK_Clear             4026
+#define CK_Menu              123
+#define CK_MenuLastSelected  7044
+#define CK_UserMenu          425
+#define CK_EditUserMenu                 7026
+#define CK_Search                       8032
+#define CK_SearchContinue               5011
+#define CK_Replace           303
+#define CK_ReplaceContinue   304
+#define CK_SearchStop                   8033
+#define CK_Help                         404
+#define CK_Edit                         7020
+#define CK_Shell           801
+#ifdef HAVE_CHARSET
 #define CK_SelectCodepage               2002
-#define CK_ShowCommandLine              2001
-#define CK_StartExtMap1                 2021
-#define CK_StartExtMap2                 2022
+#endif
+#define CK_History                      4021
+#define CK_HistoryNext                  4022
+#define CK_HistoryPrev                  4023
+#define CK_Complete                     305
+#define CK_SaveAs                       104
+#define CK_Goto                         407
+#define CK_Reread                       7053
+#define CK_Refresh                      406
+#define CK_Suspend                      7060
+#define CK_Swap                         7061
+#define CK_HotList                      7048
+#define CK_ScreenList                   7079
+#define CK_ScreenNext                   7080
+#define CK_ScreenPrev                   7081
+#define CK_FilePrev                     111
+#define CK_FileNext                     112
+#define CK_DeleteToWordBegin            24
+#define CK_DeleteToWordEnd              25
+#define CK_ShowNumbers                  490
+#define CK_Store                        701
+#define CK_Cut                          702
+#define CK_Paste                        703
+#define CK_Mark                         201
+#define CK_MarkLeft                     606
+#define CK_MarkRight                    607
+#define CK_MarkUp                       8021
+#define CK_MarkDown                     8022
+#define CK_MarkToWordBegin              608
+#define CK_MarkToWordEnd                609
+#define CK_MarkToHome                   612
+#define CK_MarkToEnd                    613
+#define CK_ToggleNavigation             5027
+#define CK_Sort                         412
+#define CK_Options                      7007
+#define CK_LearnKeys                    7037
+#define CK_Bookmark                     5013
+#define CK_Quit                         402
+#define CK_QuitQuiet                    7050
+/* C-x or similar */
+#define CK_ExtendedKeyMap               820
 
 /* main commands */
-#define CK_AddHotlist                   7001
-#define CK_ChangeListingCmd             7002
-#define CK_ChmodCmd                     7003
-#define CK_ChownAdvancedCmd             7004
-#define CK_ChownCmd                     7005
-#define CK_CompareDirsCmd               7006
-#define CK_ConfigureBox                 7007
-#define CK_ConfigureVfs                 7008
-#define CK_ConfirmBox                   7009
-#define CK_CopyCmd                      7010
-#define CK_CopyCurrentPathname          7011
-#define CK_CopyCurrentReadlink          7012
-#define CK_CopyCurrentTagged            7013
-#define CK_CopyOtherPathname            7014
-#define CK_CopyOtherReadlink            7015
-#define CK_CopyOtherTagged              7016
-#define CK_DeleteCmd                    7017
-#define CK_DirsizesCmd                  7018
-#define CK_DisplayBitsBox               7019
-#define CK_EditCmd                      7020
-#define CK_EditExtFileCmd               7021
-#define CK_EditFhlFileCmd               7022
-#define CK_EditMcMenuCmd                7023
-#define CK_EditSymlinkCmd               7024
-#define CK_EditSyntaxCmd                7025
-#define CK_EditUserMenuCmd              7026
+#ifdef USE_INTERNAL_EDIT
+#define CK_EditForceInternal            7082
+#endif
+#define CK_View                         7071
+#define CK_ViewRaw                      8011
+#define CK_ViewFile                     7072
+#define CK_ViewFiltered                 7029
+#define CK_Find                         419
+#define CK_DirSize                      7058
+#define CK_HotListAdd                   7001
+#define CK_PanelListingChange           7002
+#define CK_CompareDirs                  7006
+#define CK_OptionsVfs                   7008
+#define CK_OptionsConfirm               7009
+#define CK_PutCurrentLink               7012
+#define CK_PutOtherLink                 7015
+#define CK_OptionsDisplayBits           7019
+#define CK_EditExtensionsFile           7021
+#define CK_EditFileHighlightFile        7022
+#define CK_LinkSymbolicEdit             7024
 #define CK_ExternalPanelize             7027
-#define CK_FilterCmd                    7028
-#define CK_FilteredViewCmd              7029
-#define CK_FindCmd                      7030
-#define CK_FishlinkCmd                  7031
-#define CK_FtplinkCmd                   7032
-#define CK_HistoryCmd                   7033
-#define CK_InfoCmd                      7034
-#define CK_JobsCmd                      7035
-#define CK_LayoutBox                    7036
-#define CK_LearnKeys                    7037
-#define CK_LinkCmd                      7038
-#define CK_ListingCmd                   7039
-#define CK_ListmodeCmd                  7042
-#define CK_MenuLastSelectedCmd          7044
-#define CK_MkdirCmd                     7045
-#define CK_QuickCdCmd                   7047
-#define CK_QuickChdirCmd                7048
-#define CK_QuickViewCmd                 7049
-#define CK_QuietQuitCmd                 7050
-#define CK_QuitCmd                      7051
-#define CK_RenameCmd                    7052
-#define CK_RereadCmd                    7053
-#define CK_ReselectVfs                  7054
-#define CK_ReverseSelectionCmd          7055
-#define CK_SaveSetupCmd                 7056
-#define CK_SelectCmd                    7057
-#define CK_SingleDirsizeCmd             7058
-#define CK_SmblinkCmd                   7059
-#define CK_SuspendCmd                   7060
-#define CK_SwapCmd                      7061
-#define CK_SymlinkCmd                   7062
-#define CK_ToggleListingCmd             7063
-#define CK_ToggleShowHidden             7064
-#define CK_TreeCmd                      7065
-#define CK_TreeBoxCmd                   7066
-#define CK_UndeleteCmd                  7067
-#define CK_UnselectCmd                  7068
-#define CK_UserFileMenuCmd              7069
-#define CK_UserMenuCmd                  7070
-#define CK_ViewCmd                      7071
-#define CK_ViewFileCmd                  7072
-#define CK_HelpCmd                      7073
-#define CK_MenuCmd                      7074
-#define CK_TogglePanelsSplit            7075
-#define CK_DiffViewCmd                  7076
-#define CK_PanelOptionsBox              7077
-#define CK_RelativeSymlinkCmd           7078
-#define CK_DialogListCmd                7079
-#define CK_DialogNextCmd                7080
-#define CK_DialogPrevCmd                7081
-#define CK_EditForceInternalCmd         7082
+#define CK_Filter                       7028
+#define CK_ConnectFish                  7031
+#define CK_ConnectFtp                   7032
+#define CK_ConnectSmb                   7059
+#define CK_PanelInfo                    7034
+#define CK_Jobs                         7035
+#define CK_OptionsLayout                7036
+#define CK_Link                         7038
+#define CK_PanelListing                 7039
+#define CK_ListMode                     7042
+#define CK_CdQuick                      7047
+#define CK_PanelQuickView               7049
+#define CK_VfsList                      7054
+#define CK_SaveSetup                    7056
+#define CK_LinkSymbolic                 7062
+#define CK_PanelListingSwitch           7063
+#define CK_ShowHidden                   7064
+#define CK_PanelTree                    7065
+#define CK_Tree                         7066
+#define CK_Undelete                     7067
+#define CK_SplitVertHoriz               7075
+#ifdef USE_DIFF_VIEW
+#define CK_CompareFiles                 7076
+#endif /* USE_DIFF_VIEW */
+#define CK_OptionsPanel                 7077
+#define CK_LinkSymbolicRelative         7078
+#define CK_PutCurrentPath               7011
+#define CK_PutOtherPath                 7014
+#define CK_PutCurrentTagged             7013
+#define CK_PutOtherTagged               7016
+#define CK_Select                       7057
+#define CK_Unselect                     7068
+#define CK_SelectInvert                 7055
 
 /* panels */
-#define CK_PanelChdirOtherPanel         8001
-#define CK_PanelChdirToReadlink         8002
-#define CK_PanelCmdCopyLocal            8003
-#define CK_PanelCmdDeleteLocal          8004
-#define CK_PanelCmdDoEnter              8005
-#define CK_PanelCmdEditNew              8006
-#define CK_PanelCmdRenameLocal          8007
-#define CK_PanelCmdReverseSelection     8008
-#define CK_PanelCmdSelect               8009
-#define CK_PanelCmdUnselect             8010
-#define CK_PanelCmdViewSimple           8011
-#define CK_PanelGotoChildDir            8012
-#define CK_PanelGotoParentDir           8013
-#define CK_PanelDirectoryHistoryList    8014
-#define CK_PanelDirectoryHistoryNext    8015
-#define CK_PanelDirectoryHistoryPrev    8016
-#define CK_PanelGotoBottomFile          8017
-#define CK_PanelGotoMiddleFile          8018
-#define CK_PanelGotoTopFile             8019
-#define CK_PanelMarkFile                8020
-#define CK_PanelMarkFileUp              8021
-#define CK_PanelMarkFileDown            8022
-#define CK_PanelMoveDown                8023
-#define CK_PanelMoveEnd                 8024
-#define CK_PanelMoveHome                8025
-#define CK_PanelMoveUp                  8026
-#define CK_PanelMoveLeft                8027
-#define CK_PanelMoveRight               8028
-#define CK_PanelNextPage                8029
-#define CK_PanelPrevPage                8030
-#define CK_PanelSetPanelEncoding        8031
-#define CK_PanelStartSearch             8032
-#define CK_PanelStopSearch              8033
-#define CK_PanelSyncOtherPanel          8034
-#define CK_PanelToggleSortOrderNext     8035
-#define CK_PanelToggleSortOrderPrev     8036
-#define CK_PanelSelectSortOrder         8037
-#define CK_PanelReverseSort             8038
-#define CK_PanelSortOrderByName         8039
-#define CK_PanelSortOrderByExt          8040
-#define CK_PanelSortOrderBySize         8041
-#define CK_PanelSortOrderByMTime        8042
-#define CK_PanelSmartGotoParentDir      8043
+#define CK_PanelOtherCd                 8001
+#define CK_PanelOtherCdLink             8002
+#define CK_CopySingle                   8003
+#define CK_MoveSingle                   8007
+#define CK_DeleteSingle                 8004
+#define CK_CdChild                      8012
+#define CK_CdParent                     8013
+#define CK_CdParentSmart                8043
+#define CK_PanelOtherSync               8034
+#define CK_SortNext                     8035
+#define CK_SortPrev                     8036
+#define CK_SortReverse                  8038
+#define CK_SortByName                   8039
+#define CK_SortByExt                    8040
+#define CK_SortBySize                   8041
+#define CK_SortByMTime                  8042
 
 /* dialog */
-#define CK_DialogOK                    3001
-#define CK_DialogCancel                3002
-#define CK_DialogPrevItem              3003
-#define CK_DialogNextItem              3004
-#define CK_DialogHelp                  3005
-#define CK_DialogSuspend               3006
-#define CK_DialogRefresh               3007
+#define CK_Ok                           3001
+#define CK_Cancel                       3002
 
 /* input */
-#define CK_InputBol                    4001
-#define CK_InputEol                    4002
-#define CK_InputMoveLeft               4003
-#define CK_InputWordLeft               4004
-#define CK_InputBackwardChar           4005
-#define CK_InputBackwardWord           4006
-#define CK_InputMoveRight              4007
-#define CK_InputWordRight              4008
-#define CK_InputForwardChar            4009
-#define CK_InputForwardWord            4010
-#define CK_InputBackwardDelete         4011
-#define CK_InputDeleteChar             4012
-#define CK_InputKillWord               4013
-#define CK_InputBackwardKillWord       4014
-#define CK_InputSetMark                4015
-#define CK_InputKillRegion             4016
-#define CK_InputKillSave               4017
-#define CK_InputYank                   4018
-#define CK_InputCopyRegion             4019
-#define CK_InputKillLine               4020
-#define CK_InputHistoryPrev            4021
-#define CK_InputHistoryNext            4022
-#define CK_InputHistoryShow            4023
-#define CK_InputComplete               4024
-#define CK_InputPaste                  4025
-#define CK_InputClearLine              4026
-#define CK_InputLeftHighlight          4027
-#define CK_InputRightHighlight         4028
-#define CK_InputWordLeftHighlight      4029
-#define CK_InputWordRightHighlight     4030
-#define CK_InputBolHighlight           4031
-#define CK_InputEolHighlight           4032
-
-/* listbox */
-#define CK_ListboxMoveUp               4500
-#define CK_ListboxMoveDown             4501
-#define CK_ListboxMoveHome             4502
-#define CK_ListboxMoveEnd              4503
-#define CK_ListboxMovePgUp             4504
-#define CK_ListboxMovePgDn             4505
-#define CK_ListboxDeleteItem           4506
-#define CK_ListboxDeleteAll            4507
+#define CK_Yank                         4018
 
 /* help */
-#define CK_HelpHelp                     1001
-#define CK_HelpIndex                    1002
-#define CK_HelpBack                     1003
-#define CK_HelpQuit                     1004
-#define CK_HelpMoveUp                   1005
-#define CK_HelpMoveDown                 1006
-#define CK_HelpSelectLink               1007
-#define CK_HelpNextLink                 1008
-#define CK_HelpPrevLink                 1009
-#define CK_HelpNextNode                 1010
-#define CK_HelpPrevNode                 1011
-#define CK_HelpMovePgDn                 1012
-#define CK_HelpMovePgUp                 1013
-#define CK_HelpMoveHalfPgDn             1014
-#define CK_HelpMoveHalfPgUp             1015
-#define CK_HelpMoveTop                  1016
-#define CK_HelpMoveBottom               1017
+#define CK_Index                        1002
+#define CK_Back                         1003
+#define CK_LinkNext                     1008
+#define CK_LinkPrev                     1009
+#define CK_NodeNext                     1010
+#define CK_NodePrev                     1011
 
 /* tree */
-#define CK_TreeHelp                     6001
-#define CK_TreeForget                   6003
-#define CK_TreeToggleNav                6004
-#define CK_TreeCopy                     6005
-#define CK_TreeMove                     6006
-#define CK_TreeMake                     6007
-#define CK_TreeMoveUp                   6011
-#define CK_TreeMoveDown                 6012
-#define CK_TreeMoveLeft                 6013
-#define CK_TreeMoveRight                6014
-#define CK_TreeMoveHome                 6015
-#define CK_TreeMoveEnd                  6016
-#define CK_TreeMovePgUp                 6017
-#define CK_TreeMovePgDn                 6018
-#define CK_TreeOpen                     6019
-#define CK_TreeRescan                   6020
-#define CK_TreeStartSearch              6021
-#define CK_TreeRemove                   6022
+#define CK_Forget                       6003
 
 #ifdef USE_INTERNAL_EDIT
 /* cursor movements */
-#define CK_BackSpace         1
-#define CK_Delete            2
-#define CK_Enter             3
-#define CK_Page_Up           4
-#define CK_Page_Down         5
-#define CK_Left              6
-#define CK_Right             7
-#define CK_Word_Left         8
-#define CK_Word_Right        9
-#define CK_Up                10
-#define CK_Down              11
-#define CK_Home              12
-#define CK_End               13
 #define CK_Tab               14
 #define CK_Undo              15
-#define CK_Redo              16
-#define CK_Beginning_Of_Text 17
-#define CK_End_Of_Text       18
-#define CK_Scroll_Up         19
-#define CK_Scroll_Down       20
+#define CK_ScrollUp          19
+#define CK_ScrollDown        20
 #define CK_Return            21
-#define CK_Begin_Page        22
-#define CK_End_Page          23
-#define CK_Delete_Word_Left  24
-#define CK_Delete_Word_Right 25
-#define CK_Paragraph_Up      26
-#define CK_Paragraph_Down    27
+#define CK_ParagraphUp       26
+#define CK_ParagraphDown     27
 /* file commands */
 #define CK_Save             101
-#define CK_Load             102
-#define CK_New              103
-#define CK_Save_As          104
-#define CK_Load_Prev_File   111
-#define CK_Load_Next_File   112
-#define CK_Load_Syntax_File 121
-#define CK_Load_Menu_File   122
-#define CK_Menu             123
+#define CK_EditFile         102
+#define CK_EditNew          103
+#define CK_EditSyntaxFile   121
 /* block commands */
-#define CK_Mark              201
-#define CK_Copy              202
-#define CK_Move              203
-#define CK_Remove            204
 #define CK_Unmark            206
-#define CK_Save_Block        207
-#define CK_Column_Mark       208
-#define CK_Shift_Block_Left  211
-#define CK_Shift_Block_Right 212
-#define CK_Mark_All          213
-#define CK_Mark_Word         214
-#define CK_Mark_Line         215
-
-/* search and replace */
-#define CK_Find          301
-#define CK_Find_Again    302
-#define CK_Replace       303
-#define CK_Replace_Again 304
-#define CK_Complete_Word 305
-#if 0
-/* debugger commands */
-#define CK_Debug_Start         350
-#define CK_Debug_Stop          351
-#define CK_Debug_Toggle_Break  352
-#define CK_Debug_Clear         353
-#define CK_Debug_Next          354
-#define CK_Debug_Step          355
-#define CK_Debug_Back_Trace    356
-#define CK_Debug_Continue      357
-#define CK_Debug_Enter_Command 358
-#define CK_Debug_Until_Curser  359
-#endif
-#define CK_Insert_File          401
-#define CK_Quit                 402
-#define CK_Toggle_Insert        403
-#define CK_Help                 404
+#define CK_BlockSave         207
+#define CK_MarkColumn        208
+#define CK_BlockShiftLeft    211
+#define CK_BlockShiftRight   212
+#define CK_MarkAll           213
+#define CK_MarkWord          214
+#define CK_MarkLine          215
+#define CK_InsertFile           401
+#define CK_InsertOverwrite      403
 #define CK_Date                 405
-#define CK_Refresh              406
-#define CK_Goto                 407
-#define CK_Delete_Line          408
-#define CK_Delete_To_Line_End   409
-#define CK_Delete_To_Line_Begin 410
-#define CK_Man_Page             411
-#define CK_Sort                 412
+#define CK_DeleteLine           408
+#define CK_DeleteToHome         409
+#define CK_DeleteToEnd          410
 #define CK_Mail                 413
-#define CK_Cancel               414
-#define CK_Complete             415
-#define CK_Paragraph_Format     416
-#define CK_Util                 417
-#define CK_Type_Load_Python     418
-#define CK_Find_File            419
-#define CK_Ctags                420
-#define CK_Match_Bracket        421
-#define CK_Terminal             422
-#define CK_Terminal_App         423
-#define CK_ExtCmd               424
-#define CK_User_Menu            425
-#define CK_Find_Definition      426
-#define CK_Edit_Options         427
-#define CK_Edit_Save_Mode       428
-#define CK_Choose_Syntax        429
+#define CK_ParagraphFormat      416
+#define CK_MatchBracket         421
+#define CK_ExternalCommand      424
+#define CK_OptionsSaveMode      428
 #define CK_About                430
-#if 0
-/* application control */
-#define CK_Save_Desktop        451
-#define CK_New_Window          452
-#define CK_Cycle               453
-#define CK_Save_And_Quit       455
-#define CK_Run_Another         456
-#define CK_Check_Save_And_Quit 457
-#define CK_Maximize            458
-#endif
-#define CK_Toggle_Show_Margin 460
-#define CK_Toggle_Tab_TWS     470
-#define CK_Toggle_Syntax      480
-#define CK_Toggle_Line_State  490
-/* macro */
-#define CK_Begin_Record_Macro 501
-#define CK_End_Record_Macro   502
-#define CK_Delete_Macro       503
-/* book mark */
-#define CK_Toggle_Bookmark 550
-#define CK_Flush_Bookmarks 551
-#define CK_Next_Bookmark   552
-#define CK_Prev_Bookmark   553
-/* highlight commands */
-#define CK_Page_Up_Highlight           604
-#define CK_Page_Down_Highlight         605
-#define CK_Left_Highlight              606
-#define CK_Right_Highlight             607
-#define CK_Word_Left_Highlight         608
-#define CK_Word_Right_Highlight        609
-#define CK_Up_Highlight                610
-#define CK_Down_Highlight              611
-#define CK_Home_Highlight              612
-#define CK_End_Highlight               613
-#define CK_Beginning_Of_Text_Highlight 614
-#define CK_End_Of_Text_Highlight       615
-#define CK_Begin_Page_Highlight        616
-#define CK_End_Page_Highlight          617
-#define CK_Scroll_Up_Highlight         618
-#define CK_Scroll_Down_Highlight       619
-#define CK_Paragraph_Up_Highlight      620
-#define CK_Paragraph_Down_Highlight    621
-/* alt highlight commands */
-#define CK_Page_Up_Alt_Highlight           654
-#define CK_Page_Down_Alt_Highlight         655
-#define CK_Left_Alt_Highlight              656
-#define CK_Right_Alt_Highlight             657
-#define CK_Word_Left_Alt_Highlight         658
-#define CK_Word_Right_Alt_Highlight        659
-#define CK_Up_Alt_Highlight                660
-#define CK_Down_Alt_Highlight              661
-#define CK_Home_Alt_Highlight              662
-#define CK_End_Alt_Highlight               663
-#define CK_Beginning_Of_Text_Alt_Highlight 664
-#define CK_End_Of_Text_Alt_Highlight       665
-#define CK_Begin_Page_Alt_Highlight        666
-#define CK_End_Page_Alt_Highlight          667
-#define CK_Scroll_Up_Alt_Highlight         668
-#define CK_Scroll_Down_Alt_Highlight       669
-#define CK_Paragraph_Up_Alt_Highlight      670
-#define CK_Paragraph_Down_Alt_Highlight    671
-/* X clipboard operations */
-#define CK_XStore            701
-#define CK_XCut              702
-#define CK_XPaste            703
-#define CK_Selection_History 704
-#define CK_Shell           801
-/* C-x or similar */
-#define CK_Ext_Mode        820
-#define CK_Insert_Literal  851
-#define CK_Begin_End_Macro               853
-#define CK_Begin_End_Repeat              854
-#define CK_Begin_Record_Repeat           855
-#define CK_End_Record_Repeat             856
+#define CK_ShowMargin           460
+#define CK_ShowTabTws           470
+#define CK_SyntaxOnOff          480
+#define CK_SyntaxChoose         429
+#define CK_InsertLiteral        851
+/* bookmarks */
+#define CK_BookmarkFlush  551
+#define CK_BookmarkNext   552
+#define CK_BookmarkPrev   553
+/* mark commands */
+#define CK_MarkPageUp                  604
+#define CK_MarkPageDown                605
+#define CK_MarkToFileBegin             614
+#define CK_MarkToFileEnd               615
+#define CK_MarkToPageBegin             616
+#define CK_MarkToPageEnd               617
+#define CK_MarkScrollUp                618
+#define CK_MarkScrollDown              619
+#define CK_MarkParagraphUp             620
+#define CK_MarkParagraphDown           621
+/* column mark commands */
+#define CK_MarkColumnPageUp                654
+#define CK_MarkColumnPageDown              655
+#define CK_MarkColumnLeft                  656
+#define CK_MarkColumnRight                 657
+#define CK_MarkColumnUp                    660
+#define CK_MarkColumnDown                  661
+#define CK_MarkColumnScrollUp              668
+#define CK_MarkColumnScrollDown            669
+#define CK_MarkColumnParagraphUp           670
+#define CK_MarkColumnParagraphDown         671
+/* macros */
+#define CK_MacroStartRecord     501
+#define CK_MacroStopRecord      502
+#define CK_MacroStartStopRecord 853
+#define CK_MacroExecute         852
+#define CK_MacroDelete          503
+#define CK_RepeatStartStopRecord         854
+#define CK_RepeatStartRecord             855
+#define CK_RepeatStopRecord              856
 #endif /* USE_INTERNAL_EDIT */
 
 /* viewer */
-#define CK_ViewHelp                     5001
-#define CK_ViewToggleWrapMode           5002
-#define CK_ViewToggleHexEditMode        5003
-#define CK_ViewToggleHexMode            5004
-#define CK_ViewGoto                     5005
-#define CK_ViewHexEditSave              5006
-#define CK_ViewSearch                   5007
-#define CK_ViewToggleMagicMode          5008
-#define CK_ViewToggleNroffMode          5009
-#define CK_ViewQuit                     5010
-#define CK_ViewContinueSearch           5011
-#define CK_ViewGotoBookmark             5012
-#define CK_ViewNewBookmark              5013
-#define CK_ViewMoveUp                   5014
-#define CK_ViewMoveDown                 5015
-#define CK_ViewMoveLeft                 5016
-#define CK_ViewMoveRight                5017
-#define CK_ViewMovePgDn                 5018
-#define CK_ViewMovePgUp                 5019
-#define CK_ViewMoveHalfPgDn             5020
-#define CK_ViewMoveHalfPgUp             5021
-#define CK_ViewMoveToBol                5022
-#define CK_ViewMoveToEol                5023
-#define CK_ViewNextFile                 5024
-#define CK_ViewPrevFile                 5025
-#define CK_ViewToggleRuler              5026
-#define CK_ViewToggleHexNavMode         5027
-#define CK_ViewMoveTop                  5028
-#define CK_ViewMoveBottom               5029
-#define CK_ViewMoveLeft10               5030
-#define CK_ViewMoveRight10              5031
+#define CK_WrapMode                     5002
+#define CK_HexEditMode                  5003
+#define CK_HexMode                      5004
+#define CK_MagicMode                    5008
+#define CK_NroffMode                    5009
+#define CK_BookmarkGoto                 5012
+#define CK_Ruler                        5026
 
 #ifdef USE_DIFF_VIEW
 /* diff viewer */
-#define CK_DiffDisplaySymbols           9001
-#define CK_DiffDisplayNumbers           9002
-#define CK_DiffFull                     9003
-#define CK_DiffEqual                    9004
-#define CK_DiffSplitMore                9005
-#define CK_DiffSplitLess                9006
-#define CK_DiffShowDiff                 9008
-#define CK_DiffSetTab2                  9009
-#define CK_DiffSetTab3                  9010
-#define CK_DiffSetTab4                  9011
-#define CK_DiffSetTab8                  9012
-#define CK_DiffSwapPanel                9013
-#define CK_DiffRedo                     9014
-#define CK_DiffNextHunk                 9015
-#define CK_DiffPrevHunk                 9016
-#define CK_DiffGoto                     9017
-#define CK_DiffEditCurrent              9018
-#define CK_DiffEditOther                9019
-#define CK_DiffSearch                   9020
-#define CK_DiffEOF                      9021
-#define CK_DiffBOF                      9022
-#define CK_DiffDown                     9023
-#define CK_DiffUp                       9024
-#define CK_DiffLeft                     9025
-#define CK_DiffRight                    9026
-#define CK_DiffQuickLeft                9027
-#define CK_DiffQuickRight               9028
-#define CK_DiffPageDown                 9029
-#define CK_DiffPageUp                   9030
-#define CK_DiffHome                     9031
-#define CK_DiffEnd                      9032
-#define CK_DiffQuit                     9033
-#define CK_DiffHelp                     9034
-#define CK_DiffMergeCurrentHunk         9035
-#define CK_DiffSave                     9036
-#define CK_DiffContinueSearch           9037
-#define CK_DiffOptions                  9038
+#define CK_ShowSymbols                  9001
+#define CK_SplitFull                    9003
+#define CK_SplitEqual                   9004
+#define CK_SplitMore                    9005
+#define CK_SplitLess                    9006
+#define CK_Tab2                         9009
+#define CK_Tab3                         9010
+#define CK_Tab4                         9011
+#define CK_Tab8                         9012
+#define CK_HunkNext                     9015
+#define CK_HunkPrev                     9016
+#define CK_EditOther                    9019
+#define CK_Merge                        9035
 #endif /* USE_DIFF_VIEW */
 
-#define CK_Pipe_Block(i) (10000+(i))
+#define CK_PipeBlock(i)  (10000+(i))
 #define CK_Macro(i)      (20000+(i))
 #define CK_Last_Macro    CK_Macro(0x7FFF)
 

lib/widget/dialog.c

@@ -246,48 +246,50 @@ dlg_execute_cmd (Dlg_head * h, unsigned long command)
     cb_ret_t ret = MSG_HANDLED;
     switch (command)
     {
-    case CK_DialogOK:
+    case CK_Ok:
         h->ret_value = B_ENTER;
         dlg_stop (h);
         break;
-    case CK_DialogCancel:
+    case CK_Cancel:
         h->ret_value = B_CANCEL;
         dlg_stop (h);
         break;
 
-    case CK_DialogPrevItem:
+    case CK_Up:
+    case CK_Left:
         dlg_one_up (h);
         break;
-    case CK_DialogNextItem:
+    case CK_Down:
+    case CK_Right:
         dlg_one_down (h);
         break;
 
-    case CK_DialogHelp:
+    case CK_Help:
         interactive_display (NULL, h->help_ctx);
         do_refresh ();
         break;
 
-    case CK_DialogSuspend:
+    case CK_Suspend:
         suspend_cmd ();
         refresh_cmd ();
         break;
-    case CK_DialogRefresh:
+    case CK_Refresh:
         refresh_cmd ();
         break;
 
-    case CK_DialogListCmd:
+    case CK_ScreenList:
         if (!h->modal)
             dialog_switch_list ();
         else
             ret = MSG_NOT_HANDLED;
         break;
-    case CK_DialogNextCmd:
+    case CK_ScreenNext:
         if (!h->modal)
             dialog_switch_next ();
         else
             ret = MSG_NOT_HANDLED;
         break;
-    case CK_DialogPrevCmd:
+    case CK_ScreenPrev:
         if (!h->modal)
             dialog_switch_prev ();
         else
@@ -1102,7 +1104,7 @@ dlg_process_event (Dlg_head * h, int key, Gpm_Event * event)
     if (key == EV_NONE)
     {
         if (tty_got_interrupt ())
-            dlg_execute_cmd (h, CK_DialogCancel);
+            dlg_execute_cmd (h, CK_Cancel);
 
         return;
     }

lib/widget/input.c

@@ -747,11 +747,9 @@ input_execute_cmd (WInput * in, unsigned long command)
     cb_ret_t res = MSG_HANDLED;
 
     /* a highlight command like shift-arrow */
-    if (command == CK_InputLeftHighlight ||
-        command == CK_InputRightHighlight ||
-        command == CK_InputWordLeftHighlight ||
-        command == CK_InputWordRightHighlight ||
-        command == CK_InputBolHighlight || command == CK_InputEolHighlight)
+    if (command == CK_MarkLeft || command == CK_MarkRight ||
+        command == CK_MarkToWordBegin || command == CK_MarkToWordEnd ||
+        command == CK_MarkToHome || command == CK_MarkToEnd)
     {
         if (!in->highlight)
         {
@@ -762,53 +760,41 @@ input_execute_cmd (WInput * in, unsigned long command)
 
     switch (command)
     {
-    case CK_InputForwardWord:
-    case CK_InputBackwardWord:
-    case CK_InputForwardChar:
-    case CK_InputBackwardChar:
+    case CK_WordRight:
+    case CK_WordLeft:
+    case CK_Right:
+    case CK_Left:
         if (in->highlight)
             input_mark_cmd (in, FALSE);
     }
 
     switch (command)
     {
-    case CK_InputBol:
-    case CK_InputBolHighlight:
+    case CK_Home:
+    case CK_MarkToHome:
         beginning_of_line (in);
         break;
-    case CK_InputEol:
-    case CK_InputEolHighlight:
+    case CK_End:
+    case CK_MarkToEnd:
         end_of_line (in);
         break;
-    case CK_InputMoveLeft:
-    case CK_InputLeftHighlight:
+    case CK_Left:
+    case CK_MarkLeft:
         backward_char (in);
         break;
-    case CK_InputWordLeft:
-    case CK_InputWordLeftHighlight:
+    case CK_WordLeft:
+    case CK_MarkToWordBegin:
         backward_word (in);
         break;
-    case CK_InputMoveRight:
-    case CK_InputRightHighlight:
+    case CK_Right:
+    case CK_MarkRight:
         forward_char (in);
         break;
-    case CK_InputWordRight:
-    case CK_InputWordRightHighlight:
+    case CK_WordRight:
+    case CK_MarkToWordEnd:
         forward_word (in);
         break;
-    case CK_InputBackwardChar:
-        backward_char (in);
-        break;
-    case CK_InputBackwardWord:
-        backward_word (in);
-        break;
-    case CK_InputForwardChar:
-        forward_char (in);
-        break;
-    case CK_InputForwardWord:
-        forward_word (in);
-        break;
-    case CK_InputBackwardDelete:
+    case CK_BackSpace:
         if (in->highlight)
         {
             long m1, m2;
@@ -818,7 +804,7 @@ input_execute_cmd (WInput * in, unsigned long command)
         else
             backward_delete (in);
         break;
-    case CK_InputDeleteChar:
+    case CK_Delete:
         if (in->first)
             port_region_marked_for_delete (in);
         else if (in->highlight)
@@ -830,60 +816,56 @@ input_execute_cmd (WInput * in, unsigned long command)
         else
             delete_char (in);
         break;
-    case CK_InputKillWord:
+    case CK_DeleteToWordEnd:
         kill_word (in);
         break;
-    case CK_InputBackwardKillWord:
+    case CK_DeleteToWordBegin:
         back_kill_word (in);
         break;
-    case CK_InputSetMark:
+    case CK_Mark:
         input_mark_cmd (in, TRUE);
         break;
-    case CK_InputKillRegion:
+    case CK_Remove:
         delete_region (in, in->point, in->mark);
         break;
-    case CK_InputKillLine:
-        /* clear command line from cursor to the EOL */
+    case CK_DeleteToEnd:
         kill_line (in);
         break;
-    case CK_InputClearLine:
-        /* clear command line */
+    case CK_Clear:
         clear_line (in);
         break;
-    case CK_InputCopyRegion:
+    case CK_Store:
         copy_region (in, in->mark, in->point);
         break;
-    case CK_InputKillSave:
+    case CK_Cut:
         copy_region (in, in->mark, in->point);
         delete_region (in, in->point, in->mark);
         break;
-    case CK_InputYank:
+    case CK_Yank:
         yank (in);
         break;
-    case CK_InputPaste:
+    case CK_Paste:
         ins_from_clip (in);
         break;
-    case CK_InputHistoryPrev:
+    case CK_HistoryPrev:
         hist_prev (in);
         break;
-    case CK_InputHistoryNext:
+    case CK_HistoryNext:
         hist_next (in);
         break;
-    case CK_InputHistoryShow:
+    case CK_History:
         do_show_hist (in);
         break;
-    case CK_InputComplete:
+    case CK_Complete:
         complete (in);
         break;
     default:
         res = MSG_NOT_HANDLED;
     }
 
-    if (command != CK_InputLeftHighlight &&
-        command != CK_InputRightHighlight &&
-        command != CK_InputWordLeftHighlight &&
-        command != CK_InputWordRightHighlight &&
-        command != CK_InputBolHighlight && command != CK_InputEolHighlight)
+    if (command != CK_MarkLeft && command != CK_MarkRight &&
+        command != CK_MarkToWordBegin && command != CK_MarkToWordEnd &&
+        command != CK_MarkToHome && command != CK_MarkToEnd)
         in->highlight = FALSE;
 
     return res;
@@ -1144,7 +1126,7 @@ input_handle_char (WInput * in, int key)
     }
     else
     {
-        if (command != CK_InputComplete)
+        if (command != CK_Complete)
             input_free_completions (in);
         input_execute_cmd (in, command);
         v = MSG_HANDLED;
@@ -1172,7 +1154,7 @@ input_key_is_in_map (WInput * in, int key)
     if (command == CK_Ignore_Key)
         return 0;
 
-    return (command == CK_InputComplete) ? 2 : 1;
+    return (command == CK_Complete) ? 2 : 1;
 }
 
 /* --------------------------------------------------------------------------------------------- */

lib/widget/listbox.c

@@ -237,27 +237,27 @@ listbox_execute_cmd (WListbox * l, unsigned long command)
 
     switch (command)
     {
-    case CK_ListboxMoveUp:
+    case CK_Up:
         listbox_back (l);
         break;
-    case CK_ListboxMoveDown:
+    case CK_Down:
         listbox_fwd (l);
         break;
-    case CK_ListboxMoveHome:
+    case CK_Top:
         listbox_select_first (l);
         break;
-    case CK_ListboxMoveEnd:
+    case CK_Bottom:
         listbox_select_last (l);
         break;
-    case CK_ListboxMovePgUp:
+    case CK_PageUp:
         for (i = 0; (i < l->widget.lines - 1) && (l->pos > 0); i++)
             listbox_back (l);
         break;
-    case CK_ListboxMovePgDn:
+    case CK_PageDown:
         for (i = 0; (i < l->widget.lines - 1) && (l->pos < l->count - 1); i++)
             listbox_fwd (l);
         break;
-    case CK_ListboxDeleteItem:
+    case CK_Delete:
         if (l->deletable)
         {
             gboolean is_last = (l->pos + 1 >= l->count);
@@ -268,7 +268,7 @@ listbox_execute_cmd (WListbox * l, unsigned long command)
                 l->top--;
         }
         break;
-    case CK_ListboxDeleteAll:
+    case CK_Clear:
         if (l->deletable && confirm_history_cleanup
             /* TRANSLATORS: no need to translate 'DialogTitle', it's just a context prefix */
             && (query_dialog (Q_ ("DialogTitle|History cleanup"),

misc/mc.keymap.default

@@ -1,439 +1,427 @@
 [main]
-CmdHelp = f1
-CmdUserMenu = f2
-CmdView = f3
-CmdViewFile = f13
-CmdEdit = f4
-CmdEditForceInternal =
-CmdCopy = f5
-CmdRename = f6
-CmdMkdir = f7
-CmdDelete = f8
-CmdMenu = f9
-CmdQuit = f10
-CmdMenuLastSelected = f19
-CmdQuietQuit = f20
-CmdFind = alt-question
-CmdQuickCd = alt-c
-CmdQuickChdir = ctrl-backslash
-CmdReread = ctrl-r
-CmdSingleDirsize = ctrl-space
-CmdSuspend = ctrl-z
-CmdSwapPanel = ctrl-u
-CmdHistory = alt-h
-CmdListing =
-CmdToggleListing = alt-t
-CmdToggleShowHidden = alt-dot
-CmdTogglePanelsSplit = alt-comma
-ShowCommandLine = ctrl-o
-CmdCopyCurrentPathname = alt-a
-CmdCopyOtherPathname = alt-shift-a
-CmdFilteredView = alt-exclamation
-CmdSelect = kpplus
-CmdUnselect = kpminus
-CmdReverseSelection = kpasterisk
-CmdDialogList = alt-prime
-ExtMap1 = ctrl-x
+Help = f1
+UserMenu = f2
+View = f3
+ViewFile =
+Edit = f4
+EditForceInternal =
+Copy = f5
+Move = f6
+MakeDir = f7
+Delete = f8
+Menu = f9
+Quit = f10
+MenuLastSelected = f19
+QuitQuiet = f20
+Find = alt-question
+CdQuick = alt-c
+HotList = ctrl-backslash
+Reread = ctrl-r
+DirSize = ctrl-space
+Suspend = ctrl-z
+Swap = ctrl-u
+History = alt-h
+PanelListing =
+PanelListingSwitch = alt-t
+PanelListingChange =
+ShowHidden = alt-dot
+SplitVertHoriz = alt-comma
+Shell = ctrl-o
+PutCurrentPath = alt-a
+PutOtherPath = alt-shift-a
+ViewFiltered = alt-exclamation
+Select = kpplus
+Unselect = kpminus
+SelectInvert = kpasterisk
+ScreenList = alt-prime
+OptionsLayout =
+OptionsPanel =
+OptionsConfirm =
+OptionsDisplayBits =
+OptionsVfs =
+LearnKeys =
+SaveSetup =
+EditExtensionsFile =
+EditFileHighlightFile =
+Filter =
+ConnectFish =
+ConnectFtp =
+ConnectSmb =
+Undelete =
+ExtendedKeyMap = ctrl-x
 
 [main:xmap]
-CmdChmod = c
-CmdChown = o
-CmdCompareDirs = d
-CmdEditSymlink = ctrl-s
-CmdLink = l
-CmdSymlink = s
-CmdRelativeSymlink = v
-CmdInfo = i
-CmdQuickView = q
-CmdExternalPanelize = exclamation
-CmdReselectVfs = a
-CmdJobs = j
-CmdCopyCurrentPathname = p
-CmdCopyOtherPathname = ctrl-p
-CmdCopyCurrentTagged = t
-CmdCopyOtherTagged = ctrl-t
-CmdDiffView = ctrl-d
+ChangeMode = c
+ChangeOwn = o
+CompareDirs = d
+CompareFiles = ctrl-d
+HotListAdd = h
+LinkSymbolicEdit = ctrl-s
+Link = l
+LinkSymbolic = s
+LinkSymbolicRelative = v
+PanelInfo = i
+PanelQuickView = q
+ExternalPanelize = exclamation
+VfsList = a
+Jobs = j
+PutCurrentPath = p
+PutOtherPath = ctrl-p
+PutCurrentTagged = t
+PutOtherTagged = ctrl-t
+PutCurrentLink = r
+PutOtherLink = ctrl-r
 
 [panel]
-PanelStartSearch = ctrl-s; alt-s
-PanelMarkFile = insert; ctrl-t
-PanelMarkFileUp = shift-up
-PanelMarkFileDown = shift-down
-PanelMoveDown = down; ctrl-n
-PanelMoveUp = up; ctrl-p
-PanelMoveLeft = left
-PanelMoveRight = right
-PanelPrevPage = pgup; alt-v
-PanelNextPage = pgdn; ctrl-v
-PanelDoEnter = enter
-PanelChdirOtherPanel = alt-o
-PanelChdirToReadlink = alt-l
-PanelViewSimple = F13
-PanelEditNew = F14
-PanelCopyLocal = F15
-PanelRenameLocal = F16
-PanelDeleteLocal = F18
-PanelReverseSelection = alt-asterisk
-PanelSelect = alt-plus
-PanelUnselect = alt-minus
-PanelGotoChildDir = ctrl-pgdn
-PanelGotoParentDir = ctrl-pgup
-PanelDirectoryHistoryList = alt-shift-h
-PanelDirectoryHistoryNext = alt-u
-PanelDirectoryHistoryPrev = alt-y
-PanelGotoBottomFile = alt-j
-PanelGotoMiddleFile = alt-r
-PanelSyncOtherPanel = alt-i
-PanelGotoTopFile = alt-g
-PanelSetPanelEncoding = alt-e
-PanelMoveHome = alt-lt; home; a1
-PanelMoveEnd = alt-gt; end; c1
-PanelSelectSortOrder =
-PanelToggleSortOrderPrev =
-PanelToggleSortOrderNext =
-PanelReverseSort =
-PanelSortOrderByName =
-PanelSortOrderByExt =
-PanelSortOrderBySize =
-PanelSortOrderByMTime =
-PanelSmartGotoParentDir =
+Search = ctrl-s; alt-s
+Mark = insert; ctrl-t
+MarkUp = shift-up
+MarkDown = shift-down
+Down = down; ctrl-n
+Up = up; ctrl-p
+Left = left
+Right = right
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+PanelOtherCd = alt-o
+PanelOtherCdLink = alt-l
+ViewRaw = F13
+EditNew = F14
+CopySingle = F15
+MoveSingle = F16
+DeleteSingle = F18
+Select = alt-plus
+Unselect = alt-minus
+SelectInvert = alt-asterisk
+CdChild = ctrl-pgdn
+CdParent = ctrl-pgup
+CdParentSmart =
+History = alt-shift-h
+HistoryNext = alt-u
+HistoryPrev = alt-y
+BottomOnScreen = alt-j
+MiddleOnScreen = alt-r
+TopOnScreen = alt-g
+PanelOtherSync = alt-i
+SelectCodepage = alt-e
+Top = alt-lt; home; a1
+Bottom = alt-gt; end; c1
+Sort =
+SortPrev =
+SortNext =
+SortReverse =
+SortByName =
+SortByExt =
+SortBySize =
+SortByMTime =
 
 [dialog]
-DialogOK = enter
-DialogCancel = f10; esc; ctrl-g
-DialogPrevItem = left; up
-DialogNextItem = right; down
-DialogHelp = f1
-DialogSuspend = ctrl-z
-DialogRefresh = ctrl-l
-CmdDialogList = alt-prime
-CmdDialogNext = alt-rbrace
-CmdDialogPrev = alt-lbrace
+Ok = enter
+Cancel = f10; esc; ctrl-g
+Up = left; up
+#Left = left; up
+Down = right; down
+#Right = right; down
+Help = f1
+Suspend = ctrl-z
+Refresh = ctrl-l
+ScreenList = alt-prime
+ScreenNext = alt-rbrace
+ScreenPrev = alt-lbrace
 
 [input]
-InputBol = ctrl-a; alt-lt; home; a1
-InputEol = ctrl-e; alt-gt; end; c1
-InputMoveLeft = left; alt-left
-InputWordLeft = ctrl-left
-InputBackwardChar = ctrl-b
-InputBackwardWord = alt-b
-InputMoveRight = right; alt-right
-InputWordRight = ctrl-right
-InputForwardChar = ctrl-f
-InputForwardWord = alt-f
-InputBackwardDelete = backspace; ctrl-h
-InputDeleteChar = delete; ctrl-d
-InputKillWord = alt-d
-InputBackwardKillWord = alt-backspace
-InputSetMark =
-InputKillRegion = ctrl-w
-InputXCut =
-InputXStore = alt-w
-InputXPaste =
-InputYank = ctrl-y
-InputKillLine = ctrl-k
-InputHistoryPrev = alt-p; ctrl-down
-InputHistoryNext = alt-n; ctrl-up
-InputHistoryShow = alt-h
-InputComplete = alt-tab
-InputClearLine =
-InputLeftHighlight = shift-left
-InputRightHighlight = shift-right
-InputWordLeftHighlight = ctrl-shift-left
-InputWordRightHighlight = ctrl-shift-right
-InputBolHighlight = shift-home
-InputEolHighlight = shift-end
+Home = ctrl-a; alt-lt; home; a1
+End = ctrl-e; alt-gt; end; c1
+Left = left; alt-left; ctrl-b
+Right = right; alt-right; ctrl-f
+WordLeft = ctrl-left; alt-b
+WordRight = ctrl-right; alt-f
+Backspace = backspace; ctrl-h
+Delete = delete; ctrl-d
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+Mark =
+Remove = ctrl-w
+Cut =
+Store = alt-w
+Paste =
+Yank = ctrl-y
+DeleteToEnd = ctrl-k
+HistoryPrev = alt-p; ctrl-down
+HistoryNext = alt-n; ctrl-up
+History = alt-h
+Complete = alt-tab
+Clear =
+MarkLeft = shift-left
+MarkRight = shift-right
+MarkToWordBegin = ctrl-shift-left
+MarkToWordEnd = ctrl-shift-right
+MarkToHome = shift-home
+MarkToEnd = shift-end
 
 [listbox]
-ListboxMoveUp = up; ctrl-p
-ListboxMoveDown = down; ctrl-n
-ListboxMoveHome = home; alt-lt; a1
-ListboxMoveEnd = end; alt-gt; c1
-ListboxMovePgUp = pgup; alt-v
-ListboxMovePgDn = pgdn; ctrl-v
-ListboxDeleteItem = delete; d
-ListboxDeleteAll = shift-delete; shift-d
+Up = up; ctrl-p
+Down = down; ctrl-n
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Delete = delete; d
+Clear = shift-delete; shift-d
 
 [tree]
-TreeHelp = f1
-TreeForget = f3
-TreeToggleNav = f4
-TreeCopy = f5
-TreeMove = f6
-TreeMoveUp = up; ctrl-p
-TreeMoveDown = down; ctrl-n
-TreeMoveLeft = left
-TreeMoveRight = right
-TreeMoveHome = home; alt-lt; a1
-TreeMoveEnd = end; alt-gt; c1
-TreeMovePgUp = pgup; alt-v
-TreeMovePgDn = pgdn; ctrl-v
-TreeOpen = enter
-TreeRescan = f2; ctrl-r
-TreeStartSearch = ctrl-s; alt-s
-TreeRemove = f8; delete
+Help = f1
+Reread = f2; ctrl-r
+Forget = f3
+ToggleNavigation = f4
+Copy = f5
+Move = f6
+Up = up; ctrl-p
+Down = down; ctrl-n
+Left = left
+Right = right
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+Search = ctrl-s; alt-s
+Delete = f8; delete
 
 [help]
-HelpHelp = f1
-HelpIndex = f2; c
-HelpBack = f3; left; l
-HelpQuit = f10; esc; ctrl-g
-HelpMoveUp = up; ctrl-p
-HelpMoveDown = down; ctrl-n
-HelpMovePgDn = f; space; pgdn; ctrl-v
-HelpMovePgUp = b; pgup; alt-v; backspace
-HelpMoveHalfPgDn = d
-HelpMoveHalfPgUp = u
-HelpMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-HelpMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
-HelpSelectLink = right; enter
-HelpNextLink = tab
-HelpPrevLink = alt-tab
-HelpNextNode = n
-HelpPrevNode = p
+Help = f1
+Index = f2; c
+Back = f3; left; l
+Quit = f10; esc; ctrl-g
+Up = up; ctrl-p
+Down = down; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+Enter = right; enter
+LinkNext = tab
+LinkPrev = alt-tab
+NodeNext = n
+NodePrev = p
 
 [editor]
-EditXStore = ctrl-insert
-EditXPaste = shift-insert
-EditXCut = shift-delete
-EditDeleteLine = ctrl-y
-EditDeleteToLineEnd = ctrl-k
-EditDeleteToLineBegin =
-EditLeft = left
-EditRight = right
-EditUp = up
-EditDown = down
-EditEnter = enter
-EditReturn = shift-enter
-EditBackSpace = backspace; ctrl-h
-EditDelete = delete; ctrl-d
-EditPageUp = pgup
-EditPageDown = pgdn
-EditWordLeft = ctrl-left; ctrl-z
-EditWordRight = ctrl-right; ctrl-x
-EditHome = home
-EditEnd = end
-EditTab = tab
-EditUndo = ctrl-u
-EditRedo = alt-r
-EditBeginningOfText = ctrl-home; alt-lt
-EditEndOfText = ctrl-end; alt-gt
-EditScrollUp = ctrl-up
-EditScrollDown = ctrl-down
-EditBeginPage = ctrl-pgup
-EditEndPage = ctrl-pgdn
-EditDeleteWordLeft = alt-backspace
-EditDeleteWordRight = alt-d
-EditParagraphUp =
-EditParagraphDown =
-EditSave = f2
-EditLoad =
+Store = ctrl-insert
+Paste = shift-insert
+Cut = shift-delete
+Up = up
+Down = down
+Left = left
+Right = right
+WordLeft = ctrl-left; ctrl-z
+WordRight = ctrl-right; ctrl-x
+Enter = enter
+Return = shift-enter
+BackSpace = backspace; ctrl-h
+Delete = delete; ctrl-d
+PageUp = pgup
+PageDown = pgdn
+Home = home
+End = end
+Tab = tab
+Undo = ctrl-u
+Redo = alt-r
+Top = ctrl-home; alt-lt
+Bottom = ctrl-end; alt-gt
+ScrollUp = ctrl-up
+ScrollDown = ctrl-down
+TopOnScreen = ctrl-pgup
+BottomOnScreen = ctrl-pgdn
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+DeleteLine = ctrl-y
+DeleteToEnd = ctrl-k
+DeleteToHome =
+ParagraphUp =
+ParagraphDown =
+Save = f2
+EditFile =
 EditNew = ctrl-n
-EditSaveas = f12
-EditMark = f3
-EditCopy = f5
-EditMove = f6
-EditRemove = f8
-EditMarkAll =
-EditUnmark =
-EditFind = f7
-EditMarkLine =
-EditMarkWord =
-EditShiftBlockLeft =
-EditShiftBlockRight =
-EditPageUpHighlight = shift-pgup
-EditPageDownHighlight = shift-pgdn
-EditLeftHighlight = shift-left
-EditRightHighlight = shift-right
-EditWordLeftHighlight = ctrl-shift-left
-EditWordRightHighlight = ctrl-shift-right
-EditUpHighlight = shift-up
-EditDownHighlight = shift-down
-EditHomeHighlight = shift-home
-EditEndHighlight = shift-end
-EditBeginningOfTextHighlight = ctrl-shift-home
-EditEndOfTextHighlight  = ctrl-shift-end
-EditBeginPageHighlight  = ctrl-shift-pgup
-EditEndPageHighlight = ctrl-shift-pgdn
-EditScrollUpHighlight = ctrl-shift-up
-EditScrollDownHighlight = ctrl-shift-down
-EditParagraphUpHighlight =
-EditParagraphDownHighlight =
-EditPageUpAltHighlight = alt-pgup
-EditPageDownAltHighlight = alt-pgdn
-EditLeftAltHighlight = alt-left
-EditRightAltHighlight = alt-right
-EditWordLeftAltHighlight = ctrl-alt-left
-EditWordRightAltHighlight = ctrl-alt-right
-EditUpAltHighlight = alt-up
-EditDownAltHighlight = alt-down
-EditHomeAltHighlight = alt-home
-EditEndAltHighlight = alt-end
-EditBeginningOfTextAltHighlight = ctrl-alt-home
-EditEndOfTextHighlight  = ctrl-alt-end
-EditBeginPageHighlight  = ctrl-alt-pgup
-EditEndPageAltHighlight = ctrl-alt-pgdn
-EditScrollUpAltHighlight =
-EditScrollDownAltHighlight =
-EditParagraphUpAltHighlight =
-EditParagraphDownAltHighlight =
-EditSaveBlock = ctrl-f
-EditColumnMark = f13
-EditFindAgain = f17
-EditReplace = f4
-EditReplaceAgain = f14
-EditCompleteWord = alt-tab
-EditDebugStart =
-EditDebugStop =
-EditDebugToggleBreak =
-EditDebugClear =
-EditDebugNext =
-EditDebugStep =
-EditDebugBackTrace =
-EditDebugContinue =
-EditDebugEnterCommand =
-EditDebugUntilCurser =
-EditInsertFile = f15
-EditQuit = f10
-EditToggleInsert = insert
-EditHelp = f1
-EditDate =
-EditRefresh = ctrl-l
-EditGoto = alt-l
-EditManPage =
-EditSort = alt-t
-EditMail = alt-m
-EditCancel =
-EditComplete =
-EditParagraphFormat = alt-p
-EditUtil =
-EditTypeLoadPython =
-EditFindFile =
-EditCtags =
-EditMatchBracket = alt-b
-EditTerminal =
-EditTerminalApp =
-EditExtCmd = alt-u
-EditUserMenu = f11
-EditSaveDesktop =
-EditNewWindow =
-EditCycle =
-EditMenu = f9
-EditSaveAndQuit =
-EditRunAnother =
-EditCheckSaveAndQuit =
-EditMaximize =
-EditToggleBookmark = alt-k
-EditFlushBookmarks = alt-o
-EditNextBookmark = alt-j
-EditPrevBookmark = alt-i
-EditSelectionHistory =
-EditShell = ctrl-o
-EditInsertLiteral = ctrl-q
-EditBeginRecordMacro =
-EditEndRecordMacro =
-EditBeginOrEndMacro = ctrl-r
-EditDeleteMacro =
-EditToggleLineState = alt-n
-EditToggleTabTWS = alt-underline
-EditToggleSyntax = ctrl-s
-EditToggleShowMargin =
-EditFindDefinition = alt-enter
-EditLoadPrevFile = alt-minus
-EditLoadNextFile = alt-plus
-EditBeginEndRepeat =
+SaveAs = f12; ctrl-f2
+Mark = f3
+Copy = f5
+Move = f6
+Remove = f8
+MarkLine =
+MarkWord =
+MarkAll =
+Unmark =
+Search = f7
+SearchContinue = f17
+BlockShiftLeft =
+BlockShiftRight =
+MarkPageUp = shift-pgup
+MarkPageDown = shift-pgdn
+MarkLeft = shift-left
+MarkRight = shift-right
+MarkToWordBegin = ctrl-shift-left
+MarkToWordEnd = ctrl-shift-right
+MarkUp = shift-up
+MarkDown = shift-down
+MarkToHome = shift-home
+MarkToEnd = shift-end
+MarkToFileBegin = ctrl-shift-home
+MarkToFileEnd = ctrl-shift-end
+MarkToPageBegin  = ctrl-shift-pgup
+MarkToPageEnd = ctrl-shift-pgdn
+MarkScrollUp = ctrl-shift-up
+MarkScrollDown = ctrl-shift-down
+MarkParagraphUp =
+MarkParagraphDown =
+MarkColumnPageUp = alt-pgup
+MarkColumnPageDown = alt-pgdn
+MarkColumnLeft = alt-left
+MarkColumnRight = alt-right
+MarkColumnUp = alt-up
+MarkColumnDown = alt-down
+MarkColumnScrollUp =
+MarkColumnScrollDown =
+MarkColumnParagraphUp =
+MarkColumnParagraphDown =
+BlockSave = ctrl-f
+MarkColumn = f13
+Replace = f4
+ReplaceContinue = f14
+Complete = alt-tab
+InsertFile = f15
+Quit = f10
+InsertOverwrite = insert
+Help = f1
+Date =
+Refresh = ctrl-l
+Goto = alt-l
+Sort = alt-t
+Mail = alt-m
+ParagraphFormat = alt-p
+MatchBracket = alt-b
+ExternalCommand = alt-u
+UserMenu = f11
+Menu = f9
+Bookmark = alt-k
+BookmarkFlush = alt-o
+BookmarkNext = alt-j
+BookmarkPrev = alt-i
+History =
+Shell = ctrl-o
+InsertLiteral = ctrl-q
+MacroStartRecord =
+MacroStopRecord =
+MacroStartStopRecord = ctrl-r
+MacroDelete =
+ShowNumbers = alt-n
+ShowTabTws = alt-underline
+SyntaxOnOff = ctrl-s
+SyntaxChoose =
+ShowMargin =
+Find = alt-enter
+FilePrev = alt-minus
+FileNext = alt-plus
+RepeatStartStopRecord =
 SelectCodepage = alt-e
+Options =
+OptionsSaveMode =
+LearnKeys =
+ExtendedKeyMap = ctrl-x
 
 [viewer]
-ViewHelp = f1
-ViewToggleWrapMode = f2
-ViewQuit = f3; f10; q; esc; ctrl-g
-ViewToggleHexMode = f4
-ViewGoto = f5
-ViewSearch = f7; question; slash
-ViewToggleMagicMode = f8
-ViewToggleNroffMode = f9
-ViewContinueSearch = ctrl-r; ctrl-s; f17; n
-ViewMoveToBol = ctrl-a
-ViewMoveToEol = ctrl-e
-ViewMoveLeft = h; left
-ViewMoveRight = l; right
-ViewMoveLeft10 = ctrl-left
-ViewMoveRight10 = ctrl-right
-ViewMoveUp = k; y; insert; up; ctrl-p
-ViewMoveDown = j; e; delete; down; enter; ctrl-n
-ViewMovePgDn = f; space; pgdn; ctrl-v
-ViewMovePgUp = b; pgup; alt-v; backspace
-ViewMoveHalfPgDn = d
-ViewMoveHalfPgUp = u
-ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
-ViewGotoBookmark = m
-ViewNewBookmark = r
-ViewNextFile = ctrl-f
-ViewPrevFile = ctrl-b
+Help = f1
+WrapMode = f2
+Quit = f3; f10; q; esc; ctrl-g
+HexMode = f4
+Goto = f5
+Search = f7; question; slash
+SearchContinue = ctrl-r; ctrl-s; f17; n
+MagicMode = f8
+NroffMode = f9
+Home = ctrl-a
+End = ctrl-e
+Left = h; left
+Right = l; right
+LeftQuick = ctrl-left
+RightQuick = ctrl-right
+Up = k; y; insert; up; ctrl-p
+Down = j; e; delete; down; enter; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+BookmarkGoto = m
+Bookmark = r
+FileNext = ctrl-f
+FilePrev = ctrl-b
 SelectCodepage = alt-e
-ShowCommandLine = ctrl-o
-ViewToggleRuler = alt-r
+Shell = ctrl-o
+Ruler = alt-r
 
 [viewer:hex]
-ViewHelp = f1
-ViewToggleHexEditMode = f2
-ViewQuit = f3; f10; q; esc; ctrl-g
-ViewToggleHexMode = f4
-ViewGoto = f5
-ViewHexEditSave = f6
-ViewSearch = f7; question; slash
-ViewToggleMagicMode = f8
-ViewToggleNroffMode = f9
-ViewToggleHexNavMode = tab
-ViewMoveToBol = ctrl-a; home
-ViewMoveToEol = ctrl-e; end
-ViewMoveLeft = b; left
-ViewMoveRight = f; right
-ViewMoveUp = k; y; up
-ViewMoveDown = j; delete; down
-ViewMovePgDn = pgdn; ctrl-v
-ViewMovePgUp = pgup; alt-v
-ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+Help = f1
+HexEditMode = f2
+Quit = f3; f10; q; esc; ctrl-g
+HexMode = f4
+Goto = f5
+Save = f6
+Search = f7; question; slash
+SearchContinue = ctrl-r; ctrl-s; f17; n
+MagicMode = f8
+NroffMode = f9
+ToggleNavigation = tab
+Home = ctrl-a; home
+End = ctrl-e; end
+Left = b; left
+Right = f; right
+Up = k; y; up
+Down = j; delete; down
+PageDown = pgdn; ctrl-v
+PageUp = pgup; alt-v
+Top = ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
 
 [diffviewer]
-DiffDisplaySymbols = alt-s; s
-DiffDisplayNumbers = alt-n; l
-DiffFull = f
-DiffEqual = equal
-DiffSplitMore = gt
-DiffSplitLess = lt
-DiffSetTab2 = 2
-DiffSetTab3 = 3
-DiffSetTab4 = 4
-DiffSetTab8 = 8
-DiffSwapPanel = ctrl-u
-DiffRedo = ctrl-r
-DiffNextHunk = n; enter; space
-DiffPrevHunk = p; backspace
-DiffGoto = g; shift-g
-DiffSave = f2
-DiffEditCurrent = f4
-DiffEditOther = f14
-DiffMergeCurrentHunk = f5
-DiffSearch = f7
-DiffContinueSearch = f17
-DiffOptions = f9
-DiffBOF = ctrl-home
-DiffEOF = ctrl-end
-DiffDown = down
-DiffUp = up
-DiffQuickLeft = ctrl-left
-DiffQuickRight = ctrl-right
-DiffLeft = left
-DiffRight = right
-DiffPageDown = pgdn
-DiffPageUp = pgup
-DiffHome = home
-DiffEnd = end
-DiffHelp = f1
-DiffQuit = f10; q; shift-q; ctrl-g; esc
-ShowCommandLine = ctrl-o
+ShowSymbols = alt-s; s
+ShowNumbers = alt-n; l
+SplitFull = f
+SplitEqual = equal
+SplitMore = gt
+SplitLess = lt
+Tab2 = 2
+Tab3 = 3
+Tab4 = 4
+Tab8 = 8
+Swap = ctrl-u
+Redo = ctrl-r
+HunkNext = n; enter; space
+HunkPrev = p; backspace
+Goto = g; shift-g
+Save = f2
+Edit = f4
+EditOther = f14
+Merge = f5
+Search = f7
+SearchContinue = f17
+Options = f9
+Top = ctrl-home
+Bottom = ctrl-end
+Down = down
+Up = up
+LeftQuick = ctrl-left
+RightQuick = ctrl-right
+Left = left
+Right = right
+PageDown = pgdn
+PageUp = pgup
+Home = home
+End = end
+Help = f1
+Quit = f10; q; shift-q; ctrl-g; esc
+Shell = ctrl-o
 SelectCodepage = alt-e

misc/mc.keymap.emacs

@@ -1,441 +1,430 @@
 [main]
-CmdHelp = f1
-CmdUserMenu = f2
-CmdView = f3
-CmdViewFile = f13
-CmdEdit = f4
-CmdEditForceInternal =
-CmdCopy = f5
-CmdRename = f6
-CmdMkdir = f7
-CmdDelete = f8
-CmdMenu = f9
-CmdQuit = f10
-CmdMenuLastSelected = f19
-CmdQuietQuit = f20
-CmdFind = alt-question
-CmdQuickCd = alt-c
-CmdQuickChdir = ctrl-backslash
-CmdReread = ctrl-r
-CmdSingleDirsize = ctrl-space
-CmdSuspend = ctrl-z
-CmdSwapPanel = ctrl-u
-CmdHistory = alt-h
-CmdListing =
-CmdToggleListing = alt-t
-CmdToggleShowHidden = alt-dot
-CmdTogglePanelsSplit = alt-comma
-ShowCommandLine = ctrl-o
-CmdCopyCurrentPathname = alt-a
-CmdCopyOtherPathname = alt-shift-a
-CmdFilteredView = alt-exclamation
-CmdSelect = kpplus
-CmdUnselect = kpminus
-CmdReverseSelection = kpasterisk
-CmdDialogList = alt-prime
-ExtMap1 = ctrl-x
+Help = f1
+UserMenu = f2
+View = f3
+ViewFile =
+Edit = f4
+EditForceInternal =
+Copy = f5
+Move = f6
+MakeDir = f7
+Delete = f8
+Menu = f9
+Quit = f10
+MenuLastSelected = f19
+QuitQuiet = f20
+Find = alt-question
+CdQuick = alt-c
+HotList = ctrl-backslash
+Reread = ctrl-r
+DirSize = ctrl-space
+Suspend = ctrl-z
+Swap = ctrl-u
+History = alt-h
+PanelListing =
+PanelListingSwitch = alt-t
+PanelListingChange =
+ShowHidden = alt-dot
+SplitVertHoriz = alt-comma
+Shell = ctrl-o
+PutCurrentPath = alt-a
+PutOtherPath = alt-shift-a
+ViewFiltered = alt-exclamation
+Select = kpplus
+Unselect = kpminus
+SelectInvert = kpasterisk
+ScreenList = alt-prime
+Options =
+OptionsLayout =
+OptionsPanel =
+OptionsConfirm =
+OptionsDisplayBits =
+OptionsVfs =
+LearnKeys =
+SaveSetup =
+EditExtensionsFile =
+EditFileHighlightFile =
+Filter =
+ConnectFish =
+ConnectFtp =
+ConnectSmb =
+Undelete =
+ExtendedKeyMap = ctrl-x
 
 [main:xmap]
-CmdChmod = c
-CmdChown = o
-CmdCompareDirs = d
-CmdEditSymlink = ctrl-s
-CmdLink = l
-CmdSymlink = s
-CmdRelativeSymlink = v
-CmdInfo = i
-CmdQuickView = q
-CmdExternalPanelize = exclamation
-CmdReselectVfs = a
-CmdJobs = j
-CmdCopyCurrentPathname = p
-CmdCopyOtherPathname = ctrl-p
-CmdCopyCurrentTagged = t
-CmdCopyOtherTagged = ctrl-t
-CmdDiffView = ctrl-d
+ChangeMode = c
+ChangeOwn = o
+CompareDirs = d
+CompareFiles = ctrl-d
+HotListAdd = h
+LinkSymbolicEdit = ctrl-s
+Link = l
+LinkSymbolic = s
+LinkSymbolicRelative
+PanelInfo = i
+PanelQuickView = q
+ExternalPanelize = exclamation
+VfsList = a
+Jobs = j
+PutCurrentPath = p
+PutOtherPath = ctrl-p
+PutCurrentTagged = t
+PutOtherTagged = ctrl-t
+PutCurrentLink = r
+PutOtherLink = ctrl-r
 
 [panel]
-PanelStartSearch = ctrl-s; alt-s
-PanelMarkFile = insert; ctrl-t
-PanelMarkFileUp = shift-up
-PanelMarkFileDown = shift-down
-PanelMoveDown = down; ctrl-n
-PanelMoveUp = up; ctrl-p
-PanelMoveLeft = left
-PanelMoveRight = right
-PanelPrevPage = pgup; alt-v
-PanelNextPage = pgdn; ctrl-v
-PanelDoEnter = enter
-PanelChdirOtherPanel = alt-o
-PanelChdirToReadlink = alt-l
-PanelViewSimple = F13
-PanelEditNew = F14
-PanelCopyLocal = F15
-PanelRenameLocal = F16
-PanelDeleteLocal = F18
-PanelReverseSelection = alt-asterisk
-PanelSelect = alt-plus
-PanelUnselect = alt-minus
-PanelGotoChildDir = ctrl-pgdn
-PanelGotoParentDir = ctrl-pgup
-PanelDirectoryHistoryList = alt-shift-h
-PanelDirectoryHistoryNext = alt-u
-PanelDirectoryHistoryPrev = alt-y
-PanelGotoBottomFile = alt-j
-PanelGotoMiddleFile = alt-r
-PanelSyncOtherPanel = alt-i
-PanelGotoTopFile = alt-g
-PanelSetPanelEncoding = alt-e
-PanelMoveHome = alt-lt; home; a1
-PanelMoveEnd = alt-gt; end; c1
-PanelSelectSortOrder =
-PanelToggleSortOrderPrev =
-PanelToggleSortOrderNext =
-PanelReverseSort =
-PanelSortOrderByName =
-PanelSortOrderByExt =
-PanelSortOrderBySize =
-PanelSortOrderByMTime =
-PanelSmartGotoParentDir =
+Search = ctrl-s; alt-s
+Mark = insert; ctrl-t
+MarkUp = shift-up
+MarkDown = shift-down
+Down = down; ctrl-n
+Up = up; ctrl-p
+Left = left
+Right = right
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+PanelOtherCd = alt-o
+PanelOtherCdLink = alt-l
+ViewRaw = F13
+EditNew = F14
+CopySingle = F15
+MoveSingle = F16
+DeleteSingle = F18
+Select = alt-plus
+Unselect = alt-minus
+SelectInvert = alt-asterisk
+CdChild = ctrl-pgdn
+CdParent = ctrl-pgup
+CdParentSmart =
+History = alt-shift-h
+HistoryNext = alt-u
+HistoryPrev = alt-y
+BottomOnScreen = alt-j
+MiddleOnScreen = alt-r
+TopOnScreen = alt-g
+PanelOtherSync = alt-i
+SelectCodepage = alt-e
+Top = alt-lt; home; a1
+Bottom = alt-gt; end; c1
+Sort =
+SortPrev =
+SortNext =
+SortReverse =
+SortByName =
+SortByExt =
+SortBySize =
+SortByMTime =
 
 [dialog]
-DialogOK = enter
-DialogCancel = f10; esc; ctrl-g
-DialogPrevItem = left; up
-DialogNextItem = right; down
-DialogHelp = f1
-DialogSuspend = ctrl-z
-DialogRefresh = ctrl-l
-CmdDialogList = alt-prime
-CmdDialogNext = alt-rbrace
-CmdDialogPrev = alt-lbrace
+Ok = enter
+Cancel = f10; esc; ctrl-g
+Up = left; up
+#Left = left; up
+Down = right; down
+#Right = right; down
+Help = f1
+Suspend = ctrl-z
+Refresh = ctrl-l
+ScreenList = alt-prime
+ScreenNext = alt-rbrace
+ScreenPrev = alt-lbrace
 
 [input]
-InputBol = ctrl-a; alt-lt; home; a1
-InputEol = ctrl-e; alt-gt; end; c1
-InputMoveLeft = left; alt-left
-InputWordLeft = ctrl-left
-InputBackwardChar = ctrl-b
-InputBackwardWord = alt-b
-InputMoveRight = right; alt-right
-InputWordRight = ctrl-right
-InputForwardChar = ctrl-f
-InputForwardWord = alt-f
-InputBackwardDelete = backspace
-InputDeleteChar = delete
-InputKillWord = alt-d
-InputBackwardKillWord = alt-backspace
-InputSetMark =
-InputKillRegion = ctrl-w
-InputXCut =
-InputXStore = alt-w
-InputXPaste =
-InputYank = ctrl-y
-InputKillLine = ctrl-k
-InputHistoryPrev = alt-p; ctrl-down
-InputHistoryNext = alt-n; ctrl-up
-InputHistoryShow = alt-h
-InputComplete = alt-tab
-InputClearLine =
-InputLeftHighlight =
-InputRightHighlight =
-InputWordLeftHighlight =
-InputWordRightHighlight =
-InputBolHighlight =
-InputEolHighlight =
+Home = ctrl-a; alt-lt; home; a1
+End = ctrl-e; alt-gt; end; c1
+Left = left; alt-left; ctrl-b
+Right = right; alt-right; ctrl-f
+WordLeft = ctrl-left; alt-b
+WordRight = ctrl-right; alt-f
+Backspace = backspace
+Delete = delete
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+Mark =
+Remove = ctrl-w
+Cut =
+Store = alt-w
+Paste =
+Yank = ctrl-y
+DeleteToEnd = ctrl-k
+HistoryPrev = alt-p; ctrl-down
+HistoryNext = alt-n; ctrl-up
+History = alt-h
+Complete = alt-tab
+Clear =
+MarkLeft =
+MarkRight =
+MarkToWordBegin =
+MarkToWordEnd =
+MarkToHome =
+MarkToEnd =
 
 [listbox]
-ListboxMoveUp = up; ctrl-p
-ListboxMoveDown = down; ctrl-n
-ListboxMoveHome = home; alt-lt; a1
-ListboxMoveEnd = end; alt-gt; c1
-ListboxMovePgUp = pgup; alt-v
-ListboxMovePgDn = pgdn; ctrl-v
-ListboxDeleteItem = delete; d
-ListboxDeleteAll = shift-delete; shift-d
+Up = up; ctrl-p
+Down = down; ctrl-n
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Delete = delete; d
+Clear = shift-delete; shift-d
 
 [tree]
-TreeHelp = f1
-TreeForget = f3
-TreeToggleNav = f4
-TreeCopy = f5
-TreeMove = f6
-TreeMoveUp = up; ctrl-p
-TreeMoveDown = down; ctrl-n
-TreeMoveLeft = left
-TreeMoveRight = right
-TreeMoveHome = home; alt-lt; a1
-TreeMoveEnd = end; alt-gt; c1
-TreeMovePgUp = pgup; alt-v
-TreeMovePgDn = pgdn; ctrl-v
-TreeOpen = enter
-TreeRescan = f2; ctrl-r
-TreeStartSearch = ctrl-s; alt-s
-TreeRemove = f8; delete
+Help = f1
+Reread = f2; ctrl-r
+Forget = f3
+ToggleNavigation = f4
+Copy = f5
+Move = f6
+Up = up; ctrl-p
+Down = down; ctrl-n
+Left = left
+Right = right
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Enter = enter
+Search = ctrl-s; alt-s
+Delete = f8; delete
 
 [help]
-HelpHelp = f1
-HelpIndex = f2; c
-HelpBack = f3; left; l
-HelpQuit = f10; esc; ctrl-g
-HelpMoveUp = up; ctrl-p
-HelpMoveDown = down; ctrl-n
-HelpMovePgDn = f; space; pgdn; ctrl-v
-HelpMovePgUp = b; pgup; alt-v; backspace
-HelpMoveHalfPgDn = d
-HelpMoveHalfPgUp = u
-HelpMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-HelpMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
-HelpSelectLink = right; enter
-HelpNextLink = tab
-HelpPrevLink = alt-tab
-HelpNextNode = n
-HelpPrevNode = p
+Help = f1
+Index = f2; c
+Back = f3; left; l
+Quit = f10; esc; ctrl-g
+Up = up; ctrl-p
+Down = down; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+Enter = right; enter
+LinkNext = tab
+LinkPrev = alt-tab
+NodeNext = n
+NodePrev = p
 
 [editor]
-EditXStore = alt-w
-EditXPaste = ctrl-y
-EditXCut = ctrl-w
-EditDeleteLine = ctrl-y
-EditDeleteToLineEnd = ctrl-k
-EditDeleteToLineBegin =
-EditLeft = left; ctrl-b
-EditRight = right; ctrl-f
-EditUp = up; ctrl-p
-EditDown = down; ctrl-n
-EditEnter = enter
-EditReturn = shift-enter
-EditBackSpace = backspace
-EditDelete = delete
-EditPageUp = pgup; alt-v
-EditPageDown = pgdn; ctrl-v
-EditWordLeft = ctrl-left; alt-b
-EditWordRight = ctrl-right; alt-f
-EditHome = home; ctrl-a
-EditEnd = end; ctrl-e
-EditTab = tab
-EditUndo = ctrl-u
-EditBeginningOfText = ctrl-home; alt-lt
-EditEndOfText = ctrl-end; alt-gt
-EditScrollUp = ctrl-up
-EditScrollDown = ctrl-down
-EditBeginPage = ctrl-pgup
-EditEndPage = ctrl-pgdn
-EditDeleteWordLeft = alt-backspace
-EditDeleteWordRight = alt-d
-EditParagraphUp =
-EditParagraphDown =
-EditSave = f2
-EditLoad =
-EditSaveas = f12
-EditMark = f3; ctrl-at
-EditCopy = f5
-EditMove = f6
-EditRemove = f8
-EditMarkAll =
-EditUnmark =
-EditFind = f7; ctrl-s
-EditMarkLine =
-EditMarkWord =
-EditShiftBlockLeft =
-EditShiftBlockRight =
-EditPageUpHighlight = shift-pgup
-EditPageDownHighlight = shift-pgdn
-EditLeftHighlight = shift-left
-EditRightHighlight = shift-right
-EditWordLeftHighlight = ctrl-shift-left
-EditWordRightHighlight = ctrl-shift-right
-EditUpHighlight = shift-up
-EditDownHighlight = shift-down
-EditHomeHighlight = shift-home
-EditEndHighlight = shift-end
-EditBeginningOfTextHighlight = ctrl-shift-home
-EditEndOfTextHighlight  = ctrl-shift-end
-EditBeginPageHighlight  = ctrl-shift-pgup
-EditEndPageHighlight = ctrl-shift-pgdn
-EditScrollUpHighlight = ctrl-shift-up
-EditScrollDownHighlight = ctrl-shift-down
-EditParagraphUpHighlight =
-EditParagraphDownHighlight =
-EditPageUpAltHighlight = alt-pgup
-EditPageDownAltHighlight = alt-pgdn
-EditLeftAltHighlight = alt-left
-EditRightAltHighlight = alt-right
-EditWordLeftAltHighlight = ctrl-alt-left
-EditWordRightAltHighlight = ctrl-alt-right
-EditUpAltHighlight = alt-up
-EditDownAltHighlight = alt-down
-EditHomeAltHighlight = alt-home
-EditEndAltHighlight = alt-end
-EditBeginningOfTextAltHighlight = ctrl-alt-home
-EditEndOfTextHighlight  = ctrl-alt-end
-EditBeginPageHighlight  = ctrl-alt-pgup
-EditEndPageAltHighlight = ctrl-alt-pgdn
-EditScrollUpAltHighlight =
-EditScrollDownAltHighlight =
-EditParagraphUpAltHighlight =
-EditParagraphDownAltHighlight =
-EditSaveBlock =
-EditColumnMark = f13
-EditFindAgain = f17
-EditReplace = f4
-EditReplaceAgain = f14
-EditCompleteWord = alt-tab
-EditDebugStart =
-EditDebugStop =
-EditDebugToggleBreak =
-EditDebugClear =
-EditDebugNext =
-EditDebugStep =
-EditDebugBackTrace =
-EditDebugContinue =
-EditDebugEnterCommand =
-EditDebugUntilCurser =
-EditInsertFile = f15
-EditQuit = f10
-EditToggleInsert = insert
-EditHelp = f1
-EditDate =
-EditRefresh = ctrl-l
-EditGoto = alt-l
-EditManPage =
-EditSort = alt-t
-EditMail =
-EditCancel =
-EditComplete =
-EditParagraphFormat = alt-p
-EditUtil =
-EditTypeLoadPython =
-EditFindFile =
-EditCtags =
-EditMatchBracket =
-EditTerminal =
-EditTerminalApp =
-EditExtCmd = alt-u
-EditUserMenu = f11
-EditSaveDesktop =
-EditNewWindow =
-EditCycle =
-EditMenu = f9
-EditSaveAndQuit =
-EditRunAnother =
-EditCheckSaveAndQuit =
-EditMaximize =
-EditToggleBookmark =
-EditFlushBookmarks =
-EditNextBookmark =
-EditPrevBookmark =
-EditSelectionHistory =
-EditShell = ctrl-o
-EditInsertLiteral = ctrl-q
-EditBeginRecordMacro =
-EditEndRecordMacro =
-EditBeginOrEndMacro = ctrl-r
-EditDeleteMacro =
-EditToggleLineState = alt-n
-EditToggleTabTWS = alt-underline
-EditToggleSyntax = ctrl-s
-EditToggleShowMargin =
-EditFindDefinition = alt-enter
-EditLoadPrevFile = alt-minus
-EditLoadNextFile = alt-plus
-EditBeginEndRepeat =
+Store = alt-w
+Paste = ctrl-y
+Cut = ctrl-w
+Up = up; ctrl-p
+Down = down; ctrl-n
+Left = left; ctrl-b
+Right = right; ctrl-f
+WordLeft = ctrl-left; alt-b
+WordRight = ctrl-right; alt-f
+Enter = enter
+Return = shift-enter
+BackSpace = backspace
+Delete = delete
+PageUp = pgup; alt-v
+PageDown = pgdn; ctrl-v
+Home = home; ctrl-a
+End = end; ctrl-e
+Tab = tab
+Undo = ctrl-u
+Redo =
+Top = ctrl-home; alt-lt
+Bottom = ctrl-end; alt-gt
+ScrollUp = ctrl-up
+ScrollDown = ctrl-down
+TopOnScreen = ctrl-pgup
+BottomOnScreen = ctrl-pgdn
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+DeleteLine = ctrl-y
+DeleteToEnd = ctrl-k
+DeleteToHome =
+ParagraphUp =
+ParagraphDown =
+Save = f2
+EditFile =
+SaveAs = f12; ctrl-f2
+Mark = f3; ctrl-at
+Copy = f5
+Move = f6
+Remove = f8
+MarkLine =
+MarkWord =
+MarkAll =
+Unmark =
+Search = f7; ctrl-s
+SearchContinue = f17
+BlockShiftLeft =
+BlockShiftRight =
+MarkPageUp = shift-pgup
+MarkPageDown = shift-pgdn
+MarkLeft = shift-left
+MarkRight = shift-right
+MarkToWordBegin = ctrl-shift-left
+MarkToWordEnd = ctrl-shift-right
+MarkUp = shift-up
+MarkDown = shift-down
+MarkToHome = shift-home
+MarkToEnd = shift-end
+MarkToFileBegin = ctrl-shift-home
+MarkToFileEnd = ctrl-shift-end
+MarkToPageBegin = ctrl-shift-pgup
+MarkToPageEnd = ctrl-shift-pgdn
+MarkScrollUp = ctrl-shift-up
+MarkScrollDown = ctrl-shift-down
+MarkParagraphUp =
+MarkParagraphDown =
+MarkColumnPageUp = alt-pgup
+MarkColumnPageDown = alt-pgdn
+MarkColumnLeft = alt-left
+MarkColumnRight = alt-right
+MarkColumnUp = alt-up
+MarkColumnDown = alt-down
+MarkColumnScrollUp =
+MarkColumnScrollDown =
+MarkColumnParagraphUp =
+MarkColumnParagraphDown =
+BlockSave =
+MarkColumn = f13
+Replace = f4
+ReplaceContinue = f14
+Complete = alt-tab
+InsertFile = f15
+Quit = f10
+InsertOverwrite = insert
+Help = f1
+Date =
+Refresh = ctrl-l
+Goto = alt-l
+Sort = alt-t
+Mail =
+ParagraphFormat = alt-p
+MatchBracket =
+ExternalCommand = alt-u
+UserMenu = f11
+Menu = f9
+Bookmark =
+BookmarkFlush =
+BookmarkNext =
+BookmarkPrev =
+History =
+Shell = ctrl-o
+InsertLiteral = ctrl-q
+MacroStartRecord =
+MacroStopRecord =
+MacroStartStopRecord = ctrl-r
+MacroDelete =
+ShowNumbers = alt-n
+ShowTabTws = alt-underline
+SyntaxOnOff = ctrl-s
+SyntaxChoose =
+ShowMargin =
+Find = alt-enter
+FilePrev = alt-minus
+FileNext = alt-plus
+RepeatStartStopRecord =
 SelectCodepage = alt-e
-EditExtMode = ctrl-x
+Options =
+OptionsSaveMode =
+LearnKeys =
+ExtendedKeyMap = ctrl-x
 
 [editor:xmap]
 EditNew = k
 
 [viewer]
-ViewHelp = f1
-ViewToggleWrapMode = f2
-ViewQuit = f3; f10; q; esc; ctrl-g
-ViewToggleHexMode = f4
-ViewGoto = f5
-ViewSearch = f7; question; slash
-ViewToggleMagicMode = f8
-ViewToggleNroffMode = f9
-ViewContinueSearch = ctrl-r; ctrl-s; f17; n
-ViewMoveToBol = ctrl-a
-ViewMoveToEol = ctrl-e
-ViewMoveLeft = h; left
-ViewMoveRight = l; right
-ViewMoveLeft10 = ctrl-left
-ViewMoveRight10 = ctrl-right
-ViewMoveUp = k; y; insert; up; ctrl-p
-ViewMoveDown = j; e; delete; down; enter; ctrl-n
-ViewMovePgDn = f; space; pgdn; ctrl-v
-ViewMovePgUp = b; pgup; alt-v; backspace
-ViewMoveHalfPgDn = d
-ViewMoveHalfPgUp = u
-ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
-ViewGotoBookmark = m
-ViewNewBookmark = r
-ViewNextFile = ctrl-f
-ViewPrevFile = ctrl-b
+Help = f1
+WrapMode = f2
+Quit = f3; f10; q; esc; ctrl-g
+HexMode = f4
+Goto = f5
+Search = f7; question; slash
+MagicMode = f8
+NroffMode = f9
+SearchContinue = ctrl-r; ctrl-s; f17; n
+Home = ctrl-a
+End = ctrl-e
+Left = h; left
+Right = l; right
+LeftQuick= ctrl-left
+RightQuick = ctrl-right
+Up = k; y; insert; up; ctrl-p
+Down = j; e; delete; down; enter; ctrl-n
+PageDown = f; space; pgdn; ctrl-v
+PageUp = b; pgup; alt-v; backspace
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+BookmarkGoto = m
+Bookmark = r
+FileNext = ctrl-f
+FilePrev = ctrl-b
 SelectCodepage = alt-e
-ShowCommandLine = ctrl-o
-ViewToggleRuler = alt-r
+Shell = ctrl-o
+Ruler = alt-r
 
 [viewer:hex]
-ViewHelp = f1
-ViewToggleHexEditMode = f2
-ViewQuit = f3; f10; q; esc; ctrl-g
-ViewToggleHexMode = f4
-ViewGoto = f5
-ViewHexEditSave = f6
-ViewSearch = f7; question; slash
-ViewToggleMagicMode = f8
-ViewToggleNroffMode = f9
-ViewToggleHexNavMode = tab
-ViewMoveToBol = ctrl-a; home
-ViewMoveToEol = ctrl-e; end
-ViewMoveLeft = b; left
-ViewMoveRight = f; right
-ViewMoveUp = k; y; up
-ViewMoveDown = j; delete; down
-ViewMovePgDn = pgdn; ctrl-v
-ViewMovePgUp = pgup; alt-v
-ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
-ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+Help = f1
+HexEditMode = f2
+Quit = f3; f10; q; esc; ctrl-g
+HexMode = f4
+Goto = f5
+Save = f6
+Search = f7; question; slash
+SearchContinue = ctrl-r; ctrl-s; f17; n
+MagicMode = f8
+NroffMode = f9
+ToggleNavigation = tab
+Home = ctrl-a; home
+End = ctrl-e; end
+Left = b; left
+Right = f; right
+Up = k; y; up
+Down = j; delete; down
+PageDown = pgdn; ctrl-v
+PageUp = pgup; alt-v
+Top = ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
 
 [diffviewer]
-DiffDisplaySymbols = alt-s; s
-DiffDisplayNumbers = alt-n; l
-DiffFull = f
-DiffEqual = equal
-DiffSplitMore = gt
-DiffSplitLess = lt
-DiffSetTab2 = 2
-DiffSetTab3 = 3
-DiffSetTab4 = 4
-DiffSetTab8 = 8
-DiffSwapPanel = ctrl-u
-DiffRedo = ctrl-r
-DiffNextHunk = n; enter; space
-DiffPrevHunk = p; backspace
-DiffGoto = g; shift-g
-DiffSave = f2
-DiffEditCurrent = f4
-DiffEditOther = f14
-DiffMergeCurrentHunk = f5
-DiffSearch = f7
-DiffContinueSearch = f17
-DiffOptions = f9
-DiffBOF = ctrl-home
-DiffEOF = ctrl-end
-DiffDown = down
-DiffUp = up
-DiffQuickLeft = ctrl-left
-DiffQuickRight = ctrl-right
-DiffLeft = left
-DiffRight = right
-DiffPageDown = pgdn
-DiffPageUp = pgup
-DiffHome = home
-DiffEnd = end
-DiffHelp = f1
-DiffQuit = f10; q; shift-q; ctrl-g; esc
-ShowCommandLine = ctrl-o
+ShowSymbols = alt-s; s
+ShowNumbers = alt-n; l
+SplitFull = f
+SplitEqual = equal
+SplitMore = gt
+SplitLess = lt
+Tab2 = 2
+Tab3 = 3
+Tab4 = 4
+Tab8 = 8
+Swap = ctrl-u
+Redo = ctrl-r
+HunkNext = n; enter; space
+HunkPrev = p; backspace
+Goto = g; shift-g
+Save = f2
+Edit = f4
+EditOther = f14
+Merge = f5
+Search = f7
+SearchContinue = f17
+Options = f9
+Top = ctrl-home
+Bottom = ctrl-end
+Down = down
+Up = up
+LeftQuick = ctrl-left
+RightQuick = ctrl-right
+Left = left
+Right = right
+PageDown = pgdn
+PageUp = pgup
+Home = home
+End = end
+Help = f1
+Quit = f10; q; shift-q; ctrl-g; esc
+Shell = ctrl-o
 SelectCodepage = alt-e

src/diffviewer/ydiff.c

@@ -2980,29 +2980,29 @@ dview_execute_cmd (WDiff * dview, unsigned long command)
     cb_ret_t res = MSG_HANDLED;
     switch (command)
     {
-    case CK_DiffHelp:
+    case CK_Help:
         interactive_display (NULL, "[Diff Viewer]");
         break;
-    case CK_DiffDisplaySymbols:
+    case CK_ShowSymbols:
         dview->display_symbols ^= 1;
         dview->new_frame = 1;
         break;
-    case CK_DiffDisplayNumbers:
+    case CK_ShowNumbers:
         dview->display_numbers ^= calc_nwidth ((const GArray ** const) dview->a);
         dview->new_frame = 1;
         break;
-    case CK_DiffFull:
+    case CK_SplitFull:
         dview->full ^= 1;
         dview->new_frame = 1;
         break;
-    case CK_DiffEqual:
+    case CK_SplitEqual:
         if (!dview->full)
         {
             dview->bias = 0;
             dview->new_frame = 1;
         }
         break;
-    case CK_DiffSplitMore:
+    case CK_SplitMore:
         if (!dview->full)
         {
             dview_compute_split (dview, 1);
@@ -3010,122 +3010,124 @@ dview_execute_cmd (WDiff * dview, unsigned long command)
         }
         break;
 
-    case CK_DiffSplitLess:
+    case CK_SplitLess:
         if (!dview->full)
         {
             dview_compute_split (dview, -1);
             dview->new_frame = 1;
         }
         break;
-    case CK_DiffSetTab2:
+    case CK_Tab2:
         dview->tab_size = 2;
         break;
-    case CK_DiffSetTab3:
+    case CK_Tab3:
         dview->tab_size = 3;
         break;
-    case CK_DiffSetTab4:
+    case CK_Tab4:
         dview->tab_size = 4;
         break;
-    case CK_DiffSetTab8:
+    case CK_Tab8:
         dview->tab_size = 8;
         break;
-    case CK_DiffSwapPanel:
+    case CK_Swap:
         dview->ord ^= 1;
         break;
-    case CK_DiffRedo:
+    case CK_Redo:
         dview_redo (dview);
         break;
-    case CK_DiffNextHunk:
+    case CK_HunkNext:
         dview->skip_rows = dview->search.last_accessed_num_line =
             find_next_hunk (dview->a[0], dview->skip_rows);
         break;
-    case CK_DiffPrevHunk:
+    case CK_HunkPrev:
         dview->skip_rows = dview->search.last_accessed_num_line =
             find_prev_hunk (dview->a[0], dview->skip_rows);
         break;
-    case CK_DiffGoto:
+    case CK_Goto:
         dview_goto_cmd (dview, TRUE);
         break;
-    case CK_DiffEditCurrent:
+    case CK_Edit:
         dview_edit (dview, dview->ord);
         break;
-    case CK_DiffMergeCurrentHunk:
+    case CK_Merge:
         do_merge_hunk (dview);
         dview_redo (dview);
         break;
-    case CK_DiffEditOther:
+    case CK_EditOther:
         dview_edit (dview, dview->ord ^ 1);
         break;
-    case CK_DiffSearch:
+    case CK_Search:
         dview_search_cmd (dview);
         break;
-    case CK_DiffContinueSearch:
+    case CK_SearchContinue:
         dview_continue_search_cmd (dview);
         break;
-    case CK_DiffBOF:
+    case CK_Top:
         dview->skip_rows = dview->search.last_accessed_num_line = 0;
         break;
-    case CK_DiffEOF:
+    case CK_Bottom:
         dview->skip_rows = dview->search.last_accessed_num_line = dview->a[0]->len - 1;
         break;
-    case CK_DiffUp:
+    case CK_Up:
         if (dview->skip_rows > 0)
         {
             dview->skip_rows--;
             dview->search.last_accessed_num_line = dview->skip_rows;
         }
         break;
-    case CK_DiffDown:
+    case CK_Down:
         dview->skip_rows++;
         dview->search.last_accessed_num_line = dview->skip_rows;
         break;
-    case CK_DiffPageDown:
+    case CK_PageDown:
         if (dview->height > 2)
         {
             dview->skip_rows += dview->height - 2;
             dview->search.last_accessed_num_line = dview->skip_rows;
         }
         break;
-    case CK_DiffPageUp:
+    case CK_PageUp:
         if (dview->height > 2)
         {
             dview->skip_rows -= dview->height - 2;
             dview->search.last_accessed_num_line = dview->skip_rows;
         }
         break;
-    case CK_DiffLeft:
+    case CK_Left:
         dview->skip_cols--;
         break;
-    case CK_DiffRight:
+    case CK_Right:
         dview->skip_cols++;
         break;
-    case CK_DiffQuickLeft:
+    case CK_LeftQuick:
         dview->skip_cols -= 8;
         break;
-    case CK_DiffQuickRight:
+    case CK_RightQuick:
         dview->skip_cols += 8;
         break;
-    case CK_DiffHome:
+    case CK_Home:
         dview->skip_cols = 0;
         break;
-    case CK_ShowCommandLine:
+    case CK_Shell:
         view_other_cmd ();
         break;
-    case CK_DiffQuit:
+    case CK_Quit:
         dview->view_quit = 1;
         break;
-    case CK_DiffSave:
+    case CK_Save:
         dview_do_save (dview);
         break;
-    case CK_DiffOptions:
+    case CK_Options:
         dview_diff_options (dview);
         break;
+#ifdef HAVE_CHARSET
     case CK_SelectCodepage:
         dview_select_encoding (dview);
         dview_reread (dview);
         tty_touch_screen ();
         repaint_screen ();
         break;
+#endif
     default:
         res = MSG_NOT_HANDLED;
     }

src/editor/edit.c

@@ -1666,8 +1666,7 @@ user_menu (WEdit * edit, const char *menu_file, int selected_entry)
 
     /* run shell scripts from menu */
     if (user_menu_cmd (edit, menu_file, selected_entry)
-        && (mc_stat (block_file, &status) == 0)
-        && (status.st_size != 0))
+        && (mc_stat (block_file, &status) == 0) && (status.st_size != 0))
     {
         int rc = 0;
         FILE *fd;
@@ -3386,8 +3385,9 @@ edit_find_bracket (WEdit * edit)
 void
 edit_execute_key_command (WEdit * edit, unsigned long command, int char_for_insertion)
 {
-    if (command == CK_Begin_Record_Macro || command == CK_Begin_Record_Repeat
-        || (macro_index < 0 && (command == CK_Begin_End_Macro || command == CK_Begin_End_Repeat)))
+    if (command == CK_MacroStartRecord || command == CK_RepeatStartRecord
+        || (macro_index < 0
+            && (command == CK_MacroStartStopRecord || command == CK_RepeatStartStopRecord)))
     {
         macro_index = 0;
         edit->force |= REDRAW_CHAR_ONLY | REDRAW_LINE;
@@ -3396,19 +3396,18 @@ edit_execute_key_command (WEdit * edit, unsigned long command, int char_for_inse
     if (macro_index != -1)
     {
         edit->force |= REDRAW_COMPLETELY;
-        if (command == CK_End_Record_Macro || command == CK_Begin_End_Macro)
+        if (command == CK_MacroStopRecord || command == CK_MacroStartStopRecord)
         {
             edit_store_macro_cmd (edit);
             macro_index = -1;
             return;
         }
-        else if (command == CK_End_Record_Repeat || command == CK_Begin_End_Repeat)
+        else if (command == CK_RepeatStopRecord || command == CK_RepeatStartStopRecord)
         {
             edit_repeat_macro_cmd (edit);
             macro_index = -1;
             return;
         }
-
     }
 
     if (macro_index >= 0 && macro_index < MAX_MACRO_LENGTH - 1)
@@ -3417,7 +3416,7 @@ edit_execute_key_command (WEdit * edit, unsigned long command, int char_for_inse
         record_macro_buf[macro_index++].ch = char_for_insertion;
     }
     /* record the beginning of a set of editing actions initiated by a key press */
-    if (command != CK_Undo && command != CK_Ext_Mode)
+    if (command != CK_Undo && command != CK_ExtendedKeyMap)
         edit_push_key_press (edit);
 
     edit_execute_cmd (edit, command, char_for_insertion);
@@ -3542,16 +3541,16 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
 
     switch (command)
     {
-    case CK_Begin_Page:
-    case CK_End_Page:
-    case CK_Begin_Page_Highlight:
-    case CK_End_Page_Highlight:
-    case CK_Word_Left:
-    case CK_Word_Right:
+    case CK_TopOnScreen:
+    case CK_BottomOnScreen:
+    case CK_MarkToPageBegin:
+    case CK_MarkToPageEnd:
     case CK_Up:
     case CK_Down:
     case CK_Left:
     case CK_Right:
+    case CK_WordLeft:
+    case CK_WordRight:
         if (edit->mark2 >= 0)
         {
             if (!option_persistent_selections)
@@ -3566,26 +3565,26 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
 
     switch (command)
     {
-    case CK_Begin_Page:
-    case CK_End_Page:
-    case CK_Begin_Page_Highlight:
-    case CK_End_Page_Highlight:
-    case CK_Word_Left:
-    case CK_Word_Right:
+    case CK_TopOnScreen:
+    case CK_BottomOnScreen:
+    case CK_MarkToPageBegin:
+    case CK_MarkToPageEnd:
     case CK_Up:
     case CK_Down:
-    case CK_Word_Left_Highlight:
-    case CK_Word_Right_Highlight:
-    case CK_Up_Highlight:
-    case CK_Down_Highlight:
-    case CK_Up_Alt_Highlight:
-    case CK_Down_Alt_Highlight:
+    case CK_WordLeft:
+    case CK_WordRight:
+    case CK_MarkToWordBegin:
+    case CK_MarkToWordEnd:
+    case CK_MarkUp:
+    case CK_MarkDown:
+    case CK_MarkColumnUp:
+    case CK_MarkColumnDown:
         if (edit->mark2 == -1)
             break;              /*marking is following the cursor: may need to highlight a whole line */
     case CK_Left:
     case CK_Right:
-    case CK_Left_Highlight:
-    case CK_Right_Highlight:
+    case CK_MarkLeft:
+    case CK_MarkRight:
         edit->force |= REDRAW_CHAR_ONLY;
     }
 
@@ -3654,25 +3653,25 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
         }
         edit_delete (edit, 0);
         break;
-    case CK_Delete_Word_Left:
+    case CK_DeleteToWordBegin:
         edit->over_col = 0;
         edit_left_delete_word (edit);
         break;
-    case CK_Delete_Word_Right:
+    case CK_DeleteToWordEnd:
         if (option_cursor_beyond_eol && edit->over_col > 0)
             edit_insert_over (edit);
 
         edit_right_delete_word (edit);
         break;
-    case CK_Delete_Line:
+    case CK_DeleteLine:
         edit_delete_line (edit);
         break;
-    case CK_Delete_To_Line_End:
-        edit_delete_to_line_end (edit);
-        break;
-    case CK_Delete_To_Line_Begin:
+    case CK_DeleteToHome:
         edit_delete_to_line_begin (edit);
         break;
+    case CK_DeleteToEnd:
+        edit_delete_to_line_end (edit);
+        break;
     case CK_Enter:
         edit->over_col = 0;
         if (option_auto_para_formatting)
@@ -3695,22 +3694,22 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
         edit_insert (edit, '\n');
         break;
 
-    case CK_Page_Up_Alt_Highlight:
+    case CK_MarkColumnPageUp:
         edit->column_highlight = 1;
-    case CK_Page_Up:
-    case CK_Page_Up_Highlight:
+    case CK_PageUp:
+    case CK_MarkPageUp:
         edit_move_up (edit, edit->num_widget_lines - 1, 1);
         break;
-    case CK_Page_Down_Alt_Highlight:
+    case CK_MarkColumnPageDown:
         edit->column_highlight = 1;
-    case CK_Page_Down:
-    case CK_Page_Down_Highlight:
+    case CK_PageDown:
+    case CK_MarkPageDown:
         edit_move_down (edit, edit->num_widget_lines - 1, 1);
         break;
-    case CK_Left_Alt_Highlight:
+    case CK_MarkColumnLeft:
         edit->column_highlight = 1;
     case CK_Left:
-    case CK_Left_Highlight:
+    case CK_MarkLeft:
         if (option_fake_half_tabs)
         {
             if (is_in_indent (edit) && right_of_four_spaces (edit))
@@ -3725,10 +3724,10 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
         }
         edit_left_char_move_cmd (edit);
         break;
-    case CK_Right_Alt_Highlight:
+    case CK_MarkColumnRight:
         edit->column_highlight = 1;
     case CK_Right:
-    case CK_Right_Highlight:
+    case CK_MarkRight:
         if (option_fake_half_tabs)
         {
             if (is_in_indent (edit) && left_of_four_spaces (edit))
@@ -3740,66 +3739,66 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
         }
         edit_right_char_move_cmd (edit);
         break;
-    case CK_Begin_Page:
-    case CK_Begin_Page_Highlight:
+    case CK_TopOnScreen:
+    case CK_MarkToPageBegin:
         edit_begin_page (edit);
         break;
-    case CK_End_Page:
-    case CK_End_Page_Highlight:
+    case CK_BottomOnScreen:
+    case CK_MarkToPageEnd:
         edit_end_page (edit);
         break;
-    case CK_Word_Left:
-    case CK_Word_Left_Highlight:
+    case CK_WordLeft:
+    case CK_MarkToWordBegin:
         edit->over_col = 0;
         edit_left_word_move_cmd (edit);
         break;
-    case CK_Word_Right:
-    case CK_Word_Right_Highlight:
+    case CK_WordRight:
+    case CK_MarkToWordEnd:
         edit->over_col = 0;
         edit_right_word_move_cmd (edit);
         break;
-    case CK_Up_Alt_Highlight:
+    case CK_MarkColumnUp:
         edit->column_highlight = 1;
     case CK_Up:
-    case CK_Up_Highlight:
+    case CK_MarkUp:
         edit_move_up (edit, 1, 0);
         break;
-    case CK_Down_Alt_Highlight:
+    case CK_MarkColumnDown:
         edit->column_highlight = 1;
     case CK_Down:
-    case CK_Down_Highlight:
+    case CK_MarkDown:
         edit_move_down (edit, 1, 0);
         break;
-    case CK_Paragraph_Up_Alt_Highlight:
+    case CK_MarkColumnParagraphUp:
         edit->column_highlight = 1;
-    case CK_Paragraph_Up:
-    case CK_Paragraph_Up_Highlight:
+    case CK_ParagraphUp:
+    case CK_MarkParagraphUp:
         edit_move_up_paragraph (edit, 0);
         break;
-    case CK_Paragraph_Down_Alt_Highlight:
+    case CK_MarkColumnParagraphDown:
         edit->column_highlight = 1;
-    case CK_Paragraph_Down:
-    case CK_Paragraph_Down_Highlight:
+    case CK_ParagraphDown:
+    case CK_MarkParagraphDown:
         edit_move_down_paragraph (edit, 0);
         break;
-    case CK_Scroll_Up_Alt_Highlight:
+    case CK_MarkColumnScrollUp:
         edit->column_highlight = 1;
-    case CK_Scroll_Up:
-    case CK_Scroll_Up_Highlight:
+    case CK_ScrollUp:
+    case CK_MarkScrollUp:
         edit_move_up (edit, 1, 1);
         break;
-    case CK_Scroll_Down_Alt_Highlight:
+    case CK_MarkColumnScrollDown:
         edit->column_highlight = 1;
-    case CK_Scroll_Down:
-    case CK_Scroll_Down_Highlight:
+    case CK_ScrollDown:
+    case CK_MarkScrollDown:
         edit_move_down (edit, 1, 1);
         break;
     case CK_Home:
-    case CK_Home_Highlight:
+    case CK_MarkToHome:
         edit_cursor_to_bol (edit);
         break;
     case CK_End:
-    case CK_End_Highlight:
+    case CK_MarkToEnd:
         edit_cursor_to_eol (edit);
         break;
     case CK_Tab:
@@ -3827,8 +3826,8 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
         }
         break;
 
-    case CK_Toggle_Insert:
-        edit->overwrite = (edit->overwrite == 0);
+    case CK_InsertOverwrite:
+        edit->overwrite = !edit->overwrite;
         break;
 
     case CK_Mark:
@@ -3840,13 +3839,13 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
         }
         edit_mark_cmd (edit, 0);
         break;
-    case CK_Column_Mark:
+    case CK_MarkColumn:
         if (!edit->column_highlight)
             edit_push_undo_action (edit, COLUMN_OFF);
         edit->column_highlight = 1;
         edit_mark_cmd (edit, 0);
         break;
-    case CK_Mark_All:
+    case CK_MarkAll:
         edit_set_markers (edit, 0, edit->last_byte, 0, 0);
         edit->force |= REDRAW_PAGE;
         break;
@@ -3856,49 +3855,43 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
         edit->column_highlight = 0;
         edit_mark_cmd (edit, 1);
         break;
-    case CK_Mark_Word:
+    case CK_MarkWord:
         if (edit->column_highlight)
             edit_push_undo_action (edit, COLUMN_ON);
         edit->column_highlight = 0;
         edit_mark_current_word_cmd (edit);
         break;
-    case CK_Mark_Line:
+    case CK_MarkLine:
         if (edit->column_highlight)
             edit_push_undo_action (edit, COLUMN_ON);
         edit->column_highlight = 0;
         edit_mark_current_line_cmd (edit);
         break;
-    case CK_Toggle_Line_State:
+
+    case CK_ShowNumbers:
         option_line_state = !option_line_state;
-        if (option_line_state)
-        {
-            option_line_state_width = LINE_STATE_WIDTH;
-        }
-        else
-        {
-            option_line_state_width = 0;
-        }
+        option_line_state_width = option_line_state ? LINE_STATE_WIDTH : 0;
         edit->force |= REDRAW_PAGE;
         break;
 
-    case CK_Toggle_Show_Margin:
+    case CK_ShowMargin:
         show_right_margin = !show_right_margin;
         edit->force |= REDRAW_PAGE;
         break;
 
-    case CK_Toggle_Bookmark:
+    case CK_Bookmark:
         book_mark_clear (edit, edit->curs_line, BOOK_MARK_FOUND_COLOR);
         if (book_mark_query_color (edit, edit->curs_line, BOOK_MARK_COLOR))
             book_mark_clear (edit, edit->curs_line, BOOK_MARK_COLOR);
         else
             book_mark_insert (edit, edit->curs_line, BOOK_MARK_COLOR);
         break;
-    case CK_Flush_Bookmarks:
+    case CK_BookmarkFlush:
         book_mark_flush (edit, BOOK_MARK_COLOR);
         book_mark_flush (edit, BOOK_MARK_FOUND_COLOR);
         edit->force |= REDRAW_PAGE;
         break;
-    case CK_Next_Bookmark:
+    case CK_BookmarkNext:
         if (edit->book_mark)
         {
             struct _book_mark *p;
@@ -3913,7 +3906,7 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
             }
         }
         break;
-    case CK_Prev_Bookmark:
+    case CK_BookmarkPrev:
         if (edit->book_mark)
         {
             struct _book_mark *p;
@@ -3931,12 +3924,12 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
         }
         break;
 
-    case CK_Beginning_Of_Text:
-    case CK_Beginning_Of_Text_Highlight:
+    case CK_Top:
+    case CK_MarkToFileBegin:
         edit_move_to_top (edit);
         break;
-    case CK_End_Of_Text:
-    case CK_End_Of_Text_Highlight:
+    case CK_Bottom:
+    case CK_MarkToFileEnd:
         edit_move_to_bottom (edit);
         break;
 
@@ -3952,21 +3945,21 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
         edit_block_move_cmd (edit);
         break;
 
-    case CK_Shift_Block_Left:
+    case CK_BlockShiftLeft:
         if (edit->mark1 != edit->mark2)
             edit_move_block_to_left (edit);
         break;
-    case CK_Shift_Block_Right:
+    case CK_BlockShiftRight:
         if (edit->mark1 != edit->mark2)
             edit_move_block_to_right (edit);
         break;
-    case CK_XStore:
+    case CK_Store:
         edit_copy_to_X_buf_cmd (edit);
         break;
-    case CK_XCut:
+    case CK_Cut:
         edit_cut_to_X_buf_cmd (edit);
         break;
-    case CK_XPaste:
+    case CK_Paste:
         /* if non persistent selection and text selected */
         if (!option_persistent_selections)
         {
@@ -3977,69 +3970,69 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
             edit_insert_over (edit);
         edit_paste_from_X_buf_cmd (edit);
         break;
-    case CK_Selection_History:
+    case CK_History:
         edit_paste_from_history (edit);
         break;
 
-    case CK_Save_As:
+    case CK_SaveAs:
         edit_save_as_cmd (edit);
         break;
     case CK_Save:
         edit_save_confirm_cmd (edit);
         break;
-    case CK_Load:
+    case CK_EditFile:
         edit_load_cmd (edit, EDIT_FILE_COMMON);
         break;
-    case CK_Save_Block:
+    case CK_BlockSave:
         edit_save_block_cmd (edit);
         break;
-    case CK_Insert_File:
+    case CK_InsertFile:
         edit_insert_file_cmd (edit);
         break;
 
-    case CK_Load_Prev_File:
+    case CK_FilePrev:
         edit_load_back_cmd (edit);
         break;
-    case CK_Load_Next_File:
+    case CK_FileNext:
         edit_load_forward_cmd (edit);
         break;
 
-    case CK_Load_Syntax_File:
+    case CK_EditSyntaxFile:
         edit_load_cmd (edit, EDIT_FILE_SYNTAX);
         break;
-    case CK_Choose_Syntax:
+    case CK_SyntaxChoose:
         edit_syntax_dialog (edit);
         break;
 
-    case CK_Load_Menu_File:
+    case CK_EditUserMenu:
         edit_load_cmd (edit, EDIT_FILE_MENU);
         break;
 
-    case CK_Toggle_Syntax:
+    case CK_SyntaxOnOff:
         option_syntax_highlighting ^= 1;
         if (option_syntax_highlighting == 1)
             edit_load_syntax (edit, NULL, edit->syntax_type);
         edit->force |= REDRAW_PAGE;
         break;
 
-    case CK_Toggle_Tab_TWS:
+    case CK_ShowTabTws:
         enable_show_tabs_tws ^= 1;
         edit->force |= REDRAW_PAGE;
         break;
 
-    case CK_Find:
+    case CK_Search:
         edit_search_cmd (edit, FALSE);
         break;
-    case CK_Find_Again:
+    case CK_SearchContinue:
         edit_search_cmd (edit, TRUE);
         break;
     case CK_Replace:
         edit_replace_cmd (edit, 0);
         break;
-    case CK_Replace_Again:
+    case CK_ReplaceContinue:
         edit_replace_cmd (edit, 1);
         break;
-    case CK_Complete_Word:
+    case CK_Complete:
         /* if text marked shift block */
         if (edit->mark1 != edit->mark2 && !option_persistent_selections)
         {
@@ -4050,13 +4043,13 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
             edit_complete_word_cmd (edit);
         }
         break;
-    case CK_Find_Definition:
+    case CK_Find:
         edit_get_match_keyword_cmd (edit);
         break;
     case CK_Quit:
         dlg_stop (edit->widget.owner);
         break;
-    case CK_New:
+    case CK_EditNew:
         edit_new_cmd (edit);
         break;
     case CK_Help:
@@ -4065,7 +4058,7 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
     case CK_Refresh:
         edit_refresh_cmd (edit);
         break;
-    case CK_SaveSetupCmd:
+    case CK_SaveSetup:
         save_setup_cmd ();
         break;
     case CK_About:
@@ -4074,10 +4067,10 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
     case CK_LearnKeys:
         learn_keys ();
         break;
-    case CK_Edit_Options:
+    case CK_Options:
         edit_options_dialog (edit);
         break;
-    case CK_Edit_Save_Mode:
+    case CK_OptionsSaveMode:
         menu_save_mode_cmd ();
         break;
     case CK_Date:
@@ -4096,23 +4089,23 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
     case CK_Goto:
         edit_goto_cmd (edit);
         break;
-    case CK_Paragraph_Format:
+    case CK_ParagraphFormat:
         format_paragraph (edit, 1);
         edit->force |= REDRAW_PAGE;
         break;
-    case CK_Delete_Macro:
+    case CK_MacroDelete:
         edit_delete_macro_cmd (edit);
         break;
-    case CK_Match_Bracket:
+    case CK_MatchBracket:
         edit_goto_matching_bracket (edit);
         break;
-    case CK_User_Menu:
+    case CK_UserMenu:
         user_menu (edit, NULL, -1);
         break;
     case CK_Sort:
         edit_sort_cmd (edit);
         break;
-    case CK_ExtCmd:
+    case CK_ExternalCommand:
         edit_ext_cmd (edit);
         break;
     case CK_Mail:
@@ -4121,67 +4114,69 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
     case CK_Shell:
         view_other_cmd ();
         break;
+#ifdef HAVE_CHARSET
     case CK_SelectCodepage:
         edit_select_codepage_cmd (edit);
         break;
-    case CK_Insert_Literal:
+#endif
+    case CK_InsertLiteral:
         edit_insert_literal_cmd (edit);
         break;
-    case CK_Begin_End_Macro:
+    case CK_MacroStartStopRecord:
         edit_begin_end_macro_cmd (edit);
         break;
-    case CK_Begin_End_Repeat:
+    case CK_RepeatStartStopRecord:
         edit_begin_end_repeat_cmd (edit);
         break;
-    case CK_Ext_Mode:
+    case CK_ExtendedKeyMap:
         edit->extmod = 1;
         break;
     default:
         break;
     }
 
-    /* CK_Pipe_Block */
-    if ((command / CK_Pipe_Block (0)) == 1)
-        edit_block_process_cmd (edit, command - CK_Pipe_Block (0));
+    /* CK_PipeBlock */
+    if ((command / CK_PipeBlock (0)) == 1)
+        edit_block_process_cmd (edit, command - CK_PipeBlock (0));
 
     /* keys which must set the col position, and the search vars */
     switch (command)
     {
-    case CK_Find:
-    case CK_Find_Again:
+    case CK_Search:
+    case CK_SearchContinue:
     case CK_Replace:
-    case CK_Replace_Again:
-    case CK_Complete_Word:
+    case CK_ReplaceContinue:
+    case CK_Complete:
         edit->prev_col = edit_get_col (edit);
         break;
     case CK_Up:
-    case CK_Up_Highlight:
-    case CK_Up_Alt_Highlight:
+    case CK_MarkUp:
+    case CK_MarkColumnUp:
     case CK_Down:
-    case CK_Down_Highlight:
-    case CK_Down_Alt_Highlight:
-    case CK_Page_Up:
-    case CK_Page_Up_Highlight:
-    case CK_Page_Up_Alt_Highlight:
-    case CK_Page_Down:
-    case CK_Page_Down_Highlight:
-    case CK_Page_Down_Alt_Highlight:
-    case CK_Beginning_Of_Text:
-    case CK_Beginning_Of_Text_Highlight:
-    case CK_End_Of_Text:
-    case CK_End_Of_Text_Highlight:
-    case CK_Paragraph_Up:
-    case CK_Paragraph_Up_Highlight:
-    case CK_Paragraph_Up_Alt_Highlight:
-    case CK_Paragraph_Down:
-    case CK_Paragraph_Down_Highlight:
-    case CK_Paragraph_Down_Alt_Highlight:
-    case CK_Scroll_Up:
-    case CK_Scroll_Up_Highlight:
-    case CK_Scroll_Up_Alt_Highlight:
-    case CK_Scroll_Down:
-    case CK_Scroll_Down_Highlight:
-    case CK_Scroll_Down_Alt_Highlight:
+    case CK_MarkDown:
+    case CK_MarkColumnDown:
+    case CK_PageUp:
+    case CK_MarkPageUp:
+    case CK_MarkColumnPageUp:
+    case CK_PageDown:
+    case CK_MarkPageDown:
+    case CK_MarkColumnPageDown:
+    case CK_Top:
+    case CK_MarkToFileBegin:
+    case CK_Bottom:
+    case CK_MarkToFileEnd:
+    case CK_ParagraphUp:
+    case CK_MarkParagraphUp:
+    case CK_MarkColumnParagraphUp:
+    case CK_ParagraphDown:
+    case CK_MarkParagraphDown:
+    case CK_MarkColumnParagraphDown:
+    case CK_ScrollUp:
+    case CK_MarkScrollUp:
+    case CK_MarkColumnScrollUp:
+    case CK_ScrollDown:
+    case CK_MarkScrollDown:
+    case CK_MarkColumnScrollDown:
         edit->search_start = edit->curs1;
         edit->found_len = 0;
         break;
@@ -4198,10 +4193,10 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
         {
         case CK_BackSpace:
         case CK_Delete:
-        case CK_Delete_Word_Left:
-        case CK_Delete_Word_Right:
-        case CK_Delete_To_Line_End:
-        case CK_Delete_To_Line_Begin:
+        case CK_DeleteToWordBegin:
+        case CK_DeleteToWordEnd:
+        case CK_DeleteToHome:
+        case CK_DeleteToEnd:
             format_paragraph (edit, 0);
             edit->force |= REDRAW_PAGE;
         }