Merge

[micro.git] / internal / buffer / serialize.go

diff --git a/internal/buffer/serialize.go b/internal/buffer/serialize.go
index 16c4b6bfaabaca45de8e53d0987b9be66742efcf..e72311da8b6ae06fc1396b6a4fe843bd712f8706 100644 (file)
--- a/internal/buffer/serialize.go
+++ b/internal/buffer/serialize.go
@@ -5,12 +5,13 @@ import (
        "errors"
        "io"
        "os"
+       "path/filepath"
        "time"
 
        "golang.org/x/text/encoding"
 
-       "github.com/zyedidia/micro/internal/config"
-       "github.com/zyedidia/micro/internal/util"
+       "github.com/zyedidia/micro/v2/internal/config"
+       "github.com/zyedidia/micro/v2/internal/util"
 )
 
 // The SerializedBuffer holds the types that get serialized when a buffer is saved
@@ -30,7 +31,7 @@ func (b *Buffer) Serialize() error {
                return nil
        }
 
-       name := config.ConfigDir + "/buffers/" + util.EscapePath(b.AbsPath)
+       name := filepath.Join(config.ConfigDir, "buffers", util.EscapePath(b.AbsPath))
 
        return overwriteFile(name, encoding.Nop, func(file io.Writer) error {
                err := gob.NewEncoder(file).Encode(SerializedBuffer{
@@ -39,23 +40,24 @@ func (b *Buffer) Serialize() error {
                        b.ModTime,
                })
                return err
-       })
+       }, false)
 }
 
+// Unserialize loads the buffer info from config.ConfigDir/buffers
 func (b *Buffer) Unserialize() error {
        // If either savecursor or saveundo is turned on, we need to load the serialized information
        // from ~/.config/micro/buffers
        if b.Path == "" {
                return nil
        }
-       file, err := os.Open(config.ConfigDir + "/buffers/" + util.EscapePath(b.AbsPath))
-       defer file.Close()
+       file, err := os.Open(filepath.Join(config.ConfigDir, "buffers", util.EscapePath(b.AbsPath)))
        if err == nil {
+               defer file.Close()
                var buffer SerializedBuffer
                decoder := gob.NewDecoder(file)
                err = decoder.Decode(&buffer)
                if err != nil {
-                       return errors.New(err.Error() + "\nYou may want to remove the files in ~/.config/micro/buffers (these files store the information for the 'saveundo' and 'savecursor' options) if this problem persists.")
+                       return errors.New(err.Error() + "\nYou may want to remove the files in ~/.config/micro/buffers (these files\nstore the information for the 'saveundo' and 'savecursor' options) if\nthis problem persists.\nThis may be caused by upgrading to version 2.0, and removing the 'buffers'\ndirectory will reset the cursor and undo history and solve the problem.")
                }
                if b.Settings["savecursor"].(bool) {
                        b.StartCursor = buffer.Cursor