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

Properly flush bufio writer

Browse Source
This commit is contained in:
Zachary Yedidia
2020-02-09 15:36:31 -05:00
parent e110e93e0f
commit 6f424f3213
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/buffer/buffer.go
View File

@@ -1,6 +1,7 @@
package buffer
import (
"bufio"
"bytes"
"crypto/md5"
"errors"
@@ -210,7 +211,7 @@ func NewBuffer(r io.Reader, size int64, path string, startcursor Loc, btype BufT
b.Settings["encoding"] = "utf-8"
}
reader := transform.NewReader(r, enc.NewDecoder())
reader := bufio.NewReader(transform.NewReader(r, enc.NewDecoder()))
found := false
if len(path) > 0 {
@@ -398,7 +399,7 @@ func (b *Buffer) ReOpen() error {
return err
}
reader := transform.NewReader(file, enc.NewDecoder())
reader := bufio.NewReader(transform.NewReader(file, enc.NewDecoder()))
data, err := ioutil.ReadAll(reader)
txt := string(data)

1
internal/buffer/save.go
View File

@@ -58,6 +58,7 @@ func overwriteFile(name string, enc encoding.Encoding, fn func(io.Writer) error,
w := bufio.NewWriter(transform.NewWriter(writeCloser, enc.NewEncoder()))
err = fn(w)
w.Flush()
if e := writeCloser.Close(); e != nil && err == nil {
err = e