Bump minimum orgmode version, which introduces fix to promise:wait();…

… remove patch to promise:wait()
chipsenkbeil · May 6, 2024 · 8257b07 · 8257b07
1 parent 326d750
commit 8257b07
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 106 deletions.
diff --git a/DOCS.org b/DOCS.org
@@ -6,7 +6,7 @@
 
 ** Installation
 
-   This plugin depends on [[https://github.com/nvim-orgmode/orgmode][nvim-orgmode/orgmode]] @ [[https://github.com/nvim-orgmode/orgmode/commit/d4cc3210f235a845de8d372d02482163d31ded93][commit d4cc321]].
+   This plugin depends on [[https://github.com/nvim-orgmode/orgmode][nvim-orgmode/orgmode]] @ [[https://github.com/nvim-orgmode/orgmode/commit/03a207898671c3070ed5eccbe3528bc48ee8d09e][commit 03a2078]].
 
 *** lazy.nvim
 
@@ -16,7 +16,7 @@
       dependencies = {
         {
           "nvim-orgmode/orgmode",
-          commit = "d4cc3210f235a845de8d372d02482163d31ded93",
+          commit = "03a207898671c3070ed5eccbe3528bc48ee8d09e",
         },
       },
       config = function()
@@ -35,7 +35,7 @@
       requires = {
         {
           "nvim-orgmode/orgmode",
-          commit = "d4cc3210f235a845de8d372d02482163d31ded93",
+          commit = "03a207898671c3070ed5eccbe3528bc48ee8d09e",
         },
       },
       config = function()

diff --git a/README.org b/README.org
@@ -9,7 +9,7 @@
 
 ** Installation
 
-   This plugin depends on [[https://github.com/nvim-orgmode/orgmode][nvim-orgmode/orgmode]] @ [[https://github.com/nvim-orgmode/orgmode/commit/d4cc3210f235a845de8d372d02482163d31ded93][commit d4cc321]].
+   This plugin depends on [[https://github.com/nvim-orgmode/orgmode][nvim-orgmode/orgmode]] @ [[https://github.com/nvim-orgmode/orgmode/commit/03a207898671c3070ed5eccbe3528bc48ee8d09e][commit 03a2078]].
 
 *** lazy.nvim (recommended)
 
@@ -22,7 +22,7 @@
       dependencies = {
         {
           "nvim-orgmode/orgmode",
-          commit = "d4cc3210f235a845de8d372d02482163d31ded93",
+          commit = "03a207898671c3070ed5eccbe3528bc48ee8d09e",
         },
       },
       config = function()
@@ -46,7 +46,7 @@
       requires = {
         {
           "nvim-orgmode/orgmode",
-          commit = "d4cc3210f235a845de8d372d02482163d31ded93",
+          commit = "03a207898671c3070ed5eccbe3528bc48ee8d09e",
         },
       },
       config = function()

diff --git a/lua/org-roam/core/utils/promise.lua b/lua/org-roam/core/utils/promise.lua
diff --git a/lua/org-roam/core/utils/promise/packed_value.lua b/lua/org-roam/core/utils/promise/packed_value.lua
diff --git a/lua/org-roam/setup/plugin.lua b/lua/org-roam/setup/plugin.lua
@@ -46,12 +46,4 @@ return function(roam)
         -- Fall back to the default implementation
         return require("orgmode.org.mappings").open_at_point(self)
     end
-
-    -- Overwrite promise.wait to throw an error when wait fails instead of returning nil
-    --
-    -- TODO: This exists as the current wait implementation does not fail on timeout and
-    --       instead returns nil. If this is resolved, we will remove this override.
-    --
-    --       See https://github.com/nvim-orgmode/orgmode/pull/723
-    require("orgmode.utils.promise").wait = require("org-roam.core.utils.promise").wait
 end