From 7fb60add94a211de7f7f370d1aacc740c25d6580 Mon Sep 17 00:00:00 2001 From: Jonathan Apodaca Date: Wed, 19 Mar 2025 22:29:33 -0600 Subject: [PATCH] move away from vim.opt_global to vim.go --- lua/u/state.lua | 4 ++-- lua/u/utils.lua | 2 +- spec/withbuf.lua | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/u/state.lua b/lua/u/state.lua index 882fc56..f71e182 100644 --- a/lua/u/state.lua +++ b/lua/u/state.lua @@ -64,7 +64,7 @@ function State:track_mark(mark) self.marks[mark] = vim.api.nvim_buf_get_mark(sel function State:track_pos(pos) self.positions[pos] = vim.fn.getpos(pos) end ---@param nm string -function State:track_global_option(nm) self.global_options[nm] = vim.g[nm] end +function State:track_global_option(nm) self.global_options[nm] = vim.go[nm] end function State:track_winview() self.win_view = vim.fn.winsaveview() end @@ -82,7 +82,7 @@ function State:restore() vim.keymap.set(map.mode, map.lhs, map.rhs, { buffer = map.buffer }) end for nm, val in pairs(self.global_options) do - vim.g[nm] = val + vim.go[nm] = val end if self.win_view ~= nil then vim.fn.winrestview(self.win_view) end end diff --git a/lua/u/utils.lua b/lua/u/utils.lua index 228a9d2..f9a2403 100644 --- a/lua/u/utils.lua +++ b/lua/u/utils.lua @@ -76,7 +76,7 @@ function M.define_text_object(key_seq, fn, opts) local p = range_or_pos --[[@as Pos]] State.run(0, function(s) s:track_global_option 'eventignore' - vim.opt_global.eventignore = 'all' + vim.go.eventignore = 'all' -- insert a single space, so we can select it: vim.api.nvim_buf_set_text(0, p.lnum, p.col, p.lnum, p.col, { ' ' }) diff --git a/spec/withbuf.lua b/spec/withbuf.lua index 4121087..9fe85b7 100644 --- a/spec/withbuf.lua +++ b/spec/withbuf.lua @@ -1,5 +1,5 @@ local function withbuf(lines, f) - vim.opt_global.swapfile = false + vim.go.swapfile = false vim.cmd.new() vim.api.nvim_buf_set_lines(0, 0, -1, false, lines)