github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-24 01:37:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

Allow aborting while opening a file with backup

Browse Source 
Also fixes an issue where the abort prompt consumes interrupt signals.

Fixes #2151
This commit is contained in:
Zachary Yedidia
2021-08-02 21:05:22 -04:00
parent 33e064b3b9
commit c315a91fc6
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/buffer/buffer.go
View File

@@ -250,6 +250,9 @@ func NewBufferFromFileAtLoc(path string, btype BufType, cursorLoc Loc) (*Buffer,
return nil, err
} else {
buf = NewBuffer(file, util.FSize(file), filename, cursorLoc, btype)
if buf == nil {
return nil, errors.New("could not open file")
}
}
if readonly && prompt != nil {
@@ -333,8 +336,12 @@ func NewBuffer(r io.Reader, size int64, path string, startcursor Loc, btype BufT
b.Settings["encoding"] = "utf-8"
}
hasBackup = b.ApplyBackup(size)
var ok bool
hasBackup, ok = b.ApplyBackup(size)
if !ok {
return NewBufferFromString("", "", btype)
}
if !hasBackup {
reader := bufio.NewReader(transform.NewReader(r, enc.NewDecoder()))