utilities/micro
utilities/micro
1
0
Fork 0
mirror of https://github.com/zyedidia/micro synced 2024-10-14 11:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvements

Browse source
This commit is contained in:
Zachary Yedidia 2020-02-09 00:40:50 -05:00
parent e84f85340b
commit 13e30a63eb
3 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/micro/clean.go
View file

@ -91,13 +91,13 @@ func CleanConfig() {
var buffer buffer.SerializedBuffer
for _, f := range files {
fname := filepath.Join(config.ConfigDir, "buffers", f.Name())
file, err := os.Open(fname)
file, e := os.Open(fname)
defer file.Close()
decoder := gob.NewDecoder(file)
err = decoder.Decode(&buffer)
if err != nil && f.Name() != "history" {
if e != nil && f.Name() != "history" {
badFiles = append(badFiles, fname)
}
}

2
internal/action/infopane.go
View file

@ -73,7 +73,7 @@ func (h *InfoPane) HandleEvent(event tcell.Event) {
}
}
// DoKeyEvent executes a key event for the command bar, doing any overriden actions
// DoKeyEvent executes a key event for the command bar, doing any overridden actions
func (h *InfoPane) DoKeyEvent(e KeyEvent) bool {
done := false
if action, ok := BufKeyBindings[e]; ok {

60
internal/buffer/save.go
View file

@ -28,41 +28,41 @@ const LargeFileThreshold = 50000
// the supplied function with the file as io.Writer object, also making sure the file is
// closed afterwards.
func overwriteFile(name string, enc encoding.Encoding, fn func(io.Writer) error, withSudo bool) (err error) {
var writeCloser io.WriteCloser
var writeCloser io.WriteCloser
if withSudo {
cmd := exec.Command(config.GlobalSettings["sucmd"].(string), "dd", "bs=4k", "of="+name)
if withSudo {
cmd := exec.Command(config.GlobalSettings["sucmd"].(string), "dd", "bs=4k", "of="+name)
if writeCloser, err = cmd.StdinPipe(); err != nil {
return
}
if writeCloser, err = cmd.StdinPipe(); err != nil {
return
}
c := make(chan os.Signal, 1)
signal.Notify(c, os.Interrupt)
go func() {
<-c
cmd.Process.Kill()
}()
c := make(chan os.Signal, 1)
signal.Notify(c, os.Interrupt)
go func() {
<-c
cmd.Process.Kill()
}()
defer func() {
screenb := screen.TempFini()
if e := cmd.Run(); e != nil && err == nil {
err = e
}
screen.TempStart(screenb)
}()
} else if writeCloser, err = os.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644); err != nil {
return
}
defer func() {
screenb := screen.TempFini()
if e := cmd.Run(); e != nil && err == nil {
err = e
}
screen.TempStart(screenb)
}()
} else if writeCloser, err = os.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644); err != nil {
return
}
w := transform.NewWriter(writeCloser, enc.NewEncoder())
err = fn(w)
w := transform.NewWriter(writeCloser, enc.NewEncoder())
err = fn(w)
if e := writeCloser.Close(); e != nil && err == nil {
err = e
}
if e := writeCloser.Close(); e != nil && err == nil {
err = e
}
return
return
}
// Save saves the buffer to its default path
@ -92,7 +92,7 @@ func (b *Buffer) saveToFile(filename string, withSudo bool) error {
return errors.New("Cannot save scratch buffer")
}
if withSudo && runtime.GOOS == "windows" {
return errors.New("Save with sudo not supported on Windows")
return errors.New("Save with sudo not supported on Windows")
}
b.UpdateRules()
@ -178,7 +178,7 @@ func (b *Buffer) saveToFile(filename string, withSudo bool) error {
}
if err = overwriteFile(absFilename, enc, fwriter, withSudo); err != nil {
return err
return err
}
if !b.Settings["fastdirty"].(bool) {