diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-06 18:50:52 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-07 11:16:03 +1000 |
| commit | 7410acd1aaa97f678295a328264360802346b33a (patch) | |
| tree | 51dc6b5dfc8c0b67711ff644a6bc32480e6eaea8 /pkg/gui/editors.go | |
| parent | 445a625b56a79be6cee7ec1ee35fe9f4fcc2daad (diff) | |
move merge conflicts code into controller
Diffstat (limited to 'pkg/gui/editors.go')
| -rw-r--r-- | pkg/gui/editors.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/gui/editors.go b/pkg/gui/editors.go index 145a6a62b..6f40c6d58 100644 --- a/pkg/gui/editors.go +++ b/pkg/gui/editors.go @@ -4,10 +4,11 @@ import ( "unicode" "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gui/keybindings" ) func (gui *Gui) handleEditorKeypress(textArea *gocui.TextArea, key gocui.Key, ch rune, mod gocui.Modifier, allowMultiline bool) bool { - newlineKey, ok := gui.getKey(gui.c.UserConfig.Keybinding.Universal.AppendNewline).(gocui.Key) + newlineKey, ok := keybindings.GetKey(gui.c.UserConfig.Keybinding.Universal.AppendNewline).(gocui.Key) if !ok { newlineKey = gocui.KeyAltEnter } |