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

Merge

Browse Source
This commit is contained in:
Zachary Yedidia
2017-10-22 18:02:18 -04:00
parent b9e916999f afedad9977
commit 63fa8fec41
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/micro/messenger.go
View File

@@ -504,10 +504,14 @@ func (m *Messenger) LoadHistory() {
} }
} }
if decodedMap != nil {
m.history = decodedMap m.history = decodedMap
} else { } else {
m.history = make(map[string][]string) m.history = make(map[string][]string)
} }
} else {
m.history = make(map[string][]string)
}
} }
// SaveHistory saves the user's command history to configDir/buffers/history // SaveHistory saves the user's command history to configDir/buffers/history

2
cmd/micro/settings.go
View File

@@ -326,6 +326,7 @@ func SetOption(option, value string) error {
} }
} }
if len(tabs) != 0 {
if _, ok := CurView().Buf.Settings[option]; ok { if _, ok := CurView().Buf.Settings[option]; ok {
for _, tab := range tabs { for _, tab := range tabs {
for _, view := range tab.views { for _, view := range tab.views {
@@ -333,6 +334,7 @@ func SetOption(option, value string) error {
} }
} }
} }
}
return nil return nil
} }