From 27190ca40d009a1aca47e4760074aa47a9e1191f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Mon, 29 Apr 2024 21:11:16 +0200
Subject: [PATCH 01/22] actions: SaveAs: Print the error of `os.Stat()` to the
 `InfoBar`

---
 internal/action/actions.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/internal/action/actions.go b/internal/action/actions.go
index cf6d954f0..9d95e021e 100644
--- a/internal/action/actions.go
+++ b/internal/action/actions.go
@@ -946,6 +946,9 @@ func (h *BufPane) SaveAsCB(action string, callback func()) bool {
 						h.completeAction(action)
 						return
 					}
+				} else {
+					InfoBar.Error(err)
+					return
 				}
 			} else {
 				InfoBar.YNPrompt(

From 9b4f4eecfa45afc9a01d697f837d4e2b060c91f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Wed, 1 May 2024 17:56:22 +0200
Subject: [PATCH 02/22] save: Convert `os.IsNotExist()` into `errors.Is()`

---
 internal/buffer/save.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal/buffer/save.go b/internal/buffer/save.go
index efbf04f4c..1d13e0f22 100644
--- a/internal/buffer/save.go
+++ b/internal/buffer/save.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"errors"
 	"io"
+	"io/fs"
 	"os"
 	"os/exec"
 	"os/signal"
@@ -158,7 +159,7 @@ func (b *Buffer) saveToFile(filename string, withSudo bool, autoSave bool) error
 	// Get the leading path to the file | "." is returned if there's no leading path provided
 	if dirname := filepath.Dir(absFilename); dirname != "." {
 		// Check if the parent dirs don't exist
-		if _, statErr := os.Stat(dirname); os.IsNotExist(statErr) {
+		if _, statErr := os.Stat(dirname); errors.Is(statErr, fs.ErrNotExist) {
 			// Prompt to make sure they want to create the dirs that are missing
 			if b.Settings["mkparents"].(bool) {
 				// Create all leading dir(s) since they don't exist

From 870f2fb835ed2938840c3c4ef89b2535518437db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Sun, 12 May 2024 20:54:38 +0200
Subject: [PATCH 03/22] open & write: Process regular files only

---
 internal/buffer/buffer.go | 11 +++++++----
 internal/buffer/save.go   | 11 +++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go
index c623fd586..9d303f9c9 100644
--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
@@ -232,10 +232,6 @@ func NewBufferFromFileAtLoc(path string, btype BufType, cursorLoc Loc) (*Buffer,
 		return nil, err
 	}
 
-	f, err := os.OpenFile(filename, os.O_WRONLY, 0)
-	readonly := os.IsPermission(err)
-	f.Close()
-
 	fileInfo, serr := os.Stat(filename)
 	if serr != nil && !os.IsNotExist(serr) {
 		return nil, serr
@@ -243,6 +239,13 @@ func NewBufferFromFileAtLoc(path string, btype BufType, cursorLoc Loc) (*Buffer,
 	if serr == nil && fileInfo.IsDir() {
 		return nil, errors.New("Error: " + filename + " is a directory and cannot be opened")
 	}
+	if serr == nil && !fileInfo.Mode().IsRegular() {
+		return nil, errors.New("Error: " + filename + " is not a regular file and cannot be opened")
+	}
+
+	f, err := os.OpenFile(filename, os.O_WRONLY, 0)
+	readonly := os.IsPermission(err)
+	f.Close()
 
 	file, err := os.Open(filename)
 	if err == nil {
diff --git a/internal/buffer/save.go b/internal/buffer/save.go
index 1d13e0f22..169f57628 100644
--- a/internal/buffer/save.go
+++ b/internal/buffer/save.go
@@ -156,6 +156,17 @@ func (b *Buffer) saveToFile(filename string, withSudo bool, autoSave bool) error
 	// Removes any tilde and replaces with the absolute path to home
 	absFilename, _ := util.ReplaceHome(filename)
 
+	fileInfo, err := os.Stat(absFilename)
+	if err != nil && !errors.Is(err, fs.ErrNotExist) {
+		return err
+	}
+	if err == nil && fileInfo.IsDir() {
+		return errors.New("Error: " + absFilename + " is a directory and cannot be saved")
+	}
+	if err == nil && !fileInfo.Mode().IsRegular() {
+		return errors.New("Error: " + absFilename + " is not a regular file and cannot be saved")
+	}
+
 	// Get the leading path to the file | "." is returned if there's no leading path provided
 	if dirname := filepath.Dir(absFilename); dirname != "." {
 		// Check if the parent dirs don't exist

From 3edf31dfadb2e9f1d3ab253764b8fe7704f7c27d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Wed, 29 May 2024 20:33:46 +0200
Subject: [PATCH 04/22] buffer: Convert `os.Is()` into `errors.Is()`

---
 internal/buffer/buffer.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go
index 9d303f9c9..34b79009b 100644
--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"io/ioutil"
 	"os"
 	"path"
@@ -233,7 +234,7 @@ func NewBufferFromFileAtLoc(path string, btype BufType, cursorLoc Loc) (*Buffer,
 	}
 
 	fileInfo, serr := os.Stat(filename)
-	if serr != nil && !os.IsNotExist(serr) {
+	if serr != nil && !errors.Is(serr, fs.ErrNotExist) {
 		return nil, serr
 	}
 	if serr == nil && fileInfo.IsDir() {
@@ -244,7 +245,7 @@ func NewBufferFromFileAtLoc(path string, btype BufType, cursorLoc Loc) (*Buffer,
 	}
 
 	f, err := os.OpenFile(filename, os.O_WRONLY, 0)
-	readonly := os.IsPermission(err)
+	readonly := errors.Is(err, fs.ErrPermission)
 	f.Close()
 
 	file, err := os.Open(filename)
@@ -253,7 +254,7 @@ func NewBufferFromFileAtLoc(path string, btype BufType, cursorLoc Loc) (*Buffer,
 	}
 
 	var buf *Buffer
-	if os.IsNotExist(err) {
+	if errors.Is(err, fs.ErrNotExist) {
 		// File does not exist -- create an empty buffer with that name
 		buf = NewBufferFromString("", filename, btype)
 	} else if err != nil {
@@ -398,7 +399,7 @@ func NewBuffer(r io.Reader, size int64, path string, startcursor Loc, btype BufT
 	// init local settings again now that we know the filetype
 	config.InitLocalSettings(b.Settings, b.Path)
 
-	if _, err := os.Stat(filepath.Join(config.ConfigDir, "buffers")); os.IsNotExist(err) {
+	if _, err := os.Stat(filepath.Join(config.ConfigDir, "buffers")); errors.Is(err, fs.ErrNotExist) {
 		os.Mkdir(filepath.Join(config.ConfigDir, "buffers"), os.ModePerm)
 	}
 

From 9595862c74832543b5406bc646ec6f6be049e389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Sun, 12 May 2024 13:02:09 +0200
Subject: [PATCH 05/22] backup: Convert `os.IsNotExist()` into `errors.Is()`

---
 internal/buffer/backup.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/internal/buffer/backup.go b/internal/buffer/backup.go
index a043651eb..0e254053f 100644
--- a/internal/buffer/backup.go
+++ b/internal/buffer/backup.go
@@ -1,8 +1,10 @@
 package buffer
 
 import (
+	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"sync/atomic"
@@ -73,7 +75,7 @@ func (b *Buffer) Backup() error {
 	if backupdir == "" || err != nil {
 		backupdir = filepath.Join(config.ConfigDir, "backups")
 	}
-	if _, err := os.Stat(backupdir); os.IsNotExist(err) {
+	if _, err := os.Stat(backupdir); errors.Is(err, fs.ErrNotExist) {
 		os.Mkdir(backupdir, os.ModePerm)
 	}
 

From 322ee18f6e7da864e0a7032a8da1aceb7e8f988f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Thu, 23 May 2024 23:18:56 +0200
Subject: [PATCH 06/22] backup: Store the file with the endings of the buffer

---
 internal/buffer/backup.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/internal/buffer/backup.go b/internal/buffer/backup.go
index 0e254053f..62e692dbe 100644
--- a/internal/buffer/backup.go
+++ b/internal/buffer/backup.go
@@ -87,7 +87,12 @@ func (b *Buffer) Backup() error {
 		}
 
 		// end of line
-		eol := []byte{'\n'}
+		var eol []byte
+		if b.Endings == FFDos {
+			eol = []byte{'\r', '\n'}
+		} else {
+			eol = []byte{'\n'}
+		}
 
 		// write lines
 		if _, e = file.Write(b.lines[0].data); e != nil {

From e9027da3ed8e75184be50f38e7d4babbdc5f44c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Fri, 24 May 2024 20:19:55 +0200
Subject: [PATCH 07/22] backup: Lock the buffer lines in `Backup()`

---
 internal/buffer/backup.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/internal/buffer/backup.go b/internal/buffer/backup.go
index 62e692dbe..8d6997f01 100644
--- a/internal/buffer/backup.go
+++ b/internal/buffer/backup.go
@@ -82,6 +82,9 @@ func (b *Buffer) Backup() error {
 	name := filepath.Join(backupdir, util.EscapePath(b.AbsPath))
 
 	err = overwriteFile(name, encoding.Nop, func(file io.Writer) (e error) {
+		b.Lock()
+		defer b.Unlock()
+
 		if len(b.lines) == 0 {
 			return
 		}

From 30a7c62730d09f3d1ee5be55a4624751f29bb716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Sun, 12 May 2024 11:49:49 +0200
Subject: [PATCH 08/22] bindings: Convert `os.IsNotExist()` into `errors.Is()`

---
 internal/action/bindings.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal/action/bindings.go b/internal/action/bindings.go
index 2462d7300..922e56aaa 100644
--- a/internal/action/bindings.go
+++ b/internal/action/bindings.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/fs"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -24,7 +25,7 @@ var Binder = map[string]func(e Event, action string){
 }
 
 func createBindingsIfNotExist(fname string) {
-	if _, e := os.Stat(fname); os.IsNotExist(e) {
+	if _, e := os.Stat(fname); errors.Is(e, fs.ErrNotExist) {
 		ioutil.WriteFile(fname, []byte("{}"), 0644)
 	}
 }

From 84b9c79e5cef71226619cf05bcbe27b5fb6c0b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Sun, 12 May 2024 21:45:01 +0200
Subject: [PATCH 09/22] clean: Inform about all failed write steps

---
 cmd/micro/clean.go | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/cmd/micro/clean.go b/cmd/micro/clean.go
index e4aa72402..29e8174ab 100644
--- a/cmd/micro/clean.go
+++ b/cmd/micro/clean.go
@@ -39,7 +39,12 @@ func CleanConfig() {
 	}
 
 	fmt.Println("Cleaning default settings")
-	config.WriteSettings(filepath.Join(config.ConfigDir, "settings.json"))
+
+	settingsFile := filepath.Join(config.ConfigDir, "settings.json")
+	err := config.WriteSettings(settingsFile)
+	if err != nil {
+		fmt.Println("Error writing settings.json file: " + err.Error())
+	}
 
 	// detect unused options
 	var unusedOptions []string
@@ -74,9 +79,9 @@ func CleanConfig() {
 				delete(config.GlobalSettings, s)
 			}
 
-			err := config.OverwriteSettings(filepath.Join(config.ConfigDir, "settings.json"))
+			err := config.OverwriteSettings(settingsFile)
 			if err != nil {
-				fmt.Println("Error writing settings.json file: " + err.Error())
+				fmt.Println("Error overwriting settings.json file: " + err.Error())
 			}
 
 			fmt.Println("Removed unused options")

From 9c21055e5fa4a527f1aadc35a901e41edb3bb953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Sun, 12 May 2024 14:57:16 +0200
Subject: [PATCH 10/22] clean: Remove some unneeded `filepath.Join()` calls

---
 cmd/micro/clean.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/cmd/micro/clean.go b/cmd/micro/clean.go
index 29e8174ab..9cf9653e2 100644
--- a/cmd/micro/clean.go
+++ b/cmd/micro/clean.go
@@ -72,7 +72,7 @@ func CleanConfig() {
 			fmt.Printf("%s (value: %v)\n", s, config.GlobalSettings[s])
 		}
 
-		fmt.Printf("These options will be removed from %s\n", filepath.Join(config.ConfigDir, "settings.json"))
+		fmt.Printf("These options will be removed from %s\n", settingsFile)
 
 		if shouldContinue() {
 			for _, s := range unusedOptions {
@@ -90,12 +90,13 @@ func CleanConfig() {
 	}
 
 	// detect incorrectly formatted buffer/ files
-	files, err := ioutil.ReadDir(filepath.Join(config.ConfigDir, "buffers"))
+	buffersPath := filepath.Join(config.ConfigDir, "buffers")
+	files, err := ioutil.ReadDir(buffersPath)
 	if err == nil {
 		var badFiles []string
 		var buffer buffer.SerializedBuffer
 		for _, f := range files {
-			fname := filepath.Join(config.ConfigDir, "buffers", f.Name())
+			fname := filepath.Join(buffersPath, f.Name())
 			file, e := os.Open(fname)
 
 			if e == nil {
@@ -110,9 +111,9 @@ func CleanConfig() {
 		}
 
 		if len(badFiles) > 0 {
-			fmt.Printf("Detected %d files with an invalid format in %s\n", len(badFiles), filepath.Join(config.ConfigDir, "buffers"))
+			fmt.Printf("Detected %d files with an invalid format in %s\n", len(badFiles), buffersPath)
 			fmt.Println("These files store cursor and undo history.")
-			fmt.Printf("Removing badly formatted files in %s\n", filepath.Join(config.ConfigDir, "buffers"))
+			fmt.Printf("Removing badly formatted files in %s\n", buffersPath)
 
 			if shouldContinue() {
 				removed := 0

From 0e56940d322e38c5fd9f60ba944cc9247dd89123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Fri, 24 May 2024 20:41:58 +0200
Subject: [PATCH 11/22] util: Improve and rename `EscapePath()` to
 `DetermineEscapePath()`

If the new URL encoded path is found then it has precedence over the legacy
path. In case none of both is found the new URL approach is used.
---
 internal/buffer/backup.go    |  8 ++++----
 internal/buffer/serialize.go |  4 ++--
 internal/util/util.go        | 25 +++++++++++++++++++++++--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/internal/buffer/backup.go b/internal/buffer/backup.go
index 8d6997f01..dfbc698ca 100644
--- a/internal/buffer/backup.go
+++ b/internal/buffer/backup.go
@@ -79,7 +79,7 @@ func (b *Buffer) Backup() error {
 		os.Mkdir(backupdir, os.ModePerm)
 	}
 
-	name := filepath.Join(backupdir, util.EscapePath(b.AbsPath))
+	name := util.DetermineEscapePath(backupdir, b.AbsPath)
 
 	err = overwriteFile(name, encoding.Nop, func(file io.Writer) (e error) {
 		b.Lock()
@@ -123,7 +123,7 @@ func (b *Buffer) RemoveBackup() {
 	if !b.Settings["backup"].(bool) || b.Settings["permbackup"].(bool) || b.Path == "" || b.Type != BTDefault {
 		return
 	}
-	f := filepath.Join(config.ConfigDir, "backups", util.EscapePath(b.AbsPath))
+	f := util.DetermineEscapePath(filepath.Join(config.ConfigDir, "backups"), b.AbsPath)
 	os.Remove(f)
 }
 
@@ -131,13 +131,13 @@ func (b *Buffer) RemoveBackup() {
 // Returns true if a backup was applied
 func (b *Buffer) ApplyBackup(fsize int64) (bool, bool) {
 	if b.Settings["backup"].(bool) && !b.Settings["permbackup"].(bool) && len(b.Path) > 0 && b.Type == BTDefault {
-		backupfile := filepath.Join(config.ConfigDir, "backups", util.EscapePath(b.AbsPath))
+		backupfile := util.DetermineEscapePath(filepath.Join(config.ConfigDir, "backups"), b.AbsPath)
 		if info, err := os.Stat(backupfile); err == nil {
 			backup, err := os.Open(backupfile)
 			if err == nil {
 				defer backup.Close()
 				t := info.ModTime()
-				msg := fmt.Sprintf(backupMsg, t.Format("Mon Jan _2 at 15:04, 2006"), util.EscapePath(b.AbsPath))
+				msg := fmt.Sprintf(backupMsg, t.Format("Mon Jan _2 at 15:04, 2006"), backupfile)
 				choice := screen.TermPrompt(msg, []string{"r", "i", "a", "recover", "ignore", "abort"}, true)
 
 				if choice%3 == 0 {
diff --git a/internal/buffer/serialize.go b/internal/buffer/serialize.go
index e72311da8..06906f763 100644
--- a/internal/buffer/serialize.go
+++ b/internal/buffer/serialize.go
@@ -31,7 +31,7 @@ func (b *Buffer) Serialize() error {
 		return nil
 	}
 
-	name := filepath.Join(config.ConfigDir, "buffers", util.EscapePath(b.AbsPath))
+	name := util.DetermineEscapePath(filepath.Join(config.ConfigDir, "buffers"), b.AbsPath)
 
 	return overwriteFile(name, encoding.Nop, func(file io.Writer) error {
 		err := gob.NewEncoder(file).Encode(SerializedBuffer{
@@ -50,7 +50,7 @@ func (b *Buffer) Unserialize() error {
 	if b.Path == "" {
 		return nil
 	}
-	file, err := os.Open(filepath.Join(config.ConfigDir, "buffers", util.EscapePath(b.AbsPath)))
+	file, err := os.Open(util.DetermineEscapePath(filepath.Join(config.ConfigDir, "buffers"), b.AbsPath))
 	if err == nil {
 		defer file.Close()
 		var buffer SerializedBuffer
diff --git a/internal/util/util.go b/internal/util/util.go
index 83dc4458a..083c33f6b 100644
--- a/internal/util/util.go
+++ b/internal/util/util.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"net/url"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -398,8 +399,13 @@ func GetModTime(path string) (time.Time, error) {
 	return info.ModTime(), nil
 }
 
-// EscapePath replaces every path separator in a given path with a %
-func EscapePath(path string) string {
+// EscapePathUrl encodes the path in URL query form
+func EscapePathUrl(path string) string {
+	return url.QueryEscape(filepath.ToSlash(path))
+}
+
+// EscapePathLegacy replaces every path separator in a given path with a %
+func EscapePathLegacy(path string) string {
 	path = filepath.ToSlash(path)
 	if runtime.GOOS == "windows" {
 		// ':' is not valid in a path name on Windows but is ok on Unix
@@ -408,6 +414,21 @@ func EscapePath(path string) string {
 	return strings.ReplaceAll(path, "/", "%")
 }
 
+// DetermineEscapePath is a helper to apply the URL or legacy approach
+func DetermineEscapePath(dir string, path string) string {
+	url := filepath.Join(dir, EscapePathUrl(path))
+	if _, err := os.Stat(url); err == nil {
+		return url
+	}
+
+	legacy := filepath.Join(dir, EscapePathLegacy(path))
+	if _, err := os.Stat(legacy); err == nil {
+		return legacy
+	}
+
+	return url
+}
+
 // GetLeadingWhitespace returns the leading whitespace of the given byte array
 func GetLeadingWhitespace(b []byte) []byte {
 	ws := []byte{}

From d79b66560682dfe0d263f9ee413b7e985277a969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Thu, 30 May 2024 21:14:04 +0200
Subject: [PATCH 12/22] util: Generalize the file mode of 0666 with
 `util.FileMode`

---
 cmd/micro/debug.go          | 2 +-
 internal/action/bindings.go | 7 ++++---
 internal/buffer/save.go     | 2 +-
 internal/config/settings.go | 4 ++--
 internal/util/util.go       | 3 +++
 tools/info-plist.go         | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cmd/micro/debug.go b/cmd/micro/debug.go
index 5dc708abc..1504a03df 100644
--- a/cmd/micro/debug.go
+++ b/cmd/micro/debug.go
@@ -18,7 +18,7 @@ func (NullWriter) Write(data []byte) (n int, err error) {
 // InitLog sets up the debug log system for micro if it has been enabled by compile-time variables
 func InitLog() {
 	if util.Debug == "ON" {
-		f, err := os.OpenFile("log.txt", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
+		f, err := os.OpenFile("log.txt", os.O_RDWR|os.O_CREATE|os.O_TRUNC, util.FileMode)
 		if err != nil {
 			log.Fatalf("error opening file: %v", err)
 		}
diff --git a/internal/action/bindings.go b/internal/action/bindings.go
index 922e56aaa..0fe3e591c 100644
--- a/internal/action/bindings.go
+++ b/internal/action/bindings.go
@@ -15,6 +15,7 @@ import (
 	"github.com/zyedidia/json5"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/util"
 	"github.com/zyedidia/tcell/v2"
 )
 
@@ -26,7 +27,7 @@ var Binder = map[string]func(e Event, action string){
 
 func createBindingsIfNotExist(fname string) {
 	if _, e := os.Stat(fname); errors.Is(e, fs.ErrNotExist) {
-		ioutil.WriteFile(fname, []byte("{}"), 0644)
+		ioutil.WriteFile(fname, []byte("{}"), util.FileMode)
 	}
 }
 
@@ -305,7 +306,7 @@ func TryBindKey(k, v string, overwrite bool) (bool, error) {
 		BindKey(k, v, Binder["buffer"])
 
 		txt, _ := json.MarshalIndent(parsed, "", "    ")
-		return true, ioutil.WriteFile(filename, append(txt, '\n'), 0644)
+		return true, ioutil.WriteFile(filename, append(txt, '\n'), util.FileMode)
 	}
 	return false, e
 }
@@ -355,7 +356,7 @@ func UnbindKey(k string) error {
 		}
 
 		txt, _ := json.MarshalIndent(parsed, "", "    ")
-		return ioutil.WriteFile(filename, append(txt, '\n'), 0644)
+		return ioutil.WriteFile(filename, append(txt, '\n'), util.FileMode)
 	}
 	return e
 }
diff --git a/internal/buffer/save.go b/internal/buffer/save.go
index 169f57628..20ca7566f 100644
--- a/internal/buffer/save.go
+++ b/internal/buffer/save.go
@@ -55,7 +55,7 @@ func overwriteFile(name string, enc encoding.Encoding, fn func(io.Writer) error,
 			screen.TempStart(screenb)
 			return err
 		}
-	} else if writeCloser, err = os.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666); err != nil {
+	} else if writeCloser, err = os.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, util.FileMode); err != nil {
 		return
 	}
 
diff --git a/internal/config/settings.go b/internal/config/settings.go
index b8cfcd516..3231505bf 100644
--- a/internal/config/settings.go
+++ b/internal/config/settings.go
@@ -342,7 +342,7 @@ func WriteSettings(filename string) error {
 		}
 
 		txt, _ := json.MarshalIndent(parsedSettings, "", "    ")
-		err = ioutil.WriteFile(filename, append(txt, '\n'), 0644)
+		err = ioutil.WriteFile(filename, append(txt, '\n'), util.FileMode)
 	}
 	return err
 }
@@ -364,7 +364,7 @@ func OverwriteSettings(filename string) error {
 		}
 
 		txt, _ := json.MarshalIndent(settings, "", "    ")
-		err = ioutil.WriteFile(filename, append(txt, '\n'), 0644)
+		err = ioutil.WriteFile(filename, append(txt, '\n'), util.FileMode)
 	}
 	return err
 }
diff --git a/internal/util/util.go b/internal/util/util.go
index 083c33f6b..973dcc530 100644
--- a/internal/util/util.go
+++ b/internal/util/util.go
@@ -44,6 +44,9 @@ var (
 	Stdout *bytes.Buffer
 	// Sigterm is a channel where micro exits when written
 	Sigterm chan os.Signal
+
+	// To be used for file writes before umask is applied
+	FileMode os.FileMode = 0666
 )
 
 func init() {
diff --git a/tools/info-plist.go b/tools/info-plist.go
index 1707d6de1..33e552914 100644
--- a/tools/info-plist.go
+++ b/tools/info-plist.go
@@ -37,7 +37,7 @@ func main() {
 	</plist>
 	`
 
-	err := os.WriteFile("/tmp/micro-info.plist", []byte(rawInfoPlist), 0644)
+	err := os.WriteFile("/tmp/micro-info.plist", []byte(rawInfoPlist), 0666)
 	if err != nil {
 		panic(err)
 	}

From 4513796661e594320da86f4600b83a9af6ed680e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Thu, 30 May 2024 21:34:11 +0200
Subject: [PATCH 13/22] ioutil: Remove deprecated functions where possible

TODO:
Replace them in the plugin interfaces in the future!
---
 cmd/micro/clean.go                  |  3 +--
 cmd/micro/micro.go                  |  3 +--
 internal/action/bindings.go         | 13 ++++++-------
 internal/buffer/autocomplete.go     |  8 ++++----
 internal/buffer/buffer.go           |  3 +--
 internal/config/plugin_installer.go |  3 +--
 internal/config/rtfiles.go          | 11 +++++------
 internal/config/settings.go         |  7 +++----
 runtime/syntax/make_headers.go      |  7 +++----
 runtime/syntax/syntax_converter.go  |  3 +--
 tools/remove-nightly-assets.go      |  4 ++--
 tools/testgen.go                    |  3 +--
 12 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/cmd/micro/clean.go b/cmd/micro/clean.go
index 9cf9653e2..a4ba076f6 100644
--- a/cmd/micro/clean.go
+++ b/cmd/micro/clean.go
@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"encoding/gob"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -91,7 +90,7 @@ func CleanConfig() {
 
 	// detect incorrectly formatted buffer/ files
 	buffersPath := filepath.Join(config.ConfigDir, "buffers")
-	files, err := ioutil.ReadDir(buffersPath)
+	files, err := os.ReadDir(buffersPath)
 	if err == nil {
 		var badFiles []string
 		var buffer buffer.SerializedBuffer
diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go
index 4445a3481..db4cc9540 100644
--- a/cmd/micro/micro.go
+++ b/cmd/micro/micro.go
@@ -4,7 +4,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/signal"
@@ -209,7 +208,7 @@ func LoadInput(args []string) []*buffer.Buffer {
 		// Option 2
 		// The input is not a terminal, so something is being piped in
 		// and we should read from stdin
-		input, err = ioutil.ReadAll(os.Stdin)
+		input, err = io.ReadAll(os.Stdin)
 		if err != nil {
 			screen.TermMessage("Error reading from stdin: ", err)
 			input = []byte{}
diff --git a/internal/action/bindings.go b/internal/action/bindings.go
index 0fe3e591c..e8a06edb4 100644
--- a/internal/action/bindings.go
+++ b/internal/action/bindings.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io/fs"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -27,7 +26,7 @@ var Binder = map[string]func(e Event, action string){
 
 func createBindingsIfNotExist(fname string) {
 	if _, e := os.Stat(fname); errors.Is(e, fs.ErrNotExist) {
-		ioutil.WriteFile(fname, []byte("{}"), util.FileMode)
+		os.WriteFile(fname, []byte("{}"), util.FileMode)
 	}
 }
 
@@ -39,7 +38,7 @@ func InitBindings() {
 	createBindingsIfNotExist(filename)
 
 	if _, e := os.Stat(filename); e == nil {
-		input, err := ioutil.ReadFile(filename)
+		input, err := os.ReadFile(filename)
 		if err != nil {
 			screen.TermMessage("Error reading bindings.json file: " + err.Error())
 			return
@@ -267,7 +266,7 @@ func TryBindKey(k, v string, overwrite bool) (bool, error) {
 	filename := filepath.Join(config.ConfigDir, "bindings.json")
 	createBindingsIfNotExist(filename)
 	if _, e = os.Stat(filename); e == nil {
-		input, err := ioutil.ReadFile(filename)
+		input, err := os.ReadFile(filename)
 		if err != nil {
 			return false, errors.New("Error reading bindings.json file: " + err.Error())
 		}
@@ -306,7 +305,7 @@ func TryBindKey(k, v string, overwrite bool) (bool, error) {
 		BindKey(k, v, Binder["buffer"])
 
 		txt, _ := json.MarshalIndent(parsed, "", "    ")
-		return true, ioutil.WriteFile(filename, append(txt, '\n'), util.FileMode)
+		return true, os.WriteFile(filename, append(txt, '\n'), util.FileMode)
 	}
 	return false, e
 }
@@ -319,7 +318,7 @@ func UnbindKey(k string) error {
 	filename := filepath.Join(config.ConfigDir, "bindings.json")
 	createBindingsIfNotExist(filename)
 	if _, e = os.Stat(filename); e == nil {
-		input, err := ioutil.ReadFile(filename)
+		input, err := os.ReadFile(filename)
 		if err != nil {
 			return errors.New("Error reading bindings.json file: " + err.Error())
 		}
@@ -356,7 +355,7 @@ func UnbindKey(k string) error {
 		}
 
 		txt, _ := json.MarshalIndent(parsed, "", "    ")
-		return ioutil.WriteFile(filename, append(txt, '\n'), util.FileMode)
+		return os.WriteFile(filename, append(txt, '\n'), util.FileMode)
 	}
 	return e
 }
diff --git a/internal/buffer/autocomplete.go b/internal/buffer/autocomplete.go
index 8a1c3742a..0cd83eabc 100644
--- a/internal/buffer/autocomplete.go
+++ b/internal/buffer/autocomplete.go
@@ -2,7 +2,7 @@ package buffer
 
 import (
 	"bytes"
-	"io/ioutil"
+	"io/fs"
 	"os"
 	"sort"
 	"strings"
@@ -109,15 +109,15 @@ func FileComplete(b *Buffer) ([]string, []string) {
 	sep := string(os.PathSeparator)
 	dirs := strings.Split(input, sep)
 
-	var files []os.FileInfo
+	var files []fs.DirEntry
 	var err error
 	if len(dirs) > 1 {
 		directories := strings.Join(dirs[:len(dirs)-1], sep) + sep
 
 		directories, _ = util.ReplaceHome(directories)
-		files, err = ioutil.ReadDir(directories)
+		files, err = os.ReadDir(directories)
 	} else {
-		files, err = ioutil.ReadDir(".")
+		files, err = os.ReadDir(".")
 	}
 
 	if err != nil {
diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go
index 34b79009b..e0893f8a1 100644
--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -550,7 +549,7 @@ func (b *Buffer) ReOpen() error {
 	}
 
 	reader := bufio.NewReader(transform.NewReader(file, enc.NewDecoder()))
-	data, err := ioutil.ReadAll(reader)
+	data, err := io.ReadAll(reader)
 	txt := string(data)
 
 	if err != nil {
diff --git a/internal/config/plugin_installer.go b/internal/config/plugin_installer.go
index ef2d4cb49..d13a79971 100644
--- a/internal/config/plugin_installer.go
+++ b/internal/config/plugin_installer.go
@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -396,7 +395,7 @@ func (pv *PluginVersion) DownloadAndInstall(out io.Writer) error {
 		return err
 	}
 	defer resp.Body.Close()
-	data, err := ioutil.ReadAll(resp.Body)
+	data, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}
diff --git a/internal/config/rtfiles.go b/internal/config/rtfiles.go
index 24adaebfa..27cb07d24 100644
--- a/internal/config/rtfiles.go
+++ b/internal/config/rtfiles.go
@@ -2,7 +2,6 @@ package config
 
 import (
 	"errors"
-	"io/ioutil"
 	"log"
 	"os"
 	"path"
@@ -87,7 +86,7 @@ func (rf realFile) Name() string {
 }
 
 func (rf realFile) Data() ([]byte, error) {
-	return ioutil.ReadFile(string(rf))
+	return os.ReadFile(string(rf))
 }
 
 func (af assetFile) Name() string {
@@ -117,7 +116,7 @@ func AddRealRuntimeFile(fileType RTFiletype, file RuntimeFile) {
 // AddRuntimeFilesFromDirectory registers each file from the given directory for
 // the filetype which matches the file-pattern
 func AddRuntimeFilesFromDirectory(fileType RTFiletype, directory, pattern string) {
-	files, _ := ioutil.ReadDir(directory)
+	files, _ := os.ReadDir(directory)
 	for _, f := range files {
 		if ok, _ := filepath.Match(pattern, f.Name()); !f.IsDir() && ok {
 			fullPath := filepath.Join(directory, f.Name())
@@ -204,14 +203,14 @@ func InitPlugins() {
 
 	// Search ConfigDir for plugin-scripts
 	plugdir := filepath.Join(ConfigDir, "plug")
-	files, _ := ioutil.ReadDir(plugdir)
+	files, _ := os.ReadDir(plugdir)
 
 	isID := regexp.MustCompile(`^[_A-Za-z0-9]+$`).MatchString
 
 	for _, d := range files {
 		plugpath := filepath.Join(plugdir, d.Name())
 		if stat, err := os.Stat(plugpath); err == nil && stat.IsDir() {
-			srcs, _ := ioutil.ReadDir(plugpath)
+			srcs, _ := os.ReadDir(plugpath)
 			p := new(Plugin)
 			p.Name = d.Name()
 			p.DirName = d.Name()
@@ -219,7 +218,7 @@ func InitPlugins() {
 				if strings.HasSuffix(f.Name(), ".lua") {
 					p.Srcs = append(p.Srcs, realFile(filepath.Join(plugdir, d.Name(), f.Name())))
 				} else if strings.HasSuffix(f.Name(), ".json") {
-					data, err := ioutil.ReadFile(filepath.Join(plugdir, d.Name(), f.Name()))
+					data, err := os.ReadFile(filepath.Join(plugdir, d.Name(), f.Name()))
 					if err != nil {
 						continue
 					}
diff --git a/internal/config/settings.go b/internal/config/settings.go
index 3231505bf..717165b10 100644
--- a/internal/config/settings.go
+++ b/internal/config/settings.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -217,7 +216,7 @@ func ReadSettings() error {
 	parsedSettings = make(map[string]interface{})
 	filename := filepath.Join(ConfigDir, "settings.json")
 	if _, e := os.Stat(filename); e == nil {
-		input, err := ioutil.ReadFile(filename)
+		input, err := os.ReadFile(filename)
 		if err != nil {
 			settingsParseError = true
 			return errors.New("Error reading settings.json file: " + err.Error())
@@ -342,7 +341,7 @@ func WriteSettings(filename string) error {
 		}
 
 		txt, _ := json.MarshalIndent(parsedSettings, "", "    ")
-		err = ioutil.WriteFile(filename, append(txt, '\n'), util.FileMode)
+		err = os.WriteFile(filename, append(txt, '\n'), util.FileMode)
 	}
 	return err
 }
@@ -364,7 +363,7 @@ func OverwriteSettings(filename string) error {
 		}
 
 		txt, _ := json.MarshalIndent(settings, "", "    ")
-		err = ioutil.WriteFile(filename, append(txt, '\n'), util.FileMode)
+		err = os.WriteFile(filename, append(txt, '\n'), util.FileMode)
 	}
 	return err
 }
diff --git a/runtime/syntax/make_headers.go b/runtime/syntax/make_headers.go
index c00c27da8..dba810c73 100644
--- a/runtime/syntax/make_headers.go
+++ b/runtime/syntax/make_headers.go
@@ -6,7 +6,6 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 	"time"
@@ -34,7 +33,7 @@ func main() {
 	if len(os.Args) > 1 {
 		os.Chdir(os.Args[1])
 	}
-	files, _ := ioutil.ReadDir(".")
+	files, _ := os.ReadDir(".")
 	for _, f := range files {
 		fname := f.Name()
 		if strings.HasSuffix(fname, ".yaml") {
@@ -46,7 +45,7 @@ func main() {
 func convert(name string) {
 	filename := name + ".yaml"
 	var hdr HeaderYaml
-	source, err := ioutil.ReadFile(filename)
+	source, err := os.ReadFile(filename)
 	if err != nil {
 		panic(err)
 	}
@@ -68,7 +67,7 @@ func encode(name string, c HeaderYaml) {
 
 func decode(name string) Header {
 	start := time.Now()
-	data, _ := ioutil.ReadFile(name + ".hdr")
+	data, _ := os.ReadFile(name + ".hdr")
 	strs := bytes.Split(data, []byte{'\n'})
 	var hdr Header
 	hdr.FileType = string(strs[0])
diff --git a/runtime/syntax/syntax_converter.go b/runtime/syntax/syntax_converter.go
index c8af2f35f..1bf9ca313 100644
--- a/runtime/syntax/syntax_converter.go
+++ b/runtime/syntax/syntax_converter.go
@@ -4,7 +4,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"regexp"
 	"strings"
@@ -161,6 +160,6 @@ func main() {
 		return
 	}
 
-	data, _ := ioutil.ReadFile(os.Args[1])
+	data, _ := os.ReadFile(os.Args[1])
 	fmt.Print(generateFile(parseFile(string(data), os.Args[1])))
 }
diff --git a/tools/remove-nightly-assets.go b/tools/remove-nightly-assets.go
index 9367408c7..4c81b4c6d 100644
--- a/tools/remove-nightly-assets.go
+++ b/tools/remove-nightly-assets.go
@@ -4,7 +4,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os/exec"
 	"strings"
@@ -19,7 +19,7 @@ func main() {
 		return
 	}
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 
 	var data interface{}
 
diff --git a/tools/testgen.go b/tools/testgen.go
index f110202fa..580b5a65e 100644
--- a/tools/testgen.go
+++ b/tools/testgen.go
@@ -4,7 +4,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"regexp"
@@ -210,7 +209,7 @@ func main() {
 	var tests []test
 
 	for _, filename := range os.Args[1:] {
-		source, err := ioutil.ReadFile(filename)
+		source, err := os.ReadFile(filename)
 		if err != nil {
 			log.Fatalln(err)
 		}

From a00c7f748e7e37bd0153f738c4a14a0e78f3a16b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Wed, 29 May 2024 22:33:33 +0200
Subject: [PATCH 14/22] save: Perform write process atomic

Additionally slightly rework path handling
---
 internal/action/actions.go |   2 -
 internal/buffer/backup.go  |  21 ++++--
 internal/buffer/buffer.go  |   1 +
 internal/buffer/save.go    | 138 ++++++++++++++++++++++++-------------
 4 files changed, 106 insertions(+), 56 deletions(-)

diff --git a/internal/action/actions.go b/internal/action/actions.go
index 9d95e021e..b07d4ce7d 100644
--- a/internal/action/actions.go
+++ b/internal/action/actions.go
@@ -985,7 +985,6 @@ func (h *BufPane) saveBufToFile(filename string, action string, callback func())
 				if err != nil {
 					InfoBar.Error(err)
 				} else {
-					h.Buf.Path = filename
 					h.Buf.SetName(filename)
 					InfoBar.Message("Saved " + filename)
 					if callback != nil {
@@ -1011,7 +1010,6 @@ func (h *BufPane) saveBufToFile(filename string, action string, callback func())
 			InfoBar.Error(err)
 		}
 	} else {
-		h.Buf.Path = filename
 		h.Buf.SetName(filename)
 		InfoBar.Message("Saved " + filename)
 		if callback != nil {
diff --git a/internal/buffer/backup.go b/internal/buffer/backup.go
index dfbc698ca..e620691f5 100644
--- a/internal/buffer/backup.go
+++ b/internal/buffer/backup.go
@@ -65,23 +65,32 @@ func (b *Buffer) RequestBackup() {
 	}
 }
 
+func (b *Buffer) BackupDir() string {
+	backupdir, err := util.ReplaceHome(b.Settings["backupdir"].(string))
+	if backupdir == "" || err != nil {
+		backupdir = filepath.Join(config.ConfigDir, "backups")
+	}
+	return backupdir
+}
+
+func (b *Buffer) KeepBackup() bool {
+	return b.Settings["permbackup"].(bool) || b.keepBackup
+}
+
 // Backup saves the current buffer to ConfigDir/backups
 func (b *Buffer) Backup() error {
 	if !b.Settings["backup"].(bool) || b.Path == "" || b.Type != BTDefault {
 		return nil
 	}
 
-	backupdir, err := util.ReplaceHome(b.Settings["backupdir"].(string))
-	if backupdir == "" || err != nil {
-		backupdir = filepath.Join(config.ConfigDir, "backups")
-	}
+	backupdir := b.BackupDir()
 	if _, err := os.Stat(backupdir); errors.Is(err, fs.ErrNotExist) {
 		os.Mkdir(backupdir, os.ModePerm)
 	}
 
 	name := util.DetermineEscapePath(backupdir, b.AbsPath)
 
-	err = overwriteFile(name, encoding.Nop, func(file io.Writer) (e error) {
+	err := overwriteFile(name, encoding.Nop, func(file io.Writer) (e error) {
 		b.Lock()
 		defer b.Unlock()
 
@@ -120,7 +129,7 @@ func (b *Buffer) Backup() error {
 
 // RemoveBackup removes any backup file associated with this buffer
 func (b *Buffer) RemoveBackup() {
-	if !b.Settings["backup"].(bool) || b.Settings["permbackup"].(bool) || b.Path == "" || b.Type != BTDefault {
+	if !b.Settings["backup"].(bool) || b.KeepBackup() || b.Path == "" || b.Type != BTDefault {
 		return
 	}
 	f := util.DetermineEscapePath(filepath.Join(config.ConfigDir, "backups"), b.AbsPath)
diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go
index e0893f8a1..5f0e0e3ef 100644
--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
@@ -102,6 +102,7 @@ type SharedBuffer struct {
 	diff              map[int]DiffStatus
 
 	requestedBackup bool
+	keepBackup      bool
 
 	// ReloadDisabled allows the user to disable reloads if they
 	// are viewing a file that is constantly changing
diff --git a/internal/buffer/save.go b/internal/buffer/save.go
index 20ca7566f..660e53f89 100644
--- a/internal/buffer/save.go
+++ b/internal/buffer/save.go
@@ -89,6 +89,59 @@ func overwriteFile(name string, enc encoding.Encoding, fn func(io.Writer) error,
 	return
 }
 
+func (b *Buffer) Overwrite(name string, isBackup bool, withSudo bool) (err error) {
+	enc, err := htmlindex.Get(b.Settings["encoding"].(string))
+	if err != nil {
+		return
+	}
+
+	var size int
+	fwriter := func(file io.Writer) (e error) {
+		if len(b.lines) == 0 {
+			return
+		}
+
+		// end of line
+		var eol []byte
+		if b.Endings == FFDos {
+			eol = []byte{'\r', '\n'}
+		} else {
+			eol = []byte{'\n'}
+		}
+
+		// write lines
+		if size, err = file.Write(b.lines[0].data); err != nil {
+			return
+		}
+
+		for _, l := range b.lines[1:] {
+			if _, err = file.Write(eol); err != nil {
+				return
+			}
+			if _, err = file.Write(l.data); err != nil {
+				return
+			}
+			size += len(eol) + len(l.data)
+		}
+		return
+	}
+
+	if err = overwriteFile(name, enc, fwriter, withSudo); err != nil {
+		return
+	}
+
+	if !isBackup && !b.Settings["fastdirty"].(bool) {
+		if size > LargeFileThreshold {
+			// For large files 'fastdirty' needs to be on
+			b.Settings["fastdirty"] = true
+		} else {
+			calcHash(b, &b.origHash)
+		}
+	}
+
+	return err
+}
+
 // Save saves the buffer to its default path
 func (b *Buffer) Save() error {
 	return b.SaveAs(b.Path)
@@ -153,20 +206,19 @@ func (b *Buffer) saveToFile(filename string, withSudo bool, autoSave bool) error
 		err = b.Serialize()
 	}()
 
-	// Removes any tilde and replaces with the absolute path to home
-	absFilename, _ := util.ReplaceHome(filename)
-
-	fileInfo, err := os.Stat(absFilename)
+	fileInfo, err := os.Stat(filename)
 	if err != nil && !errors.Is(err, fs.ErrNotExist) {
 		return err
 	}
 	if err == nil && fileInfo.IsDir() {
-		return errors.New("Error: " + absFilename + " is a directory and cannot be saved")
+		return errors.New("Error: " + filename + " is a directory and cannot be saved")
 	}
 	if err == nil && !fileInfo.Mode().IsRegular() {
-		return errors.New("Error: " + absFilename + " is not a regular file and cannot be saved")
+		return errors.New("Error: " + filename + " is not a regular file and cannot be saved")
 	}
 
+	absFilename, _ := filepath.Abs(filename)
+
 	// Get the leading path to the file | "." is returned if there's no leading path provided
 	if dirname := filepath.Dir(absFilename); dirname != "." {
 		// Check if the parent dirs don't exist
@@ -184,60 +236,50 @@ func (b *Buffer) saveToFile(filename string, withSudo bool, autoSave bool) error
 		}
 	}
 
-	var fileSize int
-
-	enc, err := htmlindex.Get(b.Settings["encoding"].(string))
-	if err != nil {
+	if err = b.safeWrite(absFilename, withSudo); err != nil {
 		return err
 	}
 
-	fwriter := func(file io.Writer) (e error) {
-		if len(b.lines) == 0 {
-			return
-		}
+	b.Path, _ = util.ReplaceHome(filename)
+	b.AbsPath = absFilename
+	b.isModified = false
+	b.UpdateRules()
+	return err
+}
 
-		// end of line
-		var eol []byte
-		if b.Endings == FFDos {
-			eol = []byte{'\r', '\n'}
-		} else {
-			eol = []byte{'\n'}
+// safeWrite performs the following actions:
+// 1. Create a backup directory if it doesn't exist
+// 2. Create or update a backup file first at the given location
+// 2.1. If this fails remove the corrupted backup file and return with error
+// 3. Create or update the target file
+// 3.1. If this fails keep the backup file and return with error
+// 4. Remove the backup file, in case it shouldn't be kept and return
+func (b *Buffer) safeWrite(name string, withSudo bool) error {
+	backupDir := b.BackupDir()
+	if _, err := os.Stat(backupDir); err != nil {
+		if !errors.Is(err, fs.ErrNotExist) {
+			return err
 		}
-
-		// write lines
-		if fileSize, e = file.Write(b.lines[0].data); e != nil {
-			return
+		if err = os.Mkdir(backupDir, os.ModePerm); err != nil {
+			return err
 		}
+	}
 
-		for _, l := range b.lines[1:] {
-			if _, e = file.Write(eol); e != nil {
-				return
-			}
-			if _, e = file.Write(l.data); e != nil {
-				return
-			}
-			fileSize += len(eol) + len(l.data)
-		}
-		return
+	backupName := util.DetermineEscapePath(backupDir, name)
+	if err := b.Overwrite(backupName, true, withSudo); err != nil {
+		os.Remove(backupName)
+		return err
 	}
+	b.keepBackup = true
 
-	if err = overwriteFile(absFilename, enc, fwriter, withSudo); err != nil {
+	if err := b.Overwrite(name, false, withSudo); err != nil {
 		return err
 	}
+	b.keepBackup = false
 
-	if !b.Settings["fastdirty"].(bool) {
-		if fileSize > LargeFileThreshold {
-			// For large files 'fastdirty' needs to be on
-			b.Settings["fastdirty"] = true
-		} else {
-			calcHash(b, &b.origHash)
-		}
+	if !b.KeepBackup() {
+		os.Remove(backupName)
 	}
 
-	b.Path = filename
-	absPath, _ := filepath.Abs(filename)
-	b.AbsPath = absPath
-	b.isModified = false
-	b.UpdateRules()
-	return err
+	return nil
 }

From d192c3411ded5058568e9547b6a544dfe6d6f282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Tue, 3 Sep 2024 20:29:24 +0200
Subject: [PATCH 15/22] util: Provide `AppendBackupSuffix()` for further
 transformations

---
 internal/util/util.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/internal/util/util.go b/internal/util/util.go
index 973dcc530..55f3d052b 100644
--- a/internal/util/util.go
+++ b/internal/util/util.go
@@ -402,6 +402,10 @@ func GetModTime(path string) (time.Time, error) {
 	return info.ModTime(), nil
 }
 
+func AppendBackupSuffix(path string) string {
+	return path + ".micro-backup"
+}
+
 // EscapePathUrl encodes the path in URL query form
 func EscapePathUrl(path string) string {
 	return url.QueryEscape(filepath.ToSlash(path))

From a570ed432a288ff12b3d1cdfbf3402c659981a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Fri, 31 May 2024 20:44:38 +0200
Subject: [PATCH 16/22] backup: Perform write process atomic

---
 internal/buffer/backup.go | 55 ++++++++++++++-------------------------
 internal/buffer/save.go   |  3 +++
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/internal/buffer/backup.go b/internal/buffer/backup.go
index e620691f5..3dc1eecae 100644
--- a/internal/buffer/backup.go
+++ b/internal/buffer/backup.go
@@ -3,7 +3,6 @@ package buffer
 import (
 	"errors"
 	"fmt"
-	"io"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -13,7 +12,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"
 )
 
 const backupMsg = `A backup was detected for this file. This likely means that micro
@@ -77,7 +75,7 @@ func (b *Buffer) KeepBackup() bool {
 	return b.Settings["permbackup"].(bool) || b.keepBackup
 }
 
-// Backup saves the current buffer to ConfigDir/backups
+// Backup saves the current buffer to the backups directory
 func (b *Buffer) Backup() error {
 	if !b.Settings["backup"].(bool) || b.Path == "" || b.Type != BTDefault {
 		return nil
@@ -89,38 +87,25 @@ func (b *Buffer) Backup() error {
 	}
 
 	name := util.DetermineEscapePath(backupdir, b.AbsPath)
-
-	err := overwriteFile(name, encoding.Nop, func(file io.Writer) (e error) {
-		b.Lock()
-		defer b.Unlock()
-
-		if len(b.lines) == 0 {
-			return
-		}
-
-		// end of line
-		var eol []byte
-		if b.Endings == FFDos {
-			eol = []byte{'\r', '\n'}
-		} else {
-			eol = []byte{'\n'}
-		}
-
-		// write lines
-		if _, e = file.Write(b.lines[0].data); e != nil {
-			return
+	if _, err := os.Stat(name); errors.Is(err, fs.ErrNotExist) {
+		err = b.Overwrite(name, true, false)
+		if err == nil {
+			b.requestedBackup = false
 		}
+		return err
+	}
 
-		for _, l := range b.lines[1:] {
-			if _, e = file.Write(eol); e != nil {
-				return
-			}
-			if _, e = file.Write(l.data); e != nil {
-				return
-			}
-		}
-		return
-	}, false)
+	tmp := util.AppendBackupSuffix(name)
+	err := b.Overwrite(tmp, true, false)
+	if err != nil {
+		os.Remove(tmp)
+		return err
+	}
+	err = os.Rename(tmp, name)
+	if err != nil {
+		os.Remove(tmp)
+		return err
+	}
 
 	b.requestedBackup = false
 
@@ -132,7 +117,7 @@ func (b *Buffer) RemoveBackup() {
 	if !b.Settings["backup"].(bool) || b.KeepBackup() || b.Path == "" || b.Type != BTDefault {
 		return
 	}
-	f := util.DetermineEscapePath(filepath.Join(config.ConfigDir, "backups"), b.AbsPath)
+	f := util.DetermineEscapePath(b.BackupDir(), b.AbsPath)
 	os.Remove(f)
 }
 
@@ -140,7 +125,7 @@ func (b *Buffer) RemoveBackup() {
 // Returns true if a backup was applied
 func (b *Buffer) ApplyBackup(fsize int64) (bool, bool) {
 	if b.Settings["backup"].(bool) && !b.Settings["permbackup"].(bool) && len(b.Path) > 0 && b.Type == BTDefault {
-		backupfile := util.DetermineEscapePath(filepath.Join(config.ConfigDir, "backups"), b.AbsPath)
+		backupfile := util.DetermineEscapePath(b.BackupDir(), b.AbsPath)
 		if info, err := os.Stat(backupfile); err == nil {
 			backup, err := os.Open(backupfile)
 			if err == nil {
diff --git a/internal/buffer/save.go b/internal/buffer/save.go
index 660e53f89..bf13335b7 100644
--- a/internal/buffer/save.go
+++ b/internal/buffer/save.go
@@ -97,6 +97,9 @@ func (b *Buffer) Overwrite(name string, isBackup bool, withSudo bool) (err error
 
 	var size int
 	fwriter := func(file io.Writer) (e error) {
+		b.Lock()
+		defer b.Unlock()
+
 		if len(b.lines) == 0 {
 			return
 		}

From d687dca2c8cc8ae74aead2857a05c0819a4fa093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Thu, 29 Aug 2024 20:52:55 +0200
Subject: [PATCH 17/22] util: Provide `SafeWrite()` to generalize the internal
 file write process

SafeWrite() will create a temporary intermediate file.
---
 internal/util/util.go | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/internal/util/util.go b/internal/util/util.go
index 55f3d052b..546ee9e46 100644
--- a/internal/util/util.go
+++ b/internal/util/util.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"net/http"
 	"net/url"
 	"os"
@@ -613,3 +614,41 @@ func HttpRequest(method string, url string, headers []string) (resp *http.Respon
 	}
 	return client.Do(req)
 }
+
+// SafeWrite performs the following actions:
+// 1. If not exists try to write the file and return
+// 2. Create a derived temporary file first
+// 2.1. If this fails remove the corrupted temporary file and return with error
+// 3. Rename the temporary to the target file or overwrite the target file
+// 3.1. If this fails remove the temporary in case of rename otherwise keep the file and return with error
+// 4. Remove the temporary file
+func SafeWrite(name string, bytes []byte, rename bool) error {
+	if _, err := os.Stat(name); err != nil {
+		if !errors.Is(err, fs.ErrNotExist) {
+			return err
+		}
+		return os.WriteFile(name, bytes, FileMode)
+	}
+
+	tmp := AppendBackupSuffix(name)
+	err := os.WriteFile(tmp, bytes, FileMode)
+	if err != nil {
+		os.Remove(tmp)
+		return err
+	}
+
+	if rename {
+		err = os.Rename(tmp, name)
+	} else {
+		err = os.WriteFile(name, bytes, FileMode)
+	}
+	if err != nil {
+		if rename {
+			os.Remove(tmp)
+		}
+		return err
+	}
+
+	os.Remove(tmp)
+	return nil
+}

From d3e8ba57efb54ae179046c83b5e97cdf7af4764b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Sat, 1 Jun 2024 15:27:06 +0200
Subject: [PATCH 18/22] serialize: Perform write process atomic

---
 internal/buffer/serialize.go | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/internal/buffer/serialize.go b/internal/buffer/serialize.go
index 06906f763..bedac2ac5 100644
--- a/internal/buffer/serialize.go
+++ b/internal/buffer/serialize.go
@@ -1,15 +1,13 @@
 package buffer
 
 import (
+	"bytes"
 	"encoding/gob"
 	"errors"
-	"io"
 	"os"
 	"path/filepath"
 	"time"
 
-	"golang.org/x/text/encoding"
-
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/util"
 )
@@ -31,16 +29,18 @@ func (b *Buffer) Serialize() error {
 		return nil
 	}
 
-	name := util.DetermineEscapePath(filepath.Join(config.ConfigDir, "buffers"), b.AbsPath)
-
-	return overwriteFile(name, encoding.Nop, func(file io.Writer) error {
-		err := gob.NewEncoder(file).Encode(SerializedBuffer{
-			b.EventHandler,
-			b.GetActiveCursor().Loc,
-			b.ModTime,
-		})
+	var buf bytes.Buffer
+	err := gob.NewEncoder(&buf).Encode(SerializedBuffer{
+		b.EventHandler,
+		b.GetActiveCursor().Loc,
+		b.ModTime,
+	})
+	if err != nil {
 		return err
-	}, false)
+	}
+
+	name := util.DetermineEscapePath(filepath.Join(config.ConfigDir, "buffers"), b.AbsPath)
+	return util.SafeWrite(name, buf.Bytes(), true)
 }
 
 // Unserialize loads the buffer info from config.ConfigDir/buffers

From a74a982e6a51cf3b6cecd4663b0eedd660a3033a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Sat, 1 Jun 2024 16:27:43 +0200
Subject: [PATCH 19/22] bindings: Perform write process atomic

---
 internal/action/bindings.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/internal/action/bindings.go b/internal/action/bindings.go
index e8a06edb4..c1422bb5a 100644
--- a/internal/action/bindings.go
+++ b/internal/action/bindings.go
@@ -24,9 +24,13 @@ var Binder = map[string]func(e Event, action string){
 	"terminal": TermMapEvent,
 }
 
+func writeFile(name string, txt []byte) error {
+	return util.SafeWrite(name, txt, false)
+}
+
 func createBindingsIfNotExist(fname string) {
 	if _, e := os.Stat(fname); errors.Is(e, fs.ErrNotExist) {
-		os.WriteFile(fname, []byte("{}"), util.FileMode)
+		writeFile(fname, []byte("{}"))
 	}
 }
 
@@ -305,7 +309,8 @@ func TryBindKey(k, v string, overwrite bool) (bool, error) {
 		BindKey(k, v, Binder["buffer"])
 
 		txt, _ := json.MarshalIndent(parsed, "", "    ")
-		return true, os.WriteFile(filename, append(txt, '\n'), util.FileMode)
+		txt = append(txt, '\n')
+		return true, writeFile(filename, txt)
 	}
 	return false, e
 }
@@ -355,7 +360,8 @@ func UnbindKey(k string) error {
 		}
 
 		txt, _ := json.MarshalIndent(parsed, "", "    ")
-		return os.WriteFile(filename, append(txt, '\n'), util.FileMode)
+		txt = append(txt, '\n')
+		return writeFile(filename, txt)
 	}
 	return e
 }

From 367589049d20bcfff38e77e99d322fa76cffa19b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Sat, 1 Jun 2024 16:38:57 +0200
Subject: [PATCH 20/22] settings: Perform write process atomic

---
 internal/config/settings.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/internal/config/settings.go b/internal/config/settings.go
index 717165b10..23a7078ab 100644
--- a/internal/config/settings.go
+++ b/internal/config/settings.go
@@ -150,6 +150,10 @@ var (
 	VolatileSettings map[string]bool
 )
 
+func writeFile(name string, txt []byte) error {
+	return util.SafeWrite(name, txt, false)
+}
+
 func init() {
 	ModifiedSettings = make(map[string]bool)
 	VolatileSettings = make(map[string]bool)
@@ -341,7 +345,8 @@ func WriteSettings(filename string) error {
 		}
 
 		txt, _ := json.MarshalIndent(parsedSettings, "", "    ")
-		err = os.WriteFile(filename, append(txt, '\n'), util.FileMode)
+		txt = append(txt, '\n')
+		err = writeFile(filename, txt)
 	}
 	return err
 }
@@ -362,8 +367,9 @@ func OverwriteSettings(filename string) error {
 			}
 		}
 
-		txt, _ := json.MarshalIndent(settings, "", "    ")
-		err = os.WriteFile(filename, append(txt, '\n'), util.FileMode)
+		txt, _ := json.MarshalIndent(parsedSettings, "", "    ")
+		txt = append(txt, '\n')
+		err = writeFile(filename, txt)
 	}
 	return err
 }

From c37d7dedd70f391119010cc971186ddd4a60ad2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Sun, 8 Sep 2024 12:38:03 +0200
Subject: [PATCH 21/22] micro: Generalize exit behavior

---
 cmd/micro/micro.go | 55 +++++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go
index db4cc9540..decf819b8 100644
--- a/cmd/micro/micro.go
+++ b/cmd/micro/micro.go
@@ -98,7 +98,7 @@ func InitFlags() {
 		fmt.Println("Version:", util.Version)
 		fmt.Println("Commit hash:", util.CommitHash)
 		fmt.Println("Compiled on", util.CompileDate)
-		os.Exit(0)
+		exit(0)
 	}
 
 	if *flagOptions {
@@ -114,7 +114,7 @@ func InitFlags() {
 			fmt.Printf("-%s value\n", k)
 			fmt.Printf("    \tDefault value: '%v'\n", v)
 		}
-		os.Exit(0)
+		exit(0)
 	}
 
 	if util.Debug == "OFF" && *flagDebug {
@@ -135,7 +135,7 @@ func DoPluginFlags() {
 			CleanConfig()
 		}
 
-		os.Exit(0)
+		exit(0)
 	}
 }
 
@@ -222,12 +222,26 @@ func LoadInput(args []string) []*buffer.Buffer {
 	return buffers
 }
 
+func exit(rc int) {
+	for _, b := range buffer.OpenBuffers {
+		if !b.Modified() {
+			b.Fini()
+		}
+	}
+
+	if screen.Screen != nil {
+		screen.Screen.Fini()
+	}
+
+	os.Exit(rc)
+}
+
 func main() {
 	defer func() {
 		if util.Stdout.Len() > 0 {
 			fmt.Fprint(os.Stdout, util.Stdout.String())
 		}
-		os.Exit(0)
+		exit(0)
 	}()
 
 	var err error
@@ -287,7 +301,7 @@ func main() {
 	if err != nil {
 		fmt.Println(err)
 		fmt.Println("Fatal: Micro could not initialize a Screen.")
-		os.Exit(1)
+		exit(1)
 	}
 	m := clipboard.SetMethod(config.GetGlobalOption("clipboard").(string))
 	clipErr := clipboard.Initialize(m)
@@ -306,7 +320,7 @@ func main() {
 			for _, b := range buffer.OpenBuffers {
 				b.Backup()
 			}
-			os.Exit(1)
+			exit(1)
 		}
 	}()
 
@@ -434,23 +448,9 @@ func DoEvent() {
 	case f := <-timerChan:
 		f()
 	case <-sighup:
-		for _, b := range buffer.OpenBuffers {
-			if !b.Modified() {
-				b.Fini()
-			}
-		}
-		os.Exit(0)
+		exit(0)
 	case <-util.Sigterm:
-		for _, b := range buffer.OpenBuffers {
-			if !b.Modified() {
-				b.Fini()
-			}
-		}
-
-		if screen.Screen != nil {
-			screen.Screen.Fini()
-		}
-		os.Exit(0)
+		exit(0)
 	}
 
 	if e, ok := event.(*tcell.EventError); ok {
@@ -458,16 +458,7 @@ func DoEvent() {
 
 		if e.Err() == io.EOF {
 			// shutdown due to terminal closing/becoming inaccessible
-			for _, b := range buffer.OpenBuffers {
-				if !b.Modified() {
-					b.Fini()
-				}
-			}
-
-			if screen.Screen != nil {
-				screen.Screen.Fini()
-			}
-			os.Exit(0)
+			exit(0)
 		}
 		return
 	}

From d4601cdd8c86a53e697dd3365ff59a38123778cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6ran=20Karl?=
 <3951388+JoeKar@users.noreply.github.com>
Date: Sun, 8 Sep 2024 12:42:18 +0200
Subject: [PATCH 22/22] micro: Provide recovery of `settings.json` &
 `bindings.json`

---
 cmd/micro/micro.go        | 44 +++++++++++++++++++++++++++++++++++++++
 internal/buffer/backup.go |  4 ++--
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go
index decf819b8..c7d75cdce 100644
--- a/cmd/micro/micro.go
+++ b/cmd/micro/micro.go
@@ -7,6 +7,7 @@ import (
 	"log"
 	"os"
 	"os/signal"
+	"path/filepath"
 	"regexp"
 	"runtime"
 	"runtime/pprof"
@@ -222,6 +223,33 @@ func LoadInput(args []string) []*buffer.Buffer {
 	return buffers
 }
 
+func processBackup(backup string, target string) error {
+	if info, err := os.Stat(backup); err == nil {
+		input, err := os.ReadFile(backup)
+		if err == nil {
+			t := info.ModTime()
+			msg := fmt.Sprintf(buffer.BackupMsg, t.Format("Mon Jan _2 at 15:04, 2006"), backup)
+			choice := screen.TermPrompt(msg, []string{"r", "i", "a", "recover", "ignore", "abort"}, true)
+
+			if choice%3 == 0 {
+				// recover
+				err := os.WriteFile(target, input, util.FileMode)
+				if err != nil {
+					return err
+				}
+				return os.Remove(backup)
+			} else if choice%3 == 1 {
+				// delete
+				return os.Remove(backup)
+			} else if choice%3 == 2 {
+				// abort
+				return errors.New("Aborted")
+			}
+		}
+	}
+	return nil
+}
+
 func exit(rc int) {
 	for _, b := range buffer.OpenBuffers {
 		if !b.Modified() {
@@ -269,6 +297,14 @@ func main() {
 	config.InitRuntimeFiles(true)
 	config.InitPlugins()
 
+	filename := filepath.Join(config.ConfigDir, "settings.json")
+	backupname := util.AppendBackupSuffix(filename)
+	err = processBackup(backupname, filename)
+	if err != nil {
+		screen.TermMessage(err)
+		exit(1)
+	}
+
 	err = config.ReadSettings()
 	if err != nil {
 		screen.TermMessage(err)
@@ -329,6 +365,14 @@ func main() {
 		screen.TermMessage(err)
 	}
 
+	filename = filepath.Join(config.ConfigDir, "bindings.json")
+	backupname = util.AppendBackupSuffix(filename)
+	err = processBackup(backupname, filename)
+	if err != nil {
+		screen.TermMessage(err)
+		exit(1)
+	}
+
 	action.InitBindings()
 	action.InitCommands()
 
diff --git a/internal/buffer/backup.go b/internal/buffer/backup.go
index 3dc1eecae..27abe3d81 100644
--- a/internal/buffer/backup.go
+++ b/internal/buffer/backup.go
@@ -14,7 +14,7 @@ import (
 	"github.com/zyedidia/micro/v2/internal/util"
 )
 
-const backupMsg = `A backup was detected for this file. This likely means that micro
+const BackupMsg = `A backup was detected for this file. This likely means that micro
 crashed while editing this file, or another instance of micro is currently
 editing this file.
 
@@ -131,7 +131,7 @@ func (b *Buffer) ApplyBackup(fsize int64) (bool, bool) {
 			if err == nil {
 				defer backup.Close()
 				t := info.ModTime()
-				msg := fmt.Sprintf(backupMsg, t.Format("Mon Jan _2 at 15:04, 2006"), backupfile)
+				msg := fmt.Sprintf(BackupMsg, t.Format("Mon Jan _2 at 15:04, 2006"), backupfile)
 				choice := screen.TermPrompt(msg, []string{"r", "i", "a", "recover", "ignore", "abort"}, true)
 
 				if choice%3 == 0 {