Merge branch '2177_change_cmddiff_shorcut'

* 2177_change_cmddiff_shorcut:
  Added default keybind for CK_DiffViewCmd command
  Ticket #2177: mcdiff shortcut
This commit is contained in:
Slava Zanko 2010-10-12 13:16:48 +03:00
commit 8f4ccc8286
3 changed files with 5 additions and 2 deletions

View File

@ -267,7 +267,7 @@ CmdCopyCurrentPathname = p
CmdCopyOtherPathname = ctrl-p
CmdCopyCurrentTagged = t
CmdCopyOtherTagged = ctrl-t
CmdDiffView = ctrl-y
CmdDiffView = ctrl-d
[panel]
PanelStartSearch = ctrl-s; alt-s

View File

@ -271,7 +271,7 @@ CmdCopyCurrentPathname = p
CmdCopyOtherPathname = ctrl-p
CmdCopyCurrentTagged = t
CmdCopyOtherTagged = ctrl-t
CmdDiffView = ctrl-y
CmdDiffView = ctrl-d
[panel]
PanelStartSearch = ctrl-s; alt-s

View File

@ -1056,6 +1056,9 @@ const global_keymap_t default_main_map[] = {
const global_keymap_t default_main_x_map[] = {
{ 'd', CK_CompareDirsCmd, "d" },
#ifdef USE_DIFF_VIEW
{ XCTRL ('d'), CK_DiffViewCmd, "C-d" },
#endif /* USE_DIFF_VIEW */
#ifdef ENABLE_VFS
{ 'a', CK_ReselectVfs, "a"},
#endif /* ENABLE_VFS */