From fd72ce18ab95fd227aef5ed8d0634f2636571a3e Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Jul 28 2020 09:45:39 +0000
Subject: - patchlevel 1307


---

diff --git a/.gitignore b/.gitignore
index 3e9938e..91ffcb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -312,3 +312,4 @@
 /vim-8.2-1217.tar.bz2
 /vim-8.2-1224.tar.bz2
 /vim-8.2-1273.tar.bz2
+/vim-8.2-1307.tar.bz2
diff --git a/sources b/sources
index 2f41a59..9d7640c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.2-1273.tar.bz2) = 6063ed594677d42e7346476bfc26ea7b049a174aeb7f50041c6f5aa6b38c04b65a6a205afaf5f94fc91f8fa73c2a760fc0de917d41817ed5a81b90bddd4a73d0
+SHA512 (vim-8.2-1307.tar.bz2) = b2b13130f865bb002ddff7d9ca4bf300681a4d26e6b46aaf51bea95635730e69291536d6da75f30b0271aa5c87774a00fa7d6fb212ca395b5a02448ea0be7da5
diff --git a/vim-7.4-nowarnings.patch b/vim-7.4-nowarnings.patch
index a98e9d6..fc4315a 100644
--- a/vim-7.4-nowarnings.patch
+++ b/vim-7.4-nowarnings.patch
@@ -1,11 +1,11 @@
-diff -up vim81/src/ex_docmd.c.backup vim81/src/ex_docmd.c
---- vim81/src/ex_docmd.c.backup	2019-01-22 17:35:28.701320672 +0100
-+++ vim81/src/ex_docmd.c	2019-01-22 17:36:56.644540351 +0100
-@@ -4793,6 +4793,7 @@ get_flags(exarg_T *eap)
+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 = N_("E319: Sorry, the command is not available in this version");
- }
+ 	eap->errmsg =
+ 		_("E319: Sorry, the command is not available in this version");
diff --git a/vim.spec b/vim.spec
index a86105f..cdbc55a 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1273
+%define patchlevel 1307
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -21,7 +21,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Vim and MIT
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
 Source1: vim.sh
@@ -235,7 +235,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %endif
 
 %patch3000 -p1
-%patch3002 -p1
+%patch3002 -p1 -b .nowarnings
 %patch3004 -p1
 %patch3007 -p1 -b .fstabsyntax
 %patch3008 -p1 -b .syncolor
@@ -772,6 +772,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Tue Jul 28 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1307-1
+- patchlevel 1307
+
 * Fri Jul 24 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1273-2
 - vim-update.sh: bodhi no longer sets a default automatic time to stable