github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-29 22:27:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Support filetype option as command line option

Browse Source
This commit is contained in:
Zachary Yedidia
2019-06-17 11:26:37 -04:00
parent 809b95d290
commit bf15f5c585
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/micro/micro.go
View File

@@ -52,8 +52,9 @@ func InitFlags() {
optionFlags = make(map[string]*string)
for k, v := range config.DefaultGlobalSettings() {
optionFlags[k] = flag.String(k, "", fmt.Sprintf("The %s option. Default value: '%v'", k, v))
optionFlags[k] = flag.String(k, "", fmt.Sprintf("The %s option. Default value: '%v'.", k, v))
}
optionFlags["filetype"] = flag.String("filetype", "", fmt.Sprintf("The filetype option. Autodetected by default."))
flag.Parse()
@@ -153,13 +154,15 @@ func main() {
// flag options
for k, v := range optionFlags {
if *v != "" {
if *v != "" && k != "filetype" {
nativeValue, err := config.GetNativeValue(k, config.GlobalSettings[k], *v)
if err != nil {
screen.TermMessage(err)
continue
}
config.GlobalSettings[k] = nativeValue
} else if k == "filetype" && *v != "" {
config.GlobalSettings[k] = *v
}
}
@@ -196,6 +199,10 @@ func main() {
action.InitTabs(b)
action.InitGlobals()
if _, ok := config.GlobalSettings["filetype"]; ok {
delete(config.GlobalSettings, "filetype")
}
// Here is the event loop which runs in a separate thread
go func() {
events = make(chan tcell.Event)