From 9e911b5fc03c9ced66662dd8e710d9b4ec775454 Mon Sep 17 00:00:00 2001 From: Oliver Caldwell Date: Sat, 4 Jul 2020 15:49:27 +0100 Subject: [PATCH] conjure.config2 -> conjure.config --- fnl/conjure/client.fnl | 2 +- fnl/conjure/client/clojure/nrepl/action.fnl | 2 +- fnl/conjure/client/clojure/nrepl/init.fnl | 2 +- fnl/conjure/client/clojure/nrepl/server.fnl | 2 +- fnl/conjure/client/fennel/aniseed.fnl | 2 +- fnl/conjure/client/janet/netrepl/init.fnl | 2 +- fnl/conjure/client/janet/netrepl/server.fnl | 2 +- fnl/conjure/{config2.fnl => config.fnl} | 2 +- fnl/conjure/eval.fnl | 2 +- fnl/conjure/extract.fnl | 2 +- fnl/conjure/log.fnl | 2 +- fnl/conjure/main.fnl | 2 +- fnl/conjure/mapping.fnl | 2 +- fnl/conjure/school.fnl | 2 +- lua/conjure/client.lua | 4 ++-- lua/conjure/client/clojure/nrepl/action.lua | 4 ++-- lua/conjure/client/clojure/nrepl/init.lua | 4 ++-- lua/conjure/client/clojure/nrepl/server.lua | 4 ++-- lua/conjure/client/fennel/aniseed.lua | 4 ++-- lua/conjure/client/janet/netrepl/init.lua | 4 ++-- lua/conjure/client/janet/netrepl/server.lua | 4 ++-- lua/conjure/{config2.lua => config.lua} | 2 +- lua/conjure/eval.lua | 4 ++-- lua/conjure/extract.lua | 4 ++-- lua/conjure/log.lua | 4 ++-- lua/conjure/main.lua | 4 ++-- lua/conjure/mapping.lua | 4 ++-- lua/conjure/school.lua | 4 ++-- rplugin/python3/deoplete/sources/conjure.py | 2 +- 29 files changed, 42 insertions(+), 42 deletions(-) rename fnl/conjure/{config2.fnl => config.fnl} (98%) rename lua/conjure/{config2.lua => config.lua} (99%) diff --git a/fnl/conjure/client.fnl b/fnl/conjure/client.fnl index a0cc1ba6..9554fa0b 100644 --- a/fnl/conjure/client.fnl +++ b/fnl/conjure/client.fnl @@ -2,7 +2,7 @@ {require {a conjure.aniseed.core nvim conjure.aniseed.nvim fennel conjure.aniseed.fennel - config conjure.config2}}) + config conjure.config}}) (defonce- loaded {}) diff --git a/fnl/conjure/client/clojure/nrepl/action.fnl b/fnl/conjure/client/clojure/nrepl/action.fnl index 05db7b64..36a011b6 100644 --- a/fnl/conjure/client/clojure/nrepl/action.fnl +++ b/fnl/conjure/client/clojure/nrepl/action.fnl @@ -10,7 +10,7 @@ str conjure.aniseed.string nvim conjure.aniseed.nvim view conjure.aniseed.view - config conjure.config2 + config conjure.config state conjure.client.clojure.nrepl.state server conjure.client.clojure.nrepl.server ui conjure.client.clojure.nrepl.ui diff --git a/fnl/conjure/client/clojure/nrepl/init.fnl b/fnl/conjure/client/clojure/nrepl/init.fnl index c19e009b..aa317a14 100644 --- a/fnl/conjure/client/clojure/nrepl/init.fnl +++ b/fnl/conjure/client/clojure/nrepl/init.fnl @@ -5,7 +5,7 @@ bridge conjure.bridge eval conjure.eval str conjure.aniseed.string - config conjure.config2 + config conjure.config action conjure.client.clojure.nrepl.action}}) (def buf-suffix ".cljc") diff --git a/fnl/conjure/client/clojure/nrepl/server.fnl b/fnl/conjure/client/clojure/nrepl/server.fnl index c2ee30a1..26503ae1 100644 --- a/fnl/conjure/client/clojure/nrepl/server.fnl +++ b/fnl/conjure/client/clojure/nrepl/server.fnl @@ -9,7 +9,7 @@ bencode conjure.bencode bencode-stream conjure.bencode-stream state conjure.client.clojure.nrepl.state - config conjure.config2 + config conjure.config ui conjure.client.clojure.nrepl.ui}}) (defn with-conn-or-warn [f opts] diff --git a/fnl/conjure/client/fennel/aniseed.fnl b/fnl/conjure/client/fennel/aniseed.fnl index d3f080d1..4d9fb97c 100644 --- a/fnl/conjure/client/fennel/aniseed.fnl +++ b/fnl/conjure/client/fennel/aniseed.fnl @@ -7,7 +7,7 @@ mapping conjure.mapping text conjure.text log conjure.log - config conjure.config2 + config conjure.config extract conjure.extract}}) (def buf-suffix ".fnl") diff --git a/fnl/conjure/client/janet/netrepl/init.fnl b/fnl/conjure/client/janet/netrepl/init.fnl index bbeadc0e..7396c426 100644 --- a/fnl/conjure/client/janet/netrepl/init.fnl +++ b/fnl/conjure/client/janet/netrepl/init.fnl @@ -5,7 +5,7 @@ mapping conjure.mapping text conjure.text ui conjure.client.janet.netrepl.ui - config conjure.config2 + config conjure.config server conjure.client.janet.netrepl.server}}) (def buf-suffix ".janet") diff --git a/fnl/conjure/client/janet/netrepl/server.fnl b/fnl/conjure/client/janet/netrepl/server.fnl index a4d7a12a..2b6aa719 100644 --- a/fnl/conjure/client/janet/netrepl/server.fnl +++ b/fnl/conjure/client/janet/netrepl/server.fnl @@ -4,7 +4,7 @@ net conjure.net log conjure.log client conjure.client - config conjure.config2 + config conjure.config trn conjure.client.janet.netrepl.transport}}) (defonce- state diff --git a/fnl/conjure/config2.fnl b/fnl/conjure/config.fnl similarity index 98% rename from fnl/conjure/config2.fnl rename to fnl/conjure/config.fnl index 43587705..ff44292f 100644 --- a/fnl/conjure/config2.fnl +++ b/fnl/conjure/config.fnl @@ -1,4 +1,4 @@ -(module conjure.config2 +(module conjure.config {require {nvim conjure.aniseed.nvim a conjure.aniseed.core str conjure.aniseed.string}}) diff --git a/fnl/conjure/eval.fnl b/fnl/conjure/eval.fnl index 0d707d48..80c654ad 100644 --- a/fnl/conjure/eval.fnl +++ b/fnl/conjure/eval.fnl @@ -5,7 +5,7 @@ client conjure.client text conjure.text fs conjure.fs - config conjure.config2 + config conjure.config promise conjure.promise editor conjure.editor buffer conjure.buffer diff --git a/fnl/conjure/extract.fnl b/fnl/conjure/extract.fnl index 028165e9..911cbcd9 100644 --- a/fnl/conjure/extract.fnl +++ b/fnl/conjure/extract.fnl @@ -3,7 +3,7 @@ nvim conjure.aniseed.nvim nu conjure.aniseed.nvim.util str conjure.aniseed.string - config conjure.config2 + config conjure.config client conjure.client}}) (defn- read-range [[srow scol] [erow ecol]] diff --git a/fnl/conjure/log.fnl b/fnl/conjure/log.fnl index 1c17f856..41f6a3d7 100644 --- a/fnl/conjure/log.fnl +++ b/fnl/conjure/log.fnl @@ -4,7 +4,7 @@ str conjure.aniseed.string buffer conjure.buffer client conjure.client - config conjure.config2 + config conjure.config view conjure.aniseed.view text conjure.text editor conjure.editor diff --git a/fnl/conjure/main.fnl b/fnl/conjure/main.fnl index 2302c4d5..c0e62edc 100644 --- a/fnl/conjure/main.fnl +++ b/fnl/conjure/main.fnl @@ -1,6 +1,6 @@ (module conjure.main {require {mapping conjure.mapping - config conjure.config2}}) + config conjure.config}}) (defn main [] (mapping.init (config.filetypes))) diff --git a/fnl/conjure/mapping.fnl b/fnl/conjure/mapping.fnl index 65ae12a8..570eb324 100644 --- a/fnl/conjure/mapping.fnl +++ b/fnl/conjure/mapping.fnl @@ -2,7 +2,7 @@ {require {nvim conjure.aniseed.nvim a conjure.aniseed.core str conjure.aniseed.string - config conjure.config2 + config conjure.config extract conjure.extract client conjure.client eval conjure.eval diff --git a/fnl/conjure/school.fnl b/fnl/conjure/school.fnl index 27484dca..8a11f1f6 100644 --- a/fnl/conjure/school.fnl +++ b/fnl/conjure/school.fnl @@ -1,7 +1,7 @@ (module conjure.school {require {nvim conjure.aniseed.nvim buffer conjure.buffer - config conjure.config2 + config conjure.config editor conjure.editor a conjure.aniseed.core}}) diff --git a/lua/conjure/client.lua b/lua/conjure/client.lua index 05aa087e..36283bbd 100644 --- a/lua/conjure/client.lua +++ b/lua/conjure/client.lua @@ -15,8 +15,8 @@ do _0_0 = module_23_0_ end local function _1_(...) - _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", config = "conjure.config2", fennel = "conjure.aniseed.fennel", nvim = "conjure.aniseed.nvim"}} - return {require("conjure.aniseed.core"), require("conjure.config2"), require("conjure.aniseed.fennel"), require("conjure.aniseed.nvim")} + _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", config = "conjure.config", fennel = "conjure.aniseed.fennel", nvim = "conjure.aniseed.nvim"}} + return {require("conjure.aniseed.core"), require("conjure.config"), require("conjure.aniseed.fennel"), require("conjure.aniseed.nvim")} end local _2_ = _1_(...) local a = _2_[1] diff --git a/lua/conjure/client/clojure/nrepl/action.lua b/lua/conjure/client/clojure/nrepl/action.lua index de765664..d061ff75 100644 --- a/lua/conjure/client/clojure/nrepl/action.lua +++ b/lua/conjure/client/clojure/nrepl/action.lua @@ -15,8 +15,8 @@ do _0_0 = module_23_0_ end local function _1_(...) - _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", client = "conjure.client", config = "conjure.config2", editor = "conjure.editor", eval = "conjure.aniseed.eval", extract = "conjure.extract", fs = "conjure.fs", ll = "conjure.linked-list", log = "conjure.log", nvim = "conjure.aniseed.nvim", server = "conjure.client.clojure.nrepl.server", state = "conjure.client.clojure.nrepl.state", str = "conjure.aniseed.string", text = "conjure.text", ui = "conjure.client.clojure.nrepl.ui", view = "conjure.aniseed.view"}} - return {require("conjure.aniseed.core"), require("conjure.client"), require("conjure.config2"), require("conjure.editor"), require("conjure.aniseed.eval"), require("conjure.extract"), require("conjure.fs"), require("conjure.linked-list"), require("conjure.log"), require("conjure.aniseed.nvim"), require("conjure.client.clojure.nrepl.server"), require("conjure.client.clojure.nrepl.state"), require("conjure.aniseed.string"), require("conjure.text"), require("conjure.client.clojure.nrepl.ui"), require("conjure.aniseed.view")} + _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", client = "conjure.client", config = "conjure.config", editor = "conjure.editor", eval = "conjure.aniseed.eval", extract = "conjure.extract", fs = "conjure.fs", ll = "conjure.linked-list", log = "conjure.log", nvim = "conjure.aniseed.nvim", server = "conjure.client.clojure.nrepl.server", state = "conjure.client.clojure.nrepl.state", str = "conjure.aniseed.string", text = "conjure.text", ui = "conjure.client.clojure.nrepl.ui", view = "conjure.aniseed.view"}} + return {require("conjure.aniseed.core"), require("conjure.client"), require("conjure.config"), require("conjure.editor"), require("conjure.aniseed.eval"), require("conjure.extract"), require("conjure.fs"), require("conjure.linked-list"), require("conjure.log"), require("conjure.aniseed.nvim"), require("conjure.client.clojure.nrepl.server"), require("conjure.client.clojure.nrepl.state"), require("conjure.aniseed.string"), require("conjure.text"), require("conjure.client.clojure.nrepl.ui"), require("conjure.aniseed.view")} end local _2_ = _1_(...) local a = _2_[1] diff --git a/lua/conjure/client/clojure/nrepl/init.lua b/lua/conjure/client/clojure/nrepl/init.lua index 942b3fff..547d1e29 100644 --- a/lua/conjure/client/clojure/nrepl/init.lua +++ b/lua/conjure/client/clojure/nrepl/init.lua @@ -15,8 +15,8 @@ do _0_0 = module_23_0_ end local function _1_(...) - _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", action = "conjure.client.clojure.nrepl.action", bridge = "conjure.bridge", config = "conjure.config2", eval = "conjure.eval", mapping = "conjure.mapping", nvim = "conjure.aniseed.nvim", str = "conjure.aniseed.string"}} - return {require("conjure.aniseed.core"), require("conjure.client.clojure.nrepl.action"), require("conjure.bridge"), require("conjure.config2"), require("conjure.eval"), require("conjure.mapping"), require("conjure.aniseed.nvim"), require("conjure.aniseed.string")} + _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", action = "conjure.client.clojure.nrepl.action", bridge = "conjure.bridge", config = "conjure.config", eval = "conjure.eval", mapping = "conjure.mapping", nvim = "conjure.aniseed.nvim", str = "conjure.aniseed.string"}} + return {require("conjure.aniseed.core"), require("conjure.client.clojure.nrepl.action"), require("conjure.bridge"), require("conjure.config"), require("conjure.eval"), require("conjure.mapping"), require("conjure.aniseed.nvim"), require("conjure.aniseed.string")} end local _2_ = _1_(...) local a = _2_[1] diff --git a/lua/conjure/client/clojure/nrepl/server.lua b/lua/conjure/client/clojure/nrepl/server.lua index 19fa954a..4f5e5bc7 100644 --- a/lua/conjure/client/clojure/nrepl/server.lua +++ b/lua/conjure/client/clojure/nrepl/server.lua @@ -15,8 +15,8 @@ do _0_0 = module_23_0_ end local function _1_(...) - _0_0["aniseed/local-fns"] = {require = {["bencode-stream"] = "conjure.bencode-stream", a = "conjure.aniseed.core", bencode = "conjure.bencode", client = "conjure.client", config = "conjure.config2", extract = "conjure.extract", log = "conjure.log", net = "conjure.net", state = "conjure.client.clojure.nrepl.state", str = "conjure.aniseed.string", ui = "conjure.client.clojure.nrepl.ui", uuid = "conjure.uuid"}} - return {require("conjure.aniseed.core"), require("conjure.bencode"), require("conjure.bencode-stream"), require("conjure.client"), require("conjure.config2"), require("conjure.extract"), require("conjure.log"), require("conjure.net"), require("conjure.client.clojure.nrepl.state"), require("conjure.aniseed.string"), require("conjure.client.clojure.nrepl.ui"), require("conjure.uuid")} + _0_0["aniseed/local-fns"] = {require = {["bencode-stream"] = "conjure.bencode-stream", a = "conjure.aniseed.core", bencode = "conjure.bencode", client = "conjure.client", config = "conjure.config", extract = "conjure.extract", log = "conjure.log", net = "conjure.net", state = "conjure.client.clojure.nrepl.state", str = "conjure.aniseed.string", ui = "conjure.client.clojure.nrepl.ui", uuid = "conjure.uuid"}} + return {require("conjure.aniseed.core"), require("conjure.bencode"), require("conjure.bencode-stream"), require("conjure.client"), require("conjure.config"), require("conjure.extract"), require("conjure.log"), require("conjure.net"), require("conjure.client.clojure.nrepl.state"), require("conjure.aniseed.string"), require("conjure.client.clojure.nrepl.ui"), require("conjure.uuid")} end local _2_ = _1_(...) local a = _2_[1] diff --git a/lua/conjure/client/fennel/aniseed.lua b/lua/conjure/client/fennel/aniseed.lua index 5906b8da..5ce535d8 100644 --- a/lua/conjure/client/fennel/aniseed.lua +++ b/lua/conjure/client/fennel/aniseed.lua @@ -15,8 +15,8 @@ do _0_0 = module_23_0_ end local function _1_(...) - _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", client = "conjure.client", config = "conjure.config2", extract = "conjure.extract", log = "conjure.log", mapping = "conjure.mapping", nvim = "conjure.aniseed.nvim", str = "conjure.aniseed.string", text = "conjure.text", view = "conjure.aniseed.view"}} - return {require("conjure.aniseed.core"), require("conjure.client"), require("conjure.config2"), require("conjure.extract"), require("conjure.log"), require("conjure.mapping"), require("conjure.aniseed.nvim"), require("conjure.aniseed.string"), require("conjure.text"), require("conjure.aniseed.view")} + _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", client = "conjure.client", config = "conjure.config", extract = "conjure.extract", log = "conjure.log", mapping = "conjure.mapping", nvim = "conjure.aniseed.nvim", str = "conjure.aniseed.string", text = "conjure.text", view = "conjure.aniseed.view"}} + return {require("conjure.aniseed.core"), require("conjure.client"), require("conjure.config"), require("conjure.extract"), require("conjure.log"), require("conjure.mapping"), require("conjure.aniseed.nvim"), require("conjure.aniseed.string"), require("conjure.text"), require("conjure.aniseed.view")} end local _2_ = _1_(...) local a = _2_[1] diff --git a/lua/conjure/client/janet/netrepl/init.lua b/lua/conjure/client/janet/netrepl/init.lua index e447d81e..3fab09fa 100644 --- a/lua/conjure/client/janet/netrepl/init.lua +++ b/lua/conjure/client/janet/netrepl/init.lua @@ -15,8 +15,8 @@ do _0_0 = module_23_0_ end local function _1_(...) - _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", bridge = "conjure.bridge", config = "conjure.config2", mapping = "conjure.mapping", nvim = "conjure.aniseed.nvim", server = "conjure.client.janet.netrepl.server", text = "conjure.text", ui = "conjure.client.janet.netrepl.ui"}} - return {require("conjure.aniseed.core"), require("conjure.bridge"), require("conjure.config2"), require("conjure.mapping"), require("conjure.aniseed.nvim"), require("conjure.client.janet.netrepl.server"), require("conjure.text"), require("conjure.client.janet.netrepl.ui")} + _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", bridge = "conjure.bridge", config = "conjure.config", mapping = "conjure.mapping", nvim = "conjure.aniseed.nvim", server = "conjure.client.janet.netrepl.server", text = "conjure.text", ui = "conjure.client.janet.netrepl.ui"}} + return {require("conjure.aniseed.core"), require("conjure.bridge"), require("conjure.config"), require("conjure.mapping"), require("conjure.aniseed.nvim"), require("conjure.client.janet.netrepl.server"), require("conjure.text"), require("conjure.client.janet.netrepl.ui")} end local _2_ = _1_(...) local a = _2_[1] diff --git a/lua/conjure/client/janet/netrepl/server.lua b/lua/conjure/client/janet/netrepl/server.lua index 098c2e46..a1f642e2 100644 --- a/lua/conjure/client/janet/netrepl/server.lua +++ b/lua/conjure/client/janet/netrepl/server.lua @@ -15,8 +15,8 @@ do _0_0 = module_23_0_ end local function _1_(...) - _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", client = "conjure.client", config = "conjure.config2", log = "conjure.log", net = "conjure.net", trn = "conjure.client.janet.netrepl.transport", ui = "conjure.client.janet.netrepl.ui"}} - return {require("conjure.aniseed.core"), require("conjure.client"), require("conjure.config2"), require("conjure.log"), require("conjure.net"), require("conjure.client.janet.netrepl.transport"), require("conjure.client.janet.netrepl.ui")} + _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", client = "conjure.client", config = "conjure.config", log = "conjure.log", net = "conjure.net", trn = "conjure.client.janet.netrepl.transport", ui = "conjure.client.janet.netrepl.ui"}} + return {require("conjure.aniseed.core"), require("conjure.client"), require("conjure.config"), require("conjure.log"), require("conjure.net"), require("conjure.client.janet.netrepl.transport"), require("conjure.client.janet.netrepl.ui")} end local _2_ = _1_(...) local a = _2_[1] diff --git a/lua/conjure/config2.lua b/lua/conjure/config.lua similarity index 99% rename from lua/conjure/config2.lua rename to lua/conjure/config.lua index cc9a3893..65a283a7 100644 --- a/lua/conjure/config2.lua +++ b/lua/conjure/config.lua @@ -1,6 +1,6 @@ local _0_0 = nil do - local name_23_0_ = "conjure.config2" + local name_23_0_ = "conjure.config" local loaded_23_0_ = package.loaded[name_23_0_] local module_23_0_ = nil if ("table" == type(loaded_23_0_)) then diff --git a/lua/conjure/eval.lua b/lua/conjure/eval.lua index b3bb5a06..fe3115f7 100644 --- a/lua/conjure/eval.lua +++ b/lua/conjure/eval.lua @@ -15,8 +15,8 @@ do _0_0 = module_23_0_ end local function _1_(...) - _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", buffer = "conjure.buffer", client = "conjure.client", config = "conjure.config2", editor = "conjure.editor", extract = "conjure.extract", fs = "conjure.fs", log = "conjure.log", nvim = "conjure.aniseed.nvim", promise = "conjure.promise", text = "conjure.text", uuid = "conjure.uuid"}} - return {require("conjure.aniseed.core"), require("conjure.buffer"), require("conjure.client"), require("conjure.config2"), require("conjure.editor"), require("conjure.extract"), require("conjure.fs"), require("conjure.log"), require("conjure.aniseed.nvim"), require("conjure.promise"), require("conjure.text"), require("conjure.uuid")} + _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", buffer = "conjure.buffer", client = "conjure.client", config = "conjure.config", editor = "conjure.editor", extract = "conjure.extract", fs = "conjure.fs", log = "conjure.log", nvim = "conjure.aniseed.nvim", promise = "conjure.promise", text = "conjure.text", uuid = "conjure.uuid"}} + return {require("conjure.aniseed.core"), require("conjure.buffer"), require("conjure.client"), require("conjure.config"), require("conjure.editor"), require("conjure.extract"), require("conjure.fs"), require("conjure.log"), require("conjure.aniseed.nvim"), require("conjure.promise"), require("conjure.text"), require("conjure.uuid")} end local _2_ = _1_(...) local a = _2_[1] diff --git a/lua/conjure/extract.lua b/lua/conjure/extract.lua index 1b248f08..686818a6 100644 --- a/lua/conjure/extract.lua +++ b/lua/conjure/extract.lua @@ -15,8 +15,8 @@ do _0_0 = module_23_0_ end local function _1_(...) - _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", client = "conjure.client", config = "conjure.config2", nu = "conjure.aniseed.nvim.util", nvim = "conjure.aniseed.nvim", str = "conjure.aniseed.string"}} - return {require("conjure.aniseed.core"), require("conjure.client"), require("conjure.config2"), require("conjure.aniseed.nvim.util"), require("conjure.aniseed.nvim"), require("conjure.aniseed.string")} + _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", client = "conjure.client", config = "conjure.config", nu = "conjure.aniseed.nvim.util", nvim = "conjure.aniseed.nvim", str = "conjure.aniseed.string"}} + return {require("conjure.aniseed.core"), require("conjure.client"), require("conjure.config"), require("conjure.aniseed.nvim.util"), require("conjure.aniseed.nvim"), require("conjure.aniseed.string")} end local _2_ = _1_(...) local a = _2_[1] diff --git a/lua/conjure/log.lua b/lua/conjure/log.lua index 5db5eef5..df42acfd 100644 --- a/lua/conjure/log.lua +++ b/lua/conjure/log.lua @@ -15,8 +15,8 @@ do _0_0 = module_23_0_ end local function _1_(...) - _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", buffer = "conjure.buffer", client = "conjure.client", config = "conjure.config2", editor = "conjure.editor", nvim = "conjure.aniseed.nvim", str = "conjure.aniseed.string", text = "conjure.text", timer = "conjure.timer", view = "conjure.aniseed.view"}} - return {require("conjure.aniseed.core"), require("conjure.buffer"), require("conjure.client"), require("conjure.config2"), require("conjure.editor"), require("conjure.aniseed.nvim"), require("conjure.aniseed.string"), require("conjure.text"), require("conjure.timer"), require("conjure.aniseed.view")} + _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", buffer = "conjure.buffer", client = "conjure.client", config = "conjure.config", editor = "conjure.editor", nvim = "conjure.aniseed.nvim", str = "conjure.aniseed.string", text = "conjure.text", timer = "conjure.timer", view = "conjure.aniseed.view"}} + return {require("conjure.aniseed.core"), require("conjure.buffer"), require("conjure.client"), require("conjure.config"), require("conjure.editor"), require("conjure.aniseed.nvim"), require("conjure.aniseed.string"), require("conjure.text"), require("conjure.timer"), require("conjure.aniseed.view")} end local _2_ = _1_(...) local a = _2_[1] diff --git a/lua/conjure/main.lua b/lua/conjure/main.lua index 0fec47ac..b952a182 100644 --- a/lua/conjure/main.lua +++ b/lua/conjure/main.lua @@ -15,8 +15,8 @@ do _0_0 = module_23_0_ end local function _1_(...) - _0_0["aniseed/local-fns"] = {require = {config = "conjure.config2", mapping = "conjure.mapping"}} - return {require("conjure.config2"), require("conjure.mapping")} + _0_0["aniseed/local-fns"] = {require = {config = "conjure.config", mapping = "conjure.mapping"}} + return {require("conjure.config"), require("conjure.mapping")} end local _2_ = _1_(...) local config = _2_[1] diff --git a/lua/conjure/mapping.lua b/lua/conjure/mapping.lua index 478685ce..42d6a196 100644 --- a/lua/conjure/mapping.lua +++ b/lua/conjure/mapping.lua @@ -15,8 +15,8 @@ do _0_0 = module_23_0_ end local function _1_(...) - _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", bridge = "conjure.bridge", client = "conjure.client", config = "conjure.config2", eval = "conjure.eval", extract = "conjure.extract", fennel = "conjure.aniseed.fennel", nvim = "conjure.aniseed.nvim", str = "conjure.aniseed.string"}} - return {require("conjure.aniseed.core"), require("conjure.bridge"), require("conjure.client"), require("conjure.config2"), require("conjure.eval"), require("conjure.extract"), require("conjure.aniseed.fennel"), require("conjure.aniseed.nvim"), require("conjure.aniseed.string")} + _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", bridge = "conjure.bridge", client = "conjure.client", config = "conjure.config", eval = "conjure.eval", extract = "conjure.extract", fennel = "conjure.aniseed.fennel", nvim = "conjure.aniseed.nvim", str = "conjure.aniseed.string"}} + return {require("conjure.aniseed.core"), require("conjure.bridge"), require("conjure.client"), require("conjure.config"), require("conjure.eval"), require("conjure.extract"), require("conjure.aniseed.fennel"), require("conjure.aniseed.nvim"), require("conjure.aniseed.string")} end local _2_ = _1_(...) local a = _2_[1] diff --git a/lua/conjure/school.lua b/lua/conjure/school.lua index aa4e2bfc..c64ef137 100644 --- a/lua/conjure/school.lua +++ b/lua/conjure/school.lua @@ -15,8 +15,8 @@ do _0_0 = module_23_0_ end local function _1_(...) - _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", buffer = "conjure.buffer", config = "conjure.config2", editor = "conjure.editor", nvim = "conjure.aniseed.nvim"}} - return {require("conjure.aniseed.core"), require("conjure.buffer"), require("conjure.config2"), require("conjure.editor"), require("conjure.aniseed.nvim")} + _0_0["aniseed/local-fns"] = {require = {a = "conjure.aniseed.core", buffer = "conjure.buffer", config = "conjure.config", editor = "conjure.editor", nvim = "conjure.aniseed.nvim"}} + return {require("conjure.aniseed.core"), require("conjure.buffer"), require("conjure.config"), require("conjure.editor"), require("conjure.aniseed.nvim")} end local _2_ = _1_(...) local a = _2_[1] diff --git a/rplugin/python3/deoplete/sources/conjure.py b/rplugin/python3/deoplete/sources/conjure.py index 8f62f86b..e59b0cbc 100644 --- a/rplugin/python3/deoplete/sources/conjure.py +++ b/rplugin/python3/deoplete/sources/conjure.py @@ -9,7 +9,7 @@ def __init__(self, vim): self.vim = vim self.name = "conjure" - self.filetypes = self.lua("conjure.config2", "filetypes") + self.filetypes = self.lua("conjure.config", "filetypes") self.rank = 500 def lua(self, module, f, *args):