From c6c00529e1b5d246562df1dd2aeeeef1951b6ec0 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Mon, 6 Jan 2020 14:46:30 -0800 Subject: [PATCH] Revert "vim-plugins: hashivim/vim-terraform: fix the filetypedetect autocmd (#76845)" This reverts commit fa92f00dc39e9f2194517c22f0f4c5433f231f40. --- pkgs/misc/vim-plugins/overrides.nix | 3 --- .../vim-plugins/vim-terraform-fix-event.patch | 23 ------------------- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/misc/vim-plugins/vim-terraform-fix-event.patch diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 368ecbdfec68..6cde4d6695ac 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -413,9 +413,6 @@ self: super: { dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; }); - vim-terraform = super.vim-terraform.overrideAttrs(oa: { - patches = (oa.patches or []) ++ lib.singleton ./vim-terraform-fix-event.patch; - }); vim-wakatime = super.vim-wakatime.overrideAttrs(old: { buildInputs = [ python ]; diff --git a/pkgs/misc/vim-plugins/vim-terraform-fix-event.patch b/pkgs/misc/vim-plugins/vim-terraform-fix-event.patch deleted file mode 100644 index b36c4992c13f..000000000000 --- a/pkgs/misc/vim-plugins/vim-terraform-fix-event.patch +++ /dev/null @@ -1,23 +0,0 @@ -From cad4661952ad7983ece6d6486f0f68d437037015 Mon Sep 17 00:00:00 2001 -From: "Wael M. Nasreddine" -Date: Thu, 2 Jan 2020 13:31:13 -0800 -Subject: [PATCH] Put the autocmd filetypedetect in an augroup - ---- - ftdetect/terraform.vim | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/ftdetect/terraform.vim b/ftdetect/terraform.vim -index 5919422..24bc731 100644 ---- a/ftdetect/terraform.vim -+++ b/ftdetect/terraform.vim -@@ -1,5 +1,8 @@ - " By default, Vim associates .tf files with TinyFugue - tell it not to. --autocmd! filetypedetect BufRead,BufNewFile *.tf -+augroup filetypedetect -+ au BufRead,BufNewFile *.tf set filetype=terraform -+augroup END -+ - autocmd BufRead,BufNewFile *.tf set filetype=terraform - autocmd BufRead,BufNewFile *.tfvars set filetype=terraform - autocmd BufRead,BufNewFile *.tfstate set filetype=json