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

buffer: Store the encoding inside the buffer

Browse Source
This commit is contained in:
Jöran Karl
2025-02-06 19:54:47 +01:00
parent fe134b92d5
commit 8b21724c6e
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/buffer/save.go
View File

@@ -18,7 +18,6 @@ import (
"github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/v2/internal/util"
"golang.org/x/text/encoding/htmlindex"
"golang.org/x/text/transform"
)
@@ -118,12 +117,7 @@ func openFile(name string, withSudo bool) (wrappedFile, error) {
}
func (wf wrappedFile) Write(b *Buffer) (int, error) {
enc, err := htmlindex.Get(b.Settings["encoding"].(string))
if err != nil {
return 0, err
}
file := bufio.NewWriter(transform.NewWriter(wf.writeCloser, enc.NewEncoder()))
file := bufio.NewWriter(transform.NewWriter(wf.writeCloser, b.encoding.NewEncoder()))
b.Lock()
defer b.Unlock()
@@ -142,7 +136,7 @@ func (wf wrappedFile) Write(b *Buffer) (int, error) {
if !wf.withSudo {
f := wf.writeCloser.(*os.File)
err = f.Truncate(0)
err := f.Truncate(0)
if err != nil {
return 0, err
}