Merge branch 'diff-gutter' of https://github.com/p-e-w/micro

internal/action/actions.go

@@ -1215,6 +1215,21 @@ func (h *BufPane) HalfPageDown() bool {
 	return true
 }
 
+// ToggleDiffGutter turns the diff gutter off and on
+func (h *BufPane) ToggleDiffGutter() bool {
+	if !h.Buf.Settings["diffgutter"].(bool) {
+		h.Buf.Settings["diffgutter"] = true
+		h.Buf.UpdateDiff(func(synchronous bool) {
+			screen.DrawChan <- true
+		})
+		InfoBar.Message("Enabled diff gutter")
+	} else {
+		h.Buf.Settings["diffgutter"] = false
+		InfoBar.Message("Disabled diff gutter")
+	}
+	return true
+}
+
 // ToggleRuler turns line numbers off and on
 func (h *BufPane) ToggleRuler() bool {
 	if !h.Buf.Settings["ruler"].(bool) {

internal/action/bufpane.go

@@ -573,6 +573,7 @@ var BufKeyActions = map[string]BufKeyAction{
 	"EndOfLine":              (*BufPane).EndOfLine,
 	"ToggleHelp":             (*BufPane).ToggleHelp,
 	"ToggleKeyMenu":          (*BufPane).ToggleKeyMenu,
+	"ToggleDiffGutter":       (*BufPane).ToggleDiffGutter,
 	"ToggleRuler":            (*BufPane).ToggleRuler,
 	"ClearStatus":            (*BufPane).ClearStatus,
 	"ShellMode":              (*BufPane).ShellMode,

internal/action/infopane.go

@@ -123,6 +123,7 @@ var InfoNones = []string{
 	"HalfPageDown",
 	"ToggleHelp",
 	"ToggleKeyMenu",
+	"ToggleDiffGutter",
 	"ToggleRuler",
 	"JumpLine",
 	"ClearStatus",