Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cmd/micro/micro.go
Original file line number Diff line number Diff line change
Expand Up @@ -374,11 +374,6 @@ func main() {
action.InitBindings()
action.InitCommands()

err = config.InitColorscheme()
if err != nil {
screen.TermMessage(err)
}

err = config.RunPluginFn("preinit")
if err != nil {
screen.TermMessage(err)
Expand Down Expand Up @@ -407,6 +402,11 @@ func main() {
screen.TermMessage(err)
}

err = config.InitColorscheme()
if err != nil {
screen.TermMessage(err)
}

if clipErr != nil {
log.Println(clipErr, " or change 'clipboard' option")
}
Expand Down
8 changes: 8 additions & 0 deletions internal/config/colorscheme.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ func InitColorscheme() error {
c, err := LoadDefaultColorscheme()
if err == nil {
Colorscheme = c
} else {
// The colorscheme setting seems broken (maybe because we have not validated
// it earlier, see comment in verifySetting()). So reset it to the default
// colorscheme and try again.
GlobalSettings["colorscheme"] = DefaultGlobalOnlySettings["colorscheme"]
if c, err2 := LoadDefaultColorscheme(); err2 == nil {
Colorscheme = c
}
}

return err
Expand Down
6 changes: 6 additions & 0 deletions internal/config/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,12 @@ func verifySetting(option string, value interface{}, def interface{}) error {
return fmt.Errorf("Error: setting '%s' has incorrect type (%s), using default value: %v (%s)", option, valType, def, defType)
}

if option == "colorscheme" {
// Plugins are not initialized yet, so do not verify if the colorscheme
// exists yet, since the colorscheme may be added by a plugin later.
return nil
}

if err := OptionIsValid(option, value); err != nil {
return err
}
Expand Down