From d0fe09c68a7c8a9b5734953a3ef9e30c356849a6 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Thu, 14 Oct 2021 14:11:01 +0200
Subject: [PATCH] 2011429 - Remove downstream patch vim-7.4-nowarning.patch

Resolves: rhbz#2011429
---
 vim-7.4-nowarnings.patch | 11 -----------
 vim.spec                 |  3 +--
 virc                     |  2 --
 3 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 vim-7.4-nowarnings.patch

diff --git a/vim-7.4-nowarnings.patch b/vim-7.4-nowarnings.patch
deleted file mode 100644
index fc4315a..0000000
--- a/vim-7.4-nowarnings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up vim82/src/ex_docmd.c.nowarnings vim82/src/ex_docmd.c
---- vim82/src/ex_docmd.c.nowarnings	2020-07-28 11:42:07.437603829 +0200
-+++ vim82/src/ex_docmd.c	2020-07-28 11:44:25.432201129 +0200
-@@ -4020,6 +4020,7 @@ get_flags(exarg_T *eap)
-     void
- ex_ni(exarg_T *eap)
- {
-+    return;
-     if (!eap->skip)
- 	eap->errmsg =
- 		_("E319: Sorry, the command is not available in this version");
diff --git a/vim.spec b/vim.spec
index 7c1bdfe..cd11fc2 100644
--- a/vim.spec
+++ b/vim.spec
@@ -57,7 +57,6 @@ BuildRequires: hunspell-devel
 %endif
 
 Patch3000: vim-7.4-syntax.patch
-Patch3002: vim-7.4-nowarnings.patch
 Patch3004: vim-7.0-rclocation.patch
 Patch3007: vim-7.4-fstabsyntax.patch
 Patch3010: vim-7.3-manpage-typo-668894-675480.patch
@@ -267,7 +266,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %endif
 
 %patch3000 -p1
-%patch3002 -p1 -b .nowarnings
 %patch3004 -p1
 %patch3007 -p1 -b .fstabsyntax
 %patch3010 -p1
@@ -839,6 +837,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 * Thu Oct 14 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2637-6
 - 2011412 - test suite fails on apache/httpd filetype tests
 - 2011424 - Remove vim-7.4-syncolor.patch
+- 2011429 - Remove downstream patch vim-7.4-nowarning.patch
 
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2:8.2.2637-5
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
diff --git a/virc b/virc
index 808e7d6..df4d4f4 100644
--- a/virc
+++ b/virc
@@ -28,8 +28,6 @@ if has("autocmd")
 endif
 
 
-filetype plugin on
-
 if &term=="xterm"
      set t_Co=8
      set t_Sb=[4%dm