From b07e0ea0328340440a48f9bf696a439c89b9ec7b Mon Sep 17 00:00:00 2001 From: Ryooooooga Date: Fri, 6 May 2022 21:57:09 +0900 Subject: [PATCH] fix: fix context of edit hunk --- docs/keybindings/Keybindings_en.md | 1 - docs/keybindings/Keybindings_ja.md | 2 ++ docs/keybindings/Keybindings_nl.md | 1 - docs/keybindings/Keybindings_pl.md | 1 - docs/keybindings/Keybindings_zh.md | 1 - pkg/gui/keybindings.go | 2 +- 6 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index c20dc54bc..cae727676 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -173,7 +173,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct v: toggle drag select V: toggle drag select a: toggle select hunk - E: edit hunk ## Main Panel (Staging) diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md index 86ca52b1b..a07f7bb33 100644 --- a/docs/keybindings/Keybindings_ja.md +++ b/docs/keybindings/Keybindings_ja.md @@ -191,6 +191,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct f: fast-forward this branch from its upstream g: view reset options R: ブランチ名を変更 + u: set/unset upstream enter: コミットを閲覧 f: リモートをfetch n: リモートを新規追加 @@ -254,6 +255,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct v: 範囲選択を切り替え V: 範囲選択を切り替え a: hunk選択を切り替え + E: edit hunk ## リモートブランチ diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index 17b001908..e9a007051 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -173,7 +173,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct v: toggle drag selecteer V: toggle drag selecteer a: toggle selecteer hunk - E: edit hunk ## Reflog diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index 12e4f536e..c28037880 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -109,7 +109,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct v: toggle drag select V: toggle drag select a: toggle select hunk - E: edit hunk ## Pliki diff --git a/docs/keybindings/Keybindings_zh.md b/docs/keybindings/Keybindings_zh.md index 95ea852b4..9c534fc3e 100644 --- a/docs/keybindings/Keybindings_zh.md +++ b/docs/keybindings/Keybindings_zh.md @@ -193,7 +193,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct v: 切换拖动选择 V: 切换拖动选择 a: 切换选择区块 - E: edit hunk ## 标签页面 diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index a334d7f7a..20d2c37f2 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -545,7 +545,7 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi }, { ViewName: "main", - Contexts: []string{string(context.MAIN_PATCH_BUILDING_CONTEXT_KEY), string(context.MAIN_STAGING_CONTEXT_KEY)}, + Contexts: []string{string(context.MAIN_STAGING_CONTEXT_KEY)}, Key: opts.GetKey(opts.Config.Main.EditSelectHunk), Handler: self.handleEditHunk, Description: self.c.Tr.EditHunk,