diff options
| author | Wael M. Nasreddine <wael.nasreddine@gmail.com> | 2020-01-06 14:46:30 -0800 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-01-07 13:13:41 -0800 |
| commit | c6c00529e1b5d246562df1dd2aeeeef1951b6ec0 (patch) | |
| tree | 2d103e1603933b56e4019a8ae51d8ad69e9b35a1 /pkgs/misc | |
| parent | 7909787a7d8be8e3964cd602e2151cb3a92ff7f8 (diff) | |
| download | nixpkgs-c6c00529e1b5d246562df1dd2aeeeef1951b6ec0.tar nixpkgs-c6c00529e1b5d246562df1dd2aeeeef1951b6ec0.tar.gz nixpkgs-c6c00529e1b5d246562df1dd2aeeeef1951b6ec0.tar.bz2 nixpkgs-c6c00529e1b5d246562df1dd2aeeeef1951b6ec0.tar.lz nixpkgs-c6c00529e1b5d246562df1dd2aeeeef1951b6ec0.tar.xz nixpkgs-c6c00529e1b5d246562df1dd2aeeeef1951b6ec0.tar.zst nixpkgs-c6c00529e1b5d246562df1dd2aeeeef1951b6ec0.zip | |
Revert "vim-plugins: hashivim/vim-terraform: fix the filetypedetect autocmd (#76845)"
This reverts commit fa92f00dc39e9f2194517c22f0f4c5433f231f40.
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 3 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-terraform-fix-event.patch | 23 |
2 files changed, 0 insertions, 26 deletions
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 368ecbdfec6..6cde4d6695a 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 b36c4992c13..00000000000 --- 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" <wael.nasreddine@gmail.com> -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 |