$ git diff --patch-with-stat --summary 5b7721b37529d217327415d4e89f07be81528c74..7f57deaa65f0fc47b701ff07ee4a31447570c69b
.abf.yml | 2 +-
vim-7.4-qt-highlighting.patch | 65 -------------------------------------------
vim-8.0-nomouse.patch | 16 -----------
vim.spec | 6 +---
4 files changed, 2 insertions(+), 87 deletions(-)
delete mode 100644 vim-7.4-qt-highlighting.patch
delete mode 100644 vim-8.0-nomouse.patch
diff --git a/.abf.yml b/.abf.yml
index 5b9b42e..179a028 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
sources:
- v8.1.2125.tar.gz: abd05d3c5b2b98d711a16e9079d7c385b1247cf9
+ v8.1.2269.tar.gz: a00b98a03ddab89518e63dd629708f9f2ba7145b
vim-spec-3.0.bz2: d177f0f3ecb9c93ab15f30a2f99b2ecb1ff08f5d
diff --git a/vim-7.4-qt-highlighting.patch b/vim-7.4-qt-highlighting.patch
deleted file mode 100644
index 06160cb..0000000
--- a/vim-7.4-qt-highlighting.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -up vim-8.1.0983/runtime/syntax/cpp.vim.qthl~ vim-8.1.0983/runtime/syntax/cpp.vim
---- vim-8.1.0983/runtime/syntax/cpp.vim.qthl~ 2019-02-26 17:03:54.000000000 +0100
-+++ vim-8.1.0983/runtime/syntax/cpp.vim 2019-02-26 22:32:58.070383074 +0100
-@@ -53,6 +53,25 @@ if !exists("cpp_no_cpp14")
- syn case match
- endif
-
-+" Qt extensions
-+if !exists("cpp_no_qt")
-+ syn keyword qtKeywords signals slots emit foreach
-+ syn keyword qtMacros Q_OBJECT Q_WIDGET Q_PROPERTY Q_ENUMS Q_OVERRIDE Q_CLASSINFO Q_SETS SIGNAL SLOT METHOD Q_DECLARE_INTERFACE Q_INTERFACES Q_EXPORT QDOC_PROPERTY Q_DECLARE_FLAGS Q_DECLARE_INTERFACE Q_DECLARE_METATYPE Q_DECLARE_TR_FUNCTIONS Q_DECLARE_TYPEINFO Q_DECLARE_PRIVATE Q_EMIT Q_FOREACH Q_FOREVER Q_IMPORT_PLUGIN Q_INTERFACES Q_EXPORT_PLUGIN Q_EXPORT_PLUGIN2 Q_ARG Q_SIGNALS Q_SLOTS Q_RETURN_ARG QT_BEGIN_HEADER QT_END_HEADER QT_BEGIN_NAMESPACE QT_END_NAMESPACE QT_MODULE Q_PRIVATE_SLOT Q_PRIVATE_PROPERTY Q_FLAGS Q_SCRIPTABLE Q_INVOKABLE Q_SIGNAL Q_SLOT READ WRITE DESIGNABLE SCRIPTABLE CONSTANT
-+ syn match qtCast "\<\(qt\|qobject\|qvariant\|qstyleoption\)_cast\s*<"me=e-1
-+ syn match qtCast "\<\(qt\|qobject\|qvariant\|qstyleoption\)_cast\s*$"
-+ syn keyword qtTypedef uchar uint ushort ulong Q_INT8 Q_UINT8 Q_INT16 Q_UINT16 Q_INT32 Q_UINT32 Q_LONG Q_ULONG Q_INT64 Q_UINT64 Q_LLONG Q_ULLONG pchar puchar pcchar qint8 quint8 qint16 quint16 qint32 quint32 qint64 quint64 qlonglong qulonglong
-+ syn keyword qtBaseClass QString QByteArray QHash QMap QVector QList QStringList QObject QWidget
-+ syn keyword cRepeat foreach
-+ syn keyword cRepeat forever
-+
-+ hi def link qtKeywords Statement
-+ hi def link qtMacros Type
-+ hi def link qtCast Statement
-+ hi def link qtTypedef Type
-+ hi def link qtBaseClass Type
-+endif
-+
-+
- " The minimum and maximum operators in GNU C++
- syn match cppMinMax "[<>]?"
-
-diff -up vim-8.1.0983/src/indent.c.qthl~ vim-8.1.0983/src/indent.c
---- vim-8.1.0983/src/indent.c.qthl~ 2019-02-26 22:33:48.062119859 +0100
-+++ vim-8.1.0983/src/indent.c 2019-02-26 22:36:31.162546313 +0100
-@@ -947,6 +947,8 @@ cin_isterminated(
- char_u found_start = 0;
- unsigned n_open = 0;
- int is_else = FALSE;
-+ char_u qt_special = 0;
-+ char_u qt_special_with_parentheses = 0;
-
- s = cin_skipcomment(s);
-
-@@ -963,7 +965,7 @@ cin_isterminated(
- if (*s == '}' && n_open > 0)
- --n_open;
- if ((!is_else || n_open == 0)
-- && (*s == ';' || *s == '}' || (incl_comma && *s == ','))
-+ && (*s == ';' || *s == '}' || qt_special || ((*s == ')') && qt_special_with_parentheses) || (incl_comma && *s == ','))
- && cin_nocode(s + 1))
- return *s;
- else if (*s == '{')
-@@ -973,6 +975,13 @@ cin_isterminated(
- else
- ++n_open;
- }
-+ else if(!strncmp(s, "Q_OBJECT", 8))
-+ qt_special=1;
-+ else if( !strncmp(s, "Q_INTERFACES", 12)
-+ || !strncmp(s, "Q_PROPERTY", 10)
-+ || !strncmp(s, "QDOC_PROPERTY", 13)
-+ || !strncmp(s, "Q_DECLARE_PRIVATE", 17))
-+ qt_special_with_parentheses=1;
-
- if (*s)
- s++;
-diff -up vim-8.1.0983/src/misc1.c.qthl~ vim-8.1.0983/src/misc1.c
diff --git a/vim-8.0-nomouse.patch b/vim-8.0-nomouse.patch
deleted file mode 100644
index e54dbf8..0000000
--- a/vim-8.0-nomouse.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- vim-8.0.0003/runtime/defaults.vim.omv~ 2016-09-12 21:49:55.420683005 +0200
-+++ vim-8.0.0003/runtime/defaults.vim 2016-09-12 21:50:20.052255757 +0200
-@@ -66,9 +66,10 @@ inoremap <C-U> <C-G>u<C-U>
-
- " In many terminal emulators the mouse works just fine. By enabling it you
- " can position the cursor, Visually select and scroll with the mouse.
--if has('mouse')
-- set mouse=a
--endif
-+" It breaks the usual means of cut&paste though...
-+if has('mouse')
-+ set mouse=""
-+endif
-
- " Switch syntax highlighting on when the terminal has colors or when using the
- " GUI (which always has colors).
diff --git a/vim.spec b/vim.spec
index 79f361e..e545f86 100644
--- a/vim.spec
+++ b/vim.spec
@@ -16,7 +16,7 @@
%define longtitle All-purpose text editor
Name: vim
-Version: 8.1.2125
+Version: 8.1.2269
Release: 1
Summary: VIsual editor iMproved
Url: http://www.vim.org/
@@ -44,7 +44,6 @@ Source12: molokai.vim
Source13: virc
Source100: vim.rpmlintrc
# MDK patches
-Patch1: vim-8.0-nomouse.patch
Patch2: vim-5.6a-paths.patch
#Patch3: vim-7.4.005-rpm-spec-syntax.patch
Patch4: vim-8.1-perl-includes.patch
@@ -59,7 +58,6 @@ Patch30: vim-7.3.478-add-dhcpd-syntax.patch
Patch33: vim-7.4.005-CVE-2009-0316-debian.patch
# (proyvind): fix path to locale files
Patch35: vim-7.4.005-use-proper-localedir.patch
-Patch36: vim-7.4-qt-highlighting.patch
Patch37: vim-7.3.381-always-install-icons.patch
Patch38: vim-7.3.478-dont-check-for-xsetlocale.patch
@@ -183,7 +181,6 @@ cp -a %{SOURCE11} runtime/indent/python.vim
cp -a %{SOURCE12} runtime/colors
#mdk patches
-%patch1 -p1 -b .nomouse~
%patch2 -p1 -b .p2~
#% patch3 -p1 -b .spec~
%patch4 -p1 -b .perlinc~
@@ -200,7 +197,6 @@ sed -i -e 's,/usr/lib64/perl5/CORE,%{_libdir}/perl5/CORE,g' src/configure.ac
%patch30 -p1 -b .dhcpd~
%patch33 -p1 -b .security~
#patch35 -p1 -b .localedir~
-%patch36 -p1 -b .qthl~
#patch37 -p1 -b .icons_install~
#patch38 -p1 -b .xsetlocale~