1 files changed, 36 insertions, 26 deletions

diff --git a/src/nvim/lua/vim.lua b/src/nvim/lua/vim.lua
index eb54ff28ee..bc0770da31 100644
--- a/src/nvim/lua/vim.lua
+++ b/src/nvim/lua/vim.lua
@@ -309,7 +309,9 @@ setmetatable(vim, {
 })
 
 -- An easier alias for commands.
-vim.cmd = vim.api.nvim_command
+vim.cmd = function(command)
+  return vim.api.nvim_exec(command, false)
+end
 
 -- These are the vim.env/v/g/o/bo/wo variable magic accessors.
 do
@@ -339,32 +341,24 @@ do
     end
     return setmetatable({}, mt)
   end
-  local function pcall_ret(status, ...)
-    if status then return ... end
-  end
-  local function nil_wrap(fn)
-    return function(...)
-      return pcall_ret(pcall(fn, ...))
+  local function make_dict_accessor(scope)
+    validate {
+      scope = {scope, 's'};
+    }
+    local mt = {}
+    function mt:__newindex(k, v)
+      return vim._setvar(scope, 0, k, v)
     end
+    function mt:__index(k)
+      return vim._getvar(scope, 0, k)
+    end
+    return setmetatable({}, mt)
   end
-
-  vim.b = make_meta_accessor(
-    nil_wrap(function(v) return a.nvim_buf_get_var(0, v) end),
-    function(v, k) return a.nvim_buf_set_var(0, v, k) end,
-    function(v) return a.nvim_buf_del_var(0, v) end
-  )
-  vim.w = make_meta_accessor(
-    nil_wrap(function(v) return a.nvim_win_get_var(0, v) end),
-    function(v, k) return a.nvim_win_set_var(0, v, k) end,
-    function(v) return a.nvim_win_del_var(0, v) end
-  )
-  vim.t = make_meta_accessor(
-    nil_wrap(function(v) return a.nvim_tabpage_get_var(0, v) end),
-    function(v, k) return a.nvim_tabpage_set_var(0, v, k) end,
-    function(v) return a.nvim_tabpage_del_var(0, v) end
-  )
-  vim.g = make_meta_accessor(nil_wrap(a.nvim_get_var), a.nvim_set_var, a.nvim_del_var)
-  vim.v = make_meta_accessor(nil_wrap(a.nvim_get_vvar), a.nvim_set_vvar)
+  vim.g = make_dict_accessor('g')
+  vim.v = make_dict_accessor('v')
+  vim.b = make_dict_accessor('b')
+  vim.w = make_dict_accessor('w')
+  vim.t = make_dict_accessor('t')
   vim.o = make_meta_accessor(a.nvim_get_option, a.nvim_set_option)
 
   local function getenv(k)
@@ -398,7 +392,10 @@ do
                wfw = true;        winbl = true;      winblend = true;   winfixheight = true;
        winfixwidth = true; winhighlight = true;         winhl = true;           wrap = true;
   }
+
+  --@private
   local function new_buf_opt_accessor(bufnr)
+    --@private
     local function get(k)
       if window_options[k] then
         return a.nvim_err_writeln(k.." is a window option, not a buffer option")
@@ -408,23 +405,34 @@ do
       end
       return a.nvim_buf_get_option(bufnr or 0, k)
     end
+
+    --@private
     local function set(k, v)
       if window_options[k] then
         return a.nvim_err_writeln(k.." is a window option, not a buffer option")
       end
       return a.nvim_buf_set_option(bufnr or 0, k, v)
     end
+
     return make_meta_accessor(get, set)
   end
   vim.bo = new_buf_opt_accessor(nil)
+
+  --@private
   local function new_win_opt_accessor(winnr)
+
+    --@private
     local function get(k)
       if winnr == nil and type(k) == "number" then
         return new_win_opt_accessor(k)
       end
       return a.nvim_win_get_option(winnr or 0, k)
     end
-    local function set(k, v) return a.nvim_win_set_option(winnr or 0, k, v) end
+
+    --@private
+    local function set(k, v)
+      return a.nvim_win_set_option(winnr or 0, k, v)
+    end
     return make_meta_accessor(get, set)
   end
   vim.wo = new_win_opt_accessor(nil)
@@ -506,6 +514,8 @@ function vim.notify(msg, log_level, _opts)
 
   if log_level == vim.log.levels.ERROR then
     vim.api.nvim_err_writeln(msg)
+  elseif log_level == vim.log.levels.WARN then
+    vim.api.nvim_echo({{msg, 'WarningMsg'}}, true, {})
   else
     vim.api.nvim_echo({{msg}}, true, {})
   end