No backups for no name files

This commit is contained in:
Zachary Yedidia
2019-12-22 13:43:29 -05:00
parent c4d5d7c195
commit fc706bc404
7 changed files with 18 additions and 11 deletions

View File

@@ -70,7 +70,7 @@ func InitFlags() {
// If -options was passed // If -options was passed
var keys []string var keys []string
m := config.DefaultAllSettings() m := config.DefaultAllSettings()
for k, _ := range m { for k := range m {
keys = append(keys, k) keys = append(keys, k)
} }
sort.Strings(keys) sort.Strings(keys)
@@ -134,6 +134,13 @@ func LoadInput() []*buffer.Buffer {
} }
func main() { func main() {
defer os.Exit(0)
// runtime.SetCPUProfileRate(400)
// f, _ := os.Create("micro.prof")
// pprof.StartCPUProfile(f)
// defer pprof.StopCPUProfile()
var err error var err error
InitLog() InitLog()

View File

@@ -1,8 +1,8 @@
package action package action
import ( import (
"os"
"regexp" "regexp"
"runtime"
"strings" "strings"
"time" "time"
"unicode/utf8" "unicode/utf8"
@@ -1167,7 +1167,7 @@ func (h *BufPane) Quit() bool {
} else { } else {
screen.Screen.Fini() screen.Screen.Fini()
InfoBar.Close() InfoBar.Close()
os.Exit(0) runtime.Goexit()
} }
} }
if h.Buf.Modified() { if h.Buf.Modified() {
@@ -1207,7 +1207,7 @@ func (h *BufPane) QuitAll() bool {
} }
screen.Screen.Fini() screen.Screen.Fini()
InfoBar.Close() InfoBar.Close()
os.Exit(0) runtime.Goexit()
} }
if anyModified { if anyModified {

View File

@@ -1,7 +1,7 @@
package action package action
import ( import (
"os" "runtime"
"github.com/zyedidia/clipboard" "github.com/zyedidia/clipboard"
"github.com/zyedidia/micro/internal/display" "github.com/zyedidia/micro/internal/display"
@@ -47,7 +47,7 @@ func (t *TermPane) Quit() {
} else { } else {
screen.Screen.Fini() screen.Screen.Fini()
InfoBar.Close() InfoBar.Close()
os.Exit(0) runtime.Goexit()
} }
} }

View File

@@ -26,7 +26,7 @@ Options: [r]ecover, [i]gnore: `
// Backup saves the current buffer to ConfigDir/backups // Backup saves the current buffer to ConfigDir/backups
func (b *Buffer) Backup(checkTime bool) error { func (b *Buffer) Backup(checkTime bool) error {
if !b.Settings["backup"].(bool) { if !b.Settings["backup"].(bool) || b.Path == "" {
return nil return nil
} }
@@ -79,7 +79,7 @@ func (b *Buffer) Backup(checkTime bool) error {
// RemoveBackup removes any backup file associated with this buffer // RemoveBackup removes any backup file associated with this buffer
func (b *Buffer) RemoveBackup() { func (b *Buffer) RemoveBackup() {
if !b.Settings["backup"].(bool) { if !b.Settings["backup"].(bool) || b.Path == "" {
return return
} }
f := config.ConfigDir + "/backups/" + util.EscapePath(b.AbsPath) f := config.ConfigDir + "/backups/" + util.EscapePath(b.AbsPath)

View File

@@ -204,7 +204,7 @@ func NewBuffer(r io.Reader, size int64, path string, startcursor Loc, btype BufT
b.SharedBuffer = new(SharedBuffer) b.SharedBuffer = new(SharedBuffer)
b.Type = btype b.Type = btype
if b.Settings["backup"].(bool) { if b.Settings["backup"].(bool) && len(path) > 0 {
backupfile := config.ConfigDir + "/backups/" + EscapePath(absPath) backupfile := config.ConfigDir + "/backups/" + EscapePath(absPath)
if info, err := os.Stat(backupfile); err == nil { if info, err := os.Stat(backupfile); err == nil {
backup, err := os.Open(backupfile) backup, err := os.Open(backupfile)

File diff suppressed because one or more lines are too long

View File

@@ -58,7 +58,7 @@ func (i *InfoBuf) Message(msg ...interface{}) {
displayMessage := fmt.Sprint(msg...) displayMessage := fmt.Sprint(msg...)
// if there is no active prompt then style and display the message as normal // if there is no active prompt then style and display the message as normal
i.Msg = displayMessage i.Msg = displayMessage
i.HasMessage = true i.HasMessage, i.HasError = true, false
} }
} }