From b45fcf5bd7018594d0d53ab2d3f541fed2fc6548 Mon Sep 17 00:00:00 2001
From: Zachary Yedidia <zyedidia@gmail.com>
Date: Thu, 1 Sep 2016 20:17:42 -0400
Subject: [PATCH] Use json5 for config files

---
 cmd/micro/bindings.go |  4 ++--
 cmd/micro/settings.go | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmd/micro/bindings.go b/cmd/micro/bindings.go
index 5172c698..07cd9dcc 100644
--- a/cmd/micro/bindings.go
+++ b/cmd/micro/bindings.go
@@ -1,11 +1,11 @@
 package main
 
 import (
-	"encoding/json"
 	"io/ioutil"
 	"os"
 	"strings"
 
+	"github.com/yosuke-furukawa/json5/encoding/json5"
 	"github.com/zyedidia/tcell"
 )
 
@@ -236,7 +236,7 @@ func InitBindings() {
 			return
 		}
 
-		err = json.Unmarshal(input, &parsed)
+		err = json5.Unmarshal(input, &parsed)
 		if err != nil {
 			TermMessage("Error reading bindings.json:", err.Error())
 		}
diff --git a/cmd/micro/settings.go b/cmd/micro/settings.go
index ffa4d135..8eef6f9b 100644
--- a/cmd/micro/settings.go
+++ b/cmd/micro/settings.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"encoding/json"
 	"errors"
 	"io/ioutil"
 	"os"
@@ -9,6 +8,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/yosuke-furukawa/json5/encoding/json5"
 	"github.com/zyedidia/glob"
 )
 
@@ -30,7 +30,7 @@ func InitGlobalSettings() {
 				return
 			}
 
-			err = json.Unmarshal(input, &parsed)
+			err = json5.Unmarshal(input, &parsed)
 			if err != nil {
 				TermMessage("Error reading settings.json:", err.Error())
 			}
@@ -70,7 +70,7 @@ func InitLocalSettings(buf *Buffer) {
 			return
 		}
 
-		err = json.Unmarshal(input, &parsed)
+		err = json5.Unmarshal(input, &parsed)
 		if err != nil {
 			TermMessage("Error reading settings.json:", err.Error())
 		}
@@ -110,7 +110,7 @@ func WriteSettings(filename string) error {
 					return err
 				}
 
-				err = json.Unmarshal(input, &parsed)
+				err = json5.Unmarshal(input, &parsed)
 				if err != nil {
 					TermMessage("Error reading settings.json:", err.Error())
 				}
@@ -125,7 +125,7 @@ func WriteSettings(filename string) error {
 			}
 		}
 
-		txt, _ := json.MarshalIndent(parsed, "", "    ")
+		txt, _ := json5.MarshalIndent(parsed, "", "    ")
 		err = ioutil.WriteFile(filename, txt, 0644)
 	}
 	return err