1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
|
Description: Use the original fork for now.
Author: Utkarsh Gupta <utkarsh@debian.org>
Forwarded: https://github.com/zyedidia/micro/issues/1498
Last-Update: 2020-02-21
--- a/go.sum
+++ b/go.sum
@@ -49,8 +49,8 @@
github.com/zyedidia/go-runewidth v0.0.12/go.mod h1:vF8djYdLmG8BJaUZ4CznFYCJ3pFR8m4B4VinTvTTarU=
github.com/zyedidia/go-shellquote v0.0.0-20200613203517-eccd813c0655 h1:Z3RhH6hvcSx7eX6Q/pP6YVsgea/1eMDG99vtWwi3nK4=
github.com/zyedidia/go-shellquote v0.0.0-20200613203517-eccd813c0655/go.mod h1:1sTqqO+kcYzZp43M5VsJe1tns9IzlSeC9jB6c2+o/5Y=
-github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d h1:zmDMkh22zXOB7gz8jFaI4GpI7llsPgzm38/jG0UgxjE=
-github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d/go.mod h1:NDJSTTYWivnza6zkRapeX2/LwhKPEMQ7bJxqgDVT78I=
+github.com/flynn/json5 v0.0.0-20200102012142-2da050b1a98d h1:zmDMkh22zXOB7gz8jFaI4GpI7llsPgzm38/jG0UgxjE=
+github.com/flynn/json5 v0.0.0-20200102012142-2da050b1a98d/go.mod h1:NDJSTTYWivnza6zkRapeX2/LwhKPEMQ7bJxqgDVT78I=
github.com/zyedidia/poller v1.0.1 h1:Tt9S3AxAjXwWGNiC2TUdRJkQDZSzCBNVQ4xXiQ7440s=
github.com/zyedidia/poller v1.0.1/go.mod h1:vZXJOHGDcuK08GXhF6IAY0ZFd2WcgOR5DOTp84Uk5eE=
github.com/zyedidia/pty v1.1.15 h1:XlxMFph7HDvTn4sDG8Klgmb/g4ATGiSj4655vAETp1U=
--- a/internal/action/bindings.go
+++ b/internal/action/bindings.go
@@ -11,7 +11,7 @@
"strings"
"unicode"
- "github.com/zyedidia/json5"
+ "github.com/flynn/json5"
"github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/tcell/v2"
--- a/internal/config/plugin_installer.go
+++ b/internal/config/plugin_installer.go
@@ -15,7 +15,7 @@
"github.com/blang/semver"
lua "github.com/yuin/gopher-lua"
- "github.com/zyedidia/json5"
+ "github.com/flynn/json5"
ulua "github.com/zyedidia/micro/v2/internal/lua"
"github.com/zyedidia/micro/v2/internal/util"
)
--- a/internal/config/plugin_installer_test.go
+++ b/internal/config/plugin_installer_test.go
@@ -5,7 +5,7 @@
"github.com/blang/semver"
- "github.com/zyedidia/json5"
+ "github.com/flynn/json5"
)
func TestDependencyResolving(t *testing.T) {
--- a/internal/config/settings.go
+++ b/internal/config/settings.go
@@ -12,7 +12,7 @@
"strings"
"github.com/zyedidia/glob"
- "github.com/zyedidia/json5"
+ "github.com/flynn/json5"
"github.com/zyedidia/micro/v2/internal/util"
"golang.org/x/text/encoding/htmlindex"
)
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@
github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb
github.com/zyedidia/clipper v0.1.0
github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3
- github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d
+ github.com/flynn/json5 v0.0.0-20200102012142-2da050b1a98d
github.com/zyedidia/pty v1.1.20 // indirect
github.com/zyedidia/tcell/v2 v2.0.9
github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415
|