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

Fixed the issue #1049 - Endless prompt to reload changes

Browse Source
This commit is contained in:
Jawahar Suresh Babu
2019-02-12 07:20:07 +05:30
parent 2c219ba647
commit c46695bb57
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/micro/buffer.go
View File

@@ -28,6 +28,9 @@ var (
// 1 - lf detected // 1 - lf detected
// 2 - crlf detected // 2 - crlf detected
fileformat = 0 fileformat = 0
// If true, do not prompt to reload buffer
disableReload = false
) )
// Buffer stores the text for files that are loaded into the text editor // Buffer stores the text for files that are loaded into the text editor
@@ -347,12 +350,19 @@ func (b *Buffer) IndentString() string {
// by an external program since it was last read // by an external program since it was last read
// If it has, we ask the user if they would like to reload the file // If it has, we ask the user if they would like to reload the file
func (b *Buffer) CheckModTime() { func (b *Buffer) CheckModTime() {
if disableReload {
// User chose not to promt again
return
}
modTime, ok := GetModTime(b.Path) modTime, ok := GetModTime(b.Path)
if ok { if ok {
if modTime != b.ModTime { if modTime != b.ModTime {
choice, canceled := messenger.YesNoPrompt("The file has changed since it was last read. Reload file? (y,n)") choice, canceled := messenger.YesNoPrompt("The file has changed since it was last read. Reload file? (y,n,esc)")
messenger.Reset() messenger.Reset()
messenger.Clear() messenger.Clear()
disableReload = canceled
if !choice || canceled { if !choice || canceled {
// Don't load new changes -- do nothing // Don't load new changes -- do nothing
b.ModTime, _ = GetModTime(b.Path) b.ModTime, _ = GetModTime(b.Path)