From db1883a5789a928b3aaab3c9fced245e58a9b578 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Nov 20 2017 18:16:36 +0000
Subject: - patchlevel 1322


---

diff --git a/vim-7.4-fstabsyntax.patch b/vim-7.4-fstabsyntax.patch
index 4bea4bd..f82a66c 100644
--- a/vim-7.4-fstabsyntax.patch
+++ b/vim-7.4-fstabsyntax.patch
@@ -1,6 +1,7 @@
---- vim74/runtime/syntax/fstab.vim.orig	2013-05-21 16:07:26.000000000 +0200
-+++ vim74/runtime/syntax/fstab.vim	2013-08-12 15:05:43.682707639 +0200
-@@ -53,7 +53,7 @@
+diff -up vim80/runtime/syntax/fstab.vim.fstabsyntax vim80/runtime/syntax/fstab.vim
+--- vim80/runtime/syntax/fstab.vim.fstabsyntax	2017-11-19 20:32:49.000000000 +0100
++++ vim80/runtime/syntax/fstab.vim	2017-11-20 16:01:31.494316342 +0100
+@@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword containe
  " Type
  syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
  syn match fsTypeUnknown /\s\+\zs\w\+/ contained
@@ -9,12 +10,12 @@
  
  " Options
  " -------
-@@ -65,7 +65,7 @@
+@@ -68,7 +68,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-]
  syn keyword fsOptionsYesNo yes no
  syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
  syn keyword fsOptionsSize 512 1024 2048
--syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user users xx
-+syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand nosuid nosymfollow nouser owner pamconsole rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user[s] xx
+-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx
++syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner pamconsole rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx
  syn match fsOptionsGeneral /_netdev/
  
  " Options: adfs
diff --git a/vim-8.0-beval-pro.patch b/vim-8.0-beval-pro.patch
new file mode 100644
index 0000000..6ff89cc
--- /dev/null
+++ b/vim-8.0-beval-pro.patch
@@ -0,0 +1,10 @@
+diff -up vim80/src/proto/beval.pro.beval-pro vim80/src/proto/beval.pro
+--- vim80/src/proto/beval.pro.beval-pro	2017-11-20 18:59:12.364156610 +0100
++++ vim80/src/proto/beval.pro	2017-11-20 18:59:50.926848275 +0100
+@@ -0,0 +1,6 @@
++/* beval.c */
++int get_beval_info(BalloonEval *beval, int getword, win_T **winp, linenr_T *lnump, char_u **textp, int *colp);
++void post_balloon(BalloonEval *beval, char_u *mesg, list_T *list);
++int can_use_beval(void);
++void general_beval_cb(BalloonEval *beval, int state);
++/* vim: set ft=c : */
diff --git a/vim.spec b/vim.spec
index fec825f..d228ec3 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1283
+%define patchlevel 1322
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -63,6 +63,7 @@ Patch3012: vim-7.4-licensemacro-1151450.patch
 Patch3013: vim-7.4-globalsyntax.patch
 Patch3014: vim-7.4-releasestring-1318991.patch
 Patch3015: vim-8.0-copy-paste.patch
+Patch3016: vim-8.0-beval-pro.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel python3-devel ncurses-devel gettext perl-devel
@@ -221,6 +222,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3013 -p1
 %patch3014 -p1
 %patch3015 -p1
+%patch3016 -p1 -b .beval-pro
 
 %build
 cd src
@@ -766,6 +768,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Mon Nov 20 2017 Karsten Hopp <karsten@redhat.com> 8.0.1322-1
+- patchlevel 1322
+
 * Fri Nov 10 2017 Karsten Hopp <karsten@redhat.com> 8.0.1283-1
 - patchlevel 1283