From 453e96358a610435e1e80ca075556532c71d99c0 Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Thu, 24 Jan 2019 22:46:07 -0500 Subject: [PATCH] Fix option flags --- cmd/micro/micro.go | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go index a0c1d860..4032178f 100644 --- a/cmd/micro/micro.go +++ b/cmd/micro/micro.go @@ -84,6 +84,16 @@ func InitFlags() { } os.Exit(0) } + for k, v := range optionFlags { + if *v != "" { + nativeValue, err := config.GetNativeValue(k, config.GlobalSettings[k], *v) + if err != nil { + screen.TermMessage(err) + continue + } + config.GlobalSettings[k] = nativeValue + } + } } // LoadInput determines which files should be loaded into buffers @@ -150,17 +160,21 @@ func main() { var err error InitLog() - InitFlags() - err = config.InitConfigDir(*flagConfigDir) - if err != nil { - screen.TermMessage(err) - } + config.InitRuntimeFiles() err = config.ReadSettings() if err != nil { screen.TermMessage(err) } config.InitGlobalSettings() + + InitFlags() + + err = config.InitConfigDir(*flagConfigDir) + if err != nil { + screen.TermMessage(err) + } + action.InitBindings() action.InitCommands()