diff --git a/after/plugin/editorconfig.lua b/after/plugin/editorconfig.lua
deleted file mode 100644
index a303fbe..0000000
--- a/after/plugin/editorconfig.lua
+++ /dev/null
@@ -1,29 +0,0 @@
--- Copyright 2022 Gregory Anders
---
--- SPDX-License-Identifier: GPL-3.0-or-later
---
--- This program is free software: you can redistribute it and/or modify it under
--- the terms of the GNU General Public License as published by the Free Software
--- Foundation, either version 3 of the License, or (at your option) any later
--- version.
---
--- This program is distributed in the hope that it will be useful, but WITHOUT
--- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
--- details.
---
--- You should have received a copy of the GNU General Public License along with
--- this program.  If not, see <https://www.gnu.org/licenses/>.
-
-if vim.g.loaded_editorconfig then
-    return
-end
-vim.g.loaded_editorconfig = 1
-
-local group = vim.api.nvim_create_augroup("editorconfig", {})
-vim.api.nvim_create_autocmd({"BufNewFile", "BufRead", "BufFilePost"}, {
-    group = group,
-    callback = function(args)
-        require("editorconfig").config(args.buf)
-    end,
-})
diff --git a/after/plugin/editorconfig.vim b/after/plugin/editorconfig.vim
new file mode 100644
index 0000000..77ce1eb
--- /dev/null
+++ b/after/plugin/editorconfig.vim
@@ -0,0 +1,26 @@
+" Copyright 2022 Gregory Anders
+"
+" SPDX-License-Identifier: GPL-3.0-or-later
+"
+" This program is free software: you can redistribute it and/or modify it under
+" the terms of the GNU General Public License as published by the Free Software
+" Foundation, either version 3 of the License, or (at your option) any later
+" version.
+"
+" This program is distributed in the hope that it will be useful, but WITHOUT
+" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+" FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+" details.
+"
+" You should have received a copy of the GNU General Public License along with
+" this program.  If not, see <https://www.gnu.org/licenses/>.
+
+if exists('g:loaded_editorconfig')
+    finish
+endif
+let g:loaded_editorconfig = 1
+
+augroup editorconfig
+    autocmd!
+    autocmd BufNewFile,BufRead,BufFilePost * lua require('editorconfig').config(tonumber(vim.fn.expand('<abuf>')))
+augroup END
diff --git a/fnl/editorconfig.fnl b/fnl/editorconfig.fnl
index 29e5440..34a3bcf 100644
--- a/fnl/editorconfig.fnl
+++ b/fnl/editorconfig.fnl
@@ -79,9 +79,12 @@
 (fn properties.trim_trailing_whitespace [bufnr val]
   (assert (or (= val :true) (= val :false)) "trim_trailing_whitespace must be either 'true' or 'false'")
   (when (= val :true)
-    (vim.api.nvim_create_autocmd :BufWritePre {:group :editorconfig
-                                               :buffer bufnr
-                                               :callback trim-trailing-whitespace})))
+    (if (= (vim.fn.has :nvim-0.7) 1)
+        (vim.api.nvim_create_autocmd :BufWritePre {:group :editorconfig
+                                                   :buffer bufnr
+                                                   :callback trim-trailing-whitespace})
+        (vim.cmd (: "autocmd editorconfig BufWritePre <buffer=%d> lua require('editorconfig').trim_trailing_whitespace()"
+                    :format bufnr)))))
 
 (fn properties.insert_final_newline [bufnr val]
   (assert (or (= val :true) (= val :false)) "insert_final_newline must be either 'true' or 'false'")
@@ -165,8 +168,9 @@
       (tset vim.b bufnr :editorconfig applied))))
 
 (fn trim_trailing_whitespace []
-  (vim.notify_once (debug.traceback "editorconfig.nvim: trim_trailing_whitespace() is deprecated and will soon be removed" 2)
-                   vim.log.levels.WARN)
+  (when (= (vim.fn.has :nvim-0.7) 1)
+    (vim.notify_once (debug.traceback "editorconfig.nvim: trim_trailing_whitespace() is deprecated and will soon be removed" 2)
+                     vim.log.levels.WARN))
   (trim-trailing-whitespace))
 
 {: config
diff --git a/lua/editorconfig.lua b/lua/editorconfig.lua
index bf635d2..f61bea9 100644
--- a/lua/editorconfig.lua
+++ b/lua/editorconfig.lua
@@ -79,7 +79,11 @@ end
 properties.trim_trailing_whitespace = function(bufnr, val)
   assert(((val == "true") or (val == "false")), "trim_trailing_whitespace must be either 'true' or 'false'")
   if (val == "true") then
-    return vim.api.nvim_create_autocmd("BufWritePre", {group = "editorconfig", buffer = bufnr, callback = trim_trailing_whitespace})
+    if (vim.fn.has("nvim-0.7") == 1) then
+      return vim.api.nvim_create_autocmd("BufWritePre", {group = "editorconfig", buffer = bufnr, callback = trim_trailing_whitespace})
+    else
+      return vim.cmd(("autocmd editorconfig BufWritePre <buffer=%d> lua require('editorconfig').trim_trailing_whitespace()"):format(bufnr))
+    end
   else
     return nil
   end
@@ -110,16 +114,16 @@ local function dirname(path)
 end
 local function parse_line(line)
   if line:find("^%s*[^ #;]") then
-    local _11_ = ((line:match("%b[]") or "")):match("^%s*%[(.*)%]%s*$")
-    if (nil ~= _11_) then
-      local glob = _11_
+    local _12_ = ((line:match("%b[]") or "")):match("^%s*%[(.*)%]%s*$")
+    if (nil ~= _12_) then
+      local glob = _12_
       return glob, nil, nil
     elseif true then
-      local _ = _11_
-      local _12_, _13_ = line:match("^%s*([^:= ][^:=]-)%s*[:=]%s*(.-)%s*$")
-      if ((nil ~= _12_) and (nil ~= _13_)) then
-        local key = _12_
-        local val = _13_
+      local _ = _12_
+      local _13_, _14_ = line:match("^%s*([^:= ][^:=]-)%s*[:=]%s*(.-)%s*$")
+      if ((nil ~= _13_) and (nil ~= _14_)) then
+        local key = _13_
+        local val = _14_
         return nil, key:lower(), val:lower()
       else
         return nil
@@ -135,9 +139,9 @@ local function parse(filepath, dir)
   local pat = nil
   local opts = {}
   do
-    local _17_ = io.open((dir .. "/.editorconfig"))
-    if (nil ~= _17_) then
-      local f = _17_
+    local _18_ = io.open((dir .. "/.editorconfig"))
+    if (nil ~= _18_) then
+      local f = _18_
       local _ = f
       local function close_handlers_10_auto(ok_11_auto, ...)
         _:close()
@@ -147,30 +151,30 @@ local function parse(filepath, dir)
           return error(..., 0)
         end
       end
-      local function _19_()
+      local function _20_()
         for line in f:lines() do
-          local _20_, _21_, _22_ = parse_line(line)
-          if (nil ~= _20_) then
-            local glob = _20_
+          local _21_, _22_, _23_ = parse_line(line)
+          if (nil ~= _21_) then
+            local glob = _21_
             local glob0
             if glob:find("/") then
               glob0 = (dir .. "/" .. glob:gsub("^/", ""))
             else
               glob0 = ("**/" .. glob)
             end
-            local _24_, _25_ = pcall(glob2regpat, glob0)
-            if ((_24_ == true) and (nil ~= _25_)) then
-              local regpat = _25_
+            local _25_, _26_ = pcall(glob2regpat, glob0)
+            if ((_25_ == true) and (nil ~= _26_)) then
+              local regpat = _26_
               pat = vim.regex(regpat)
-            elseif ((_24_ == false) and (nil ~= _25_)) then
-              local err = _25_
+            elseif ((_25_ == false) and (nil ~= _26_)) then
+              local err = _26_
               pat = nil
               warn(("editorconfig: Error occurred while parsing glob pattern '%s': %s"):format(glob0, err))
             else
             end
-          elseif ((_20_ == nil) and (nil ~= _21_) and (nil ~= _22_)) then
-            local key = _21_
-            local val = _22_
+          elseif ((_21_ == nil) and (nil ~= _22_) and (nil ~= _23_)) then
+            local key = _22_
+            local val = _23_
             if (key == "root") then
               opts["root"] = (val == "true")
             elseif (pat and pat:match_str(filepath)) then
@@ -182,7 +186,7 @@ local function parse(filepath, dir)
         end
         return nil
       end
-      close_handlers_10_auto(_G.xpcall(_19_, (package.loaded.fennel or debug).traceback))
+      close_handlers_10_auto(_G.xpcall(_20_, (package.loaded.fennel or debug).traceback))
     else
     end
   end
@@ -216,14 +220,14 @@ local function config(bufnr)
     local applied = {}
     for opt, val in pairs(opts) do
       if (val ~= "unset") then
-        local _33_ = properties[opt]
-        if (nil ~= _33_) then
-          local func = _33_
-          local _34_, _35_ = pcall(func, bufnr0, val, opts)
-          if (_34_ == true) then
+        local _34_ = properties[opt]
+        if (nil ~= _34_) then
+          local func = _34_
+          local _35_, _36_ = pcall(func, bufnr0, val, opts)
+          if (_35_ == true) then
             applied[opt] = val
-          elseif ((_34_ == false) and (nil ~= _35_)) then
-            local err = _35_
+          elseif ((_35_ == false) and (nil ~= _36_)) then
+            local err = _36_
             warn(("editorconfig: invalid value for option %s: %s. %s"):format(opt, val, err))
           else
           end
@@ -239,7 +243,10 @@ local function config(bufnr)
   end
 end
 local function trim_trailing_whitespace0()
-  vim.notify_once(debug.traceback("editorconfig.nvim: trim_trailing_whitespace() is deprecated and will soon be removed", 2), vim.log.levels.WARN)
+  if (vim.fn.has("nvim-0.7") == 1) then
+    vim.notify_once(debug.traceback("editorconfig.nvim: trim_trailing_whitespace() is deprecated and will soon be removed", 2), vim.log.levels.WARN)
+  else
+  end
   return trim_trailing_whitespace()
 end
 return {config = config, trim_trailing_whitespace = trim_trailing_whitespace0, properties = properties}