From 93c3a503ea86a0920fa6c43da01a8784cf2781e4 Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Sat, 23 Apr 2016 19:03:24 -0400 Subject: [PATCH] Use default binding for key if not specified --- cmd/micro/bindings.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/micro/bindings.go b/cmd/micro/bindings.go index ce335fa4..b3ae4a7c 100644 --- a/cmd/micro/bindings.go +++ b/cmd/micro/bindings.go @@ -176,6 +176,7 @@ func InitBindings() { } var parsed map[string]string + defaults := DefaultBindings() filename := configDir + "/bindings.json" if _, e := os.Stat(filename); e == nil { @@ -186,17 +187,11 @@ func InitBindings() { } json.Unmarshal(input, &parsed) - } else { - parsed = DefaultBindings() - if _, e := os.Stat(configDir); e == nil { - txt, _ := json.MarshalIndent(parsed, "", " ") - err := ioutil.WriteFile(filename, txt, 0644) - if err != nil { - TermMessage("Error writing bindings.json file: " + err.Error()) - } - } } + for k, v := range defaults { + bindings[keys[k]] = actions[v] + } for k, v := range parsed { bindings[keys[k]] = actions[v] } @@ -579,3 +574,8 @@ func ToggleRuler(v *View) bool { } return false } + +// None is no action +func None() bool { + return false +}