diff --git a/Fix-vim-lua5.4.0-defines+luaL_typeerror-twice.patch b/Fix-vim-lua5.4.0-defines+luaL_typeerror-twice.patch
deleted file mode 100644
index a7148d29d2b5e6ec93a31f039ce1257f97f0411f..0000000000000000000000000000000000000000
--- a/Fix-vim-lua5.4.0-defines+luaL_typeerror-twice.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ea3ebd50e2a4ec26ee503f352a1280e11e4af93b Mon Sep 17 00:00:00 2001
-From: Zdenek Dohnal <zdohnal@redhat.com>
-Date: Tue, 14 Jul 2020 12:14:03 +0200
-Subject: [PATCH] if_lua.c: new Lua 5.4.0 defines luaL_typeerror, so don't
- define it twice
- 
----
- src/if_lua.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/if_lua.c b/src/if_lua.c
-index 9b03c97..81faf92 100644
---- a/src/if_lua.c
-+++ b/src/if_lua.c
-@@ -109,6 +109,9 @@ static luaV_Funcref *luaV_pushfuncref(lua_State *L, char_u *name);
- #define luaL_loadbufferx dll_luaL_loadbufferx
- #define luaL_argerror dll_luaL_argerror
- #endif
-+#if LUA_VERSION_NUM >= 504
-+#define luaL_typeerror dll_luaL_typeerror
-+#endif
- #define luaL_checkany dll_luaL_checkany
- #define luaL_checklstring dll_luaL_checklstring
- #define luaL_checkinteger dll_luaL_checkinteger
-@@ -203,6 +206,9 @@ int (*dll_luaL_loadfilex) (lua_State *L, const char *filename, const char *mode)
- int (*dll_luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz, const char *name, const char *mode);
- int (*dll_luaL_argerror) (lua_State *L, int numarg, const char *extramsg);
- #endif
-+#if LUA_VERSION_NUM >= 504
-+int (*dll_luaL_typeerror) (lua_State *L, int narg, const char *tname);
-+#endif
- void (*dll_luaL_checkany) (lua_State *L, int narg);
- const char *(*dll_luaL_checklstring) (lua_State *L, int numArg, size_t *l);
- lua_Integer (*dll_luaL_checkinteger) (lua_State *L, int numArg);
-@@ -314,6 +320,9 @@ static const luaV_Reg luaV_dll[] = {
-     {"luaL_loadfilex", (luaV_function) &dll_luaL_loadfilex},
-     {"luaL_loadbufferx", (luaV_function) &dll_luaL_loadbufferx},
-     {"luaL_argerror", (luaV_function) &dll_luaL_argerror},
-+#endif
-+#if LUA_VERSION_NUM >= 504
-+    {"luaL_typeerror", (luaV_function) &dll_luaL_typeerror},
- #endif
-     {"luaL_checkany", (luaV_function) &dll_luaL_checkany},
-     {"luaL_checklstring", (luaV_function) &dll_luaL_checklstring},
-@@ -443,7 +452,7 @@ lua_enabled(int verbose)
- }
- #endif
- 
--#if LUA_VERSION_NUM > 501
-+#if LUA_VERSION_NUM > 501 && LUA_VERSION_NUM < 504
-     static int
- luaL_typeerror(lua_State *L, int narg, const char *tname)
- {
--- 
-2.23.0
-
diff --git a/backport-8.2.2550-signal-stack-size-is-wrong-with-lates.patch b/backport-8.2.2550-signal-stack-size-is-wrong-with-lates.patch
deleted file mode 100644
index 19b2bff780434f605e6a5dbba060688ddaf13cd0..0000000000000000000000000000000000000000
--- a/backport-8.2.2550-signal-stack-size-is-wrong-with-lates.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 0e62a6742bca186624e97e2121c98ada30e009a0 Mon Sep 17 00:00:00 2001
-From: Bram Moolenaar <Bram@vim.org>
-Date: Thu, 25 Feb 2021 17:17:56 +0100
-Subject: [PATCH 4236/5000] patch 8.2.2550: signal stack size is wrong with
- latest glibc 2.34
-
-Problem:    Signal stack size is wrong with latest glibc 2.34.
-Solution:   Use sysconf(_SC_SIGSTKSZ) if available. (Zdenek Dohnal, closes
-            #7895)
----
- src/auto/configure | 24 ++++++++++++++++++++++++
- src/config.h.in    |  3 +++
- src/configure.ac   |  9 +++++++++
- src/os_unix.c      | 14 +++++++++++++-
- 4 files changed, 49 insertions(+), 1 deletion(-)
-
-diff --git a/src/auto/configure b/src/auto/configure
-index 250e5ae..8183499 100755
---- a/src/auto/configure
-+++ b/src/auto/configure
-@@ -13943,6 +13943,30 @@ $as_echo "not usable" >&6; }
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _SC_SIGSTKSZ via sysconf()" >&5
-+$as_echo_n "checking for _SC_SIGSTKSZ via sysconf()... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <unistd.h>
-+int
-+main ()
-+{
-+	(void)sysconf(_SC_SIGSTKSZ);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSCONF_SIGSTKSZ 1" >>confdefs.h
-+
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5
-+$as_echo "not usable" >&6; }
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
- # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-diff --git a/src/config.h.in b/src/config.h.in
-index b114480..5d01e2c 100644
---- a/src/config.h.in
-+++ b/src/config.h.in
-@@ -496,3 +496,6 @@
- 
- /* Define to inline symbol or empty */
- #undef inline
-+
-+/* Define if _SC_SIGSTKSZ is available via sysconf() */
-+#undef HAVE_SYSCONF_SIGSTKSZ
-diff --git a/src/configure.ac b/src/configure.ac
-index 58bfa19..798e9b8 100644
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -4105,6 +4105,15 @@ AC_TRY_COMPILE(
- 	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYSCONF),
- 	AC_MSG_RESULT(not usable))
- 
-+dnl check if we have _SC_SIGSTKSZ via sysconf()
-+AC_MSG_CHECKING(for _SC_SIGSTKSZ via sysconf())
-+AC_TRY_COMPILE(
-+[#include <unistd.h>],
-+[	(void)sysconf(_SC_SIGSTKSZ);
-+	],
-+	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYSCONF_SIGSTKSZ),
-+	AC_MSG_RESULT(not usable))
-+
- AC_CHECK_SIZEOF([int])
- AC_CHECK_SIZEOF([long])
- AC_CHECK_SIZEOF([time_t])
-diff --git a/src/os_unix.c b/src/os_unix.c
-index 1edc7e6..1c80799 100644
---- a/src/os_unix.c
-+++ b/src/os_unix.c
-@@ -783,7 +783,7 @@ mch_stackcheck(char *p)
-  * completely full.
-  */
- 
--#ifndef SIGSTKSZ
-+#if !defined SIGSTKSZ && !defined(HAVE_SYSCONF_SIGSTKSZ)
- # define SIGSTKSZ 8000    // just a guess of how much stack is needed...
- #endif
- 
-@@ -806,13 +806,21 @@ init_signal_stack(void)
- #  else
- 	sigstk.ss_sp = signal_stack;
- #  endif
-+#  ifdef HAVE_SYSCONF_SIGSTKSZ
-+	sigstk.ss_size = sysconf(_SC_SIGSTKSZ);
-+#  else
- 	sigstk.ss_size = SIGSTKSZ;
-+#  endif
- 	sigstk.ss_flags = 0;
- 	(void)sigaltstack(&sigstk, NULL);
- # else
- 	sigstk.ss_sp = signal_stack;
- 	if (stack_grows_downwards)
-+#  ifdef HAVE_SYSCONF_SIGSTKSZ
-+	    sigstk.ss_sp += sysconf(_SC_SIGSTKSZ) - 1;
-+#  else
- 	    sigstk.ss_sp += SIGSTKSZ - 1;
-+#  endif
- 	sigstk.ss_onstack = 0;
- 	(void)sigstack(&sigstk, NULL);
- # endif
-@@ -3261,7 +3269,11 @@ mch_early_init(void)
-      * Ignore any errors.
-      */
- #if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK)
-+# ifdef HAVE_SYSCONF_SIGSTKSZ
-+    signal_stack = alloc(sysconf(_SC_SIGSTKSZ));
-+# else
-     signal_stack = alloc(SIGSTKSZ);
-+# endif
-     init_signal_stack();
- #endif
- }
--- 
-1.8.3.1
-
diff --git a/backport-CVE-2021-3770.patch b/backport-CVE-2021-3770.patch
deleted file mode 100644
index 781cfa43de4b643073894d677982f6fa398f4526..0000000000000000000000000000000000000000
--- a/backport-CVE-2021-3770.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From b7081e135a16091c93f6f5f7525a5c58fb7ca9f9 Mon Sep 17 00:00:00 2001
-From: Bram Moolenaar <Bram@vim.org>
-Date: Sat, 4 Sep 2021 18:47:28 +0200
-Subject: [PATCH] patch 8.2.3402: invalid memory access when using :retab with
- large value
-
-Problem:    Invalid memory access when using :retab with large value.
-Solution:   Check the number is positive.
----
- src/indent.c               | 34 +++++++++++++++++++++-------------
- src/option.c               | 12 ++++++------
- src/optionstr.c            |  4 ++--
- src/testdir/test_retab.vim |  3 +++
- src/version.c              |  2 ++
- 5 files changed, 34 insertions(+), 21 deletions(-)
-
-diff --git a/src/indent.c b/src/indent.c
-index 32f1e12..7e196c2 100644
---- a/src/indent.c
-+++ b/src/indent.c
-@@ -18,18 +18,19 @@
- /*
-  * Set the integer values corresponding to the string setting of 'vartabstop'.
-  * "array" will be set, caller must free it if needed.
-+ * Return FAIL for an error.
-  */
-     int
- tabstop_set(char_u *var, int **array)
- {
--    int valcount = 1;
--    int t;
--    char_u *cp;
-+    int	    valcount = 1;
-+    int	    t;
-+    char_u  *cp;
- 
-     if (var[0] == NUL || (var[0] == '0' && var[1] == NUL))
-     {
- 	*array = NULL;
--	return TRUE;
-+	return OK;
-     }
- 
-     for (cp = var; *cp != NUL; ++cp)
-@@ -43,8 +44,8 @@ tabstop_set(char_u *var, int **array)
- 		if (cp != end)
- 		    emsg(_(e_positive));
- 		else
--		    emsg(_(e_invarg));
--		return FALSE;
-+		    semsg(_(e_invarg2), cp);
-+		return FAIL;
- 	    }
- 	}
- 
-@@ -55,26 +56,33 @@ tabstop_set(char_u *var, int **array)
- 	    ++valcount;
- 	    continue;
- 	}
--	emsg(_(e_invarg));
--	return FALSE;
-+	semsg(_(e_invarg2), var);
-+	return FAIL;
-     }
- 
-     *array = ALLOC_MULT(int, valcount + 1);
-     if (*array == NULL)
--	return FALSE;
-+	return FAIL;
-     (*array)[0] = valcount;
- 
-     t = 1;
-     for (cp = var; *cp != NUL;)
-     {
--	(*array)[t++] = atoi((char *)cp);
--	while (*cp  != NUL && *cp != ',')
-+	int n = atoi((char *)cp);
-+
-+	if (n < 0 || n > 9999)
-+	{
-+	    semsg(_(e_invarg2), cp);
-+	    return FAIL;
-+	}
-+	(*array)[t++] = n;
-+	while (*cp != NUL && *cp != ',')
- 	    ++cp;
- 	if (*cp != NUL)
- 	    ++cp;
-     }
- 
--    return TRUE;
-+    return OK;
- }
- 
- /*
-@@ -1556,7 +1564,7 @@ ex_retab(exarg_T *eap)
- 
- #ifdef FEAT_VARTABS
-     new_ts_str = eap->arg;
--    if (!tabstop_set(eap->arg, &new_vts_array))
-+    if (tabstop_set(eap->arg, &new_vts_array) == FAIL)
- 	return;
-     while (vim_isdigit(*(eap->arg)) || *(eap->arg) == ',')
- 	++(eap->arg);
-diff --git a/src/option.c b/src/option.c
-index 5c99c69..e9598d6 100644
---- a/src/option.c
-+++ b/src/option.c
-@@ -2292,9 +2292,9 @@ didset_options2(void)
- #endif
- #ifdef FEAT_VARTABS
-     vim_free(curbuf->b_p_vsts_array);
--    tabstop_set(curbuf->b_p_vsts, &curbuf->b_p_vsts_array);
-+    (void)tabstop_set(curbuf->b_p_vsts, &curbuf->b_p_vsts_array);
-     vim_free(curbuf->b_p_vts_array);
--    tabstop_set(curbuf->b_p_vts,  &curbuf->b_p_vts_array);
-+    (void)tabstop_set(curbuf->b_p_vts,  &curbuf->b_p_vts_array);
- #endif
- }
- 
-@@ -5756,7 +5756,7 @@ buf_copy_options(buf_T *buf, int flags)
- 	    buf->b_p_vsts = vim_strsave(p_vsts);
- 	    COPY_OPT_SCTX(buf, BV_VSTS);
- 	    if (p_vsts && p_vsts != empty_option)
--		tabstop_set(p_vsts, &buf->b_p_vsts_array);
-+		(void)tabstop_set(p_vsts, &buf->b_p_vsts_array);
- 	    else
- 		buf->b_p_vsts_array = 0;
- 	    buf->b_p_vsts_nopaste = p_vsts_nopaste
-@@ -5914,7 +5914,7 @@ buf_copy_options(buf_T *buf, int flags)
- 		buf->b_p_isk = save_p_isk;
- #ifdef FEAT_VARTABS
- 		if (p_vts && p_vts != empty_option && !buf->b_p_vts_array)
--		    tabstop_set(p_vts, &buf->b_p_vts_array);
-+		    (void)tabstop_set(p_vts, &buf->b_p_vts_array);
- 		else
- 		    buf->b_p_vts_array = NULL;
- #endif
-@@ -5929,7 +5929,7 @@ buf_copy_options(buf_T *buf, int flags)
- 		buf->b_p_vts = vim_strsave(p_vts);
- 		COPY_OPT_SCTX(buf, BV_VTS);
- 		if (p_vts && p_vts != empty_option && !buf->b_p_vts_array)
--		    tabstop_set(p_vts, &buf->b_p_vts_array);
-+		    (void)tabstop_set(p_vts, &buf->b_p_vts_array);
- 		else
- 		    buf->b_p_vts_array = NULL;
- #endif
-@@ -6634,7 +6634,7 @@ paste_option_changed(void)
- 	    if (buf->b_p_vsts_array)
- 		vim_free(buf->b_p_vsts_array);
- 	    if (buf->b_p_vsts && buf->b_p_vsts != empty_option)
--		tabstop_set(buf->b_p_vsts, &buf->b_p_vsts_array);
-+		(void)tabstop_set(buf->b_p_vsts, &buf->b_p_vsts_array);
- 	    else
- 		buf->b_p_vsts_array = 0;
- #endif
-diff --git a/src/optionstr.c b/src/optionstr.c
-index 98e90a4..383babe 100644
---- a/src/optionstr.c
-+++ b/src/optionstr.c
-@@ -2166,7 +2166,7 @@ did_set_string_option(
- 	    if (errmsg == NULL)
- 	    {
- 		int *oldarray = curbuf->b_p_vsts_array;
--		if (tabstop_set(*varp, &(curbuf->b_p_vsts_array)))
-+		if (tabstop_set(*varp, &(curbuf->b_p_vsts_array)) == OK)
- 		{
- 		    if (oldarray)
- 			vim_free(oldarray);
-@@ -2205,7 +2205,7 @@ did_set_string_option(
- 	    {
- 		int *oldarray = curbuf->b_p_vts_array;
- 
--		if (tabstop_set(*varp, &(curbuf->b_p_vts_array)))
-+		if (tabstop_set(*varp, &(curbuf->b_p_vts_array)) == OK)
- 		{
- 		    vim_free(oldarray);
- #ifdef FEAT_FOLDING
-diff --git a/src/testdir/test_retab.vim b/src/testdir/test_retab.vim
-index f11a32b..e7b8946 100644
---- a/src/testdir/test_retab.vim
-+++ b/src/testdir/test_retab.vim
-@@ -74,4 +74,7 @@ endfunc
- func Test_retab_error()
-   call assert_fails('retab -1',  'E487:')
-   call assert_fails('retab! -1', 'E487:')
-+  call assert_fails('ret -1000', 'E487:')
-+  call assert_fails('ret 10000', 'E475:')
-+  call assert_fails('ret 80000000000000000000', 'E475:')
- endfunc
-diff --git a/src/version.c b/src/version.c
-index 3ef6259..8912f62 100644
---- a/src/version.c
-+++ b/src/version.c
-@@ -743,6 +743,8 @@ static char *(features[]) =
- static int included_patches[] =
- {   /* Add new patch number below this line */
- /**/
-+    3402,
-+/**/
-     0
- };
- 
--- 
-1.8.3.1
-
diff --git a/backport-CVE-2021-3778.patch b/backport-CVE-2021-3778.patch
deleted file mode 100644
index e1ef68a88bbc39d34027d3411911d5b8c67d5013..0000000000000000000000000000000000000000
--- a/backport-CVE-2021-3778.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 65b605665997fad54ef39a93199e305af2fe4d7f Mon Sep 17 00:00:00 2001
-From: Bram Moolenaar <Bram@vim.org>
-Date: Tue, 7 Sep 2021 19:26:53 +0200
-Subject: [PATCH] patch 8.2.3409: reading beyond end of line with invalid utf-8
- character
-
-Problem:    Reading beyond end of line with invalid utf-8 character.
-Solution:   Check for NUL when advancing.
----
- src/regexp_nfa.c                 | 3 ++-
- src/testdir/test_regexp_utf8.vim | 8 ++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
-index fb512f9..bc4a4b6 100644
---- a/src/regexp_nfa.c
-+++ b/src/regexp_nfa.c
-@@ -5455,7 +5455,8 @@ find_match_text(colnr_T startcol, int regstart, char_u *match_text)
- 		match = FALSE;
- 		break;
- 	    }
--	    len2 += MB_CHAR2LEN(c2);
-+	    len2 += enc_utf8 ? utf_ptr2len(rex.line + col + len2)
-+							     : MB_CHAR2LEN(c2);
- 	}
- 	if (match
- 		// check that no composing char follows
-diff --git a/src/testdir/test_regexp_utf8.vim b/src/testdir/test_regexp_utf8.vim
-index 19ff882..6d0ce59 100644
---- a/src/testdir/test_regexp_utf8.vim
-+++ b/src/testdir/test_regexp_utf8.vim
-@@ -215,3 +215,11 @@ func Test_optmatch_toolong()
-   set re=0
- endfunc
- 
-+func Test_match_invalid_byte()
-+  call writefile(0z630a.765d30aa0a.2e0a.790a.4030, 'Xinvalid')
-+  new
-+  source Xinvalid
-+  bwipe!
-+  call delete('Xinvalid')
-+endfunc
-+
--- 
-1.8.3.1
-
diff --git a/backport-CVE-2021-3796.patch b/backport-CVE-2021-3796.patch
deleted file mode 100644
index 654b4e58ef019415ec781f2e1ab01ecf394fc74e..0000000000000000000000000000000000000000
--- a/backport-CVE-2021-3796.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 35a9a00afcb20897d462a766793ff45534810dc3 Mon Sep 17 00:00:00 2001
-From: Bram Moolenaar <Bram@vim.org>
-Date: Sat, 11 Sep 2021 21:14:20 +0200
-Subject: [PATCH] patch 8.2.3428: using freed memory when replacing
-
-Problem:    Using freed memory when replacing. (Dhiraj Mishra)
-Solution:   Get the line pointer after calling ins_copychar().
----
- src/normal.c              | 10 +++++++---
- src/testdir/test_edit.vim | 13 +++++++++++++
- 2 files changed, 20 insertions(+), 3 deletions(-)
-
-diff --git a/src/normal.c b/src/normal.c
-index c4963e6..d6333b9 100644
---- a/src/normal.c
-+++ b/src/normal.c
-@@ -5009,19 +5009,23 @@ nv_replace(cmdarg_T *cap)
- 	    {
- 		/*
- 		 * Get ptr again, because u_save and/or showmatch() will have
--		 * released the line.  At the same time we let know that the
--		 * line will be changed.
-+		 * released the line.  This may also happen in ins_copychar().
-+		 * At the same time we let know that the line will be changed.
- 		 */
--		ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);
- 		if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y)
- 		{
- 		  int c = ins_copychar(curwin->w_cursor.lnum
- 					   + (cap->nchar == Ctrl_Y ? -1 : 1));
-+
-+		  ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);
- 		  if (c != NUL)
- 		    ptr[curwin->w_cursor.col] = c;
- 		}
- 		else
-+		{
-+		    ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);
- 		    ptr[curwin->w_cursor.col] = cap->nchar;
-+		}
- 		if (p_sm && msg_silent == 0)
- 		    showmatch(cap->nchar);
- 		++curwin->w_cursor.col;
-diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
-index 4e29e7f..c3b1af5 100644
---- a/src/testdir/test_edit.vim
-+++ b/src/testdir/test_edit.vim
-@@ -1519,3 +1519,16 @@ func Test_edit_noesckeys()
-   bwipe!
-   set esckeys
- endfunc
-+
-+" Test for getting the character of the line below after "p"
-+func Test_edit_put_CTRL_E()
-+  set encoding=latin1
-+  new
-+  let @" = ''
-+  sil! norm orggRx
-+  sil! norm pr
-+  call assert_equal(['r', 'r'], getline(1, 2))
-+  bwipe!
-+  set encoding=utf-8
-+endfunc
-+
--- 
-1.8.3.1
-
diff --git a/backport-CVE-2021-3872.patch b/backport-CVE-2021-3872.patch
deleted file mode 100644
index 32769f0b5b66357fa9f75c1c664b44caf2c19d85..0000000000000000000000000000000000000000
--- a/backport-CVE-2021-3872.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 826bfe4bbd7594188e3d74d2539d9707b1c6a14b Mon Sep 17 00:00:00 2001
-From: Bram Moolenaar <Bram@vim.org>
-Date: Fri, 8 Oct 2021 18:39:28 +0100
-Subject: [PATCH] patch 8.2.3487: illegal memory access if buffer name is very
- long
-
-Problem:    Illegal memory access if buffer name is very long.
-Solution:   Make sure not to go over the end of the buffer.
----
- src/drawscreen.c                | 10 +++++-----
- src/testdir/test_statusline.vim | 10 ++++++++++
- 2 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/src/drawscreen.c b/src/drawscreen.c
-index 3a88ee9..9acb705 100644
---- a/src/drawscreen.c
-+++ b/src/drawscreen.c
-@@ -446,13 +446,13 @@ win_redr_status(win_T *wp, int ignore_pum UNUSED)
- 	    *(p + len++) = ' ';
- 	if (bt_help(wp->w_buffer))
- 	{
--	    STRCPY(p + len, _("[Help]"));
-+	    vim_snprintf((char *)p + len, MAXPATHL - len, "%s", _("[Help]"));
- 	    len += (int)STRLEN(p + len);
- 	}
- #ifdef FEAT_QUICKFIX
- 	if (wp->w_p_pvw)
- 	{
--	    STRCPY(p + len, _("[Preview]"));
-+	    vim_snprintf((char *)p + len, MAXPATHL - len, "%s", _("[Preview]"));
- 	    len += (int)STRLEN(p + len);
- 	}
- #endif
-@@ -462,12 +462,12 @@ win_redr_status(win_T *wp, int ignore_pum UNUSED)
- #endif
- 		)
- 	{
--	    STRCPY(p + len, "[+]");
--	    len += 3;
-+	    vim_snprintf((char *)p + len, MAXPATHL - len, "%s", "[+]");
-+	    len += (int)STRLEN(p + len);
- 	}
- 	if (wp->w_buffer->b_p_ro)
- 	{
--	    STRCPY(p + len, _("[RO]"));
-+	    vim_snprintf((char *)p + len, MAXPATHL - len, "%s", _("[RO]"));
- 	    len += (int)STRLEN(p + len);
- 	}
- 
-diff --git a/src/testdir/test_statusline.vim b/src/testdir/test_statusline.vim
-index 1f705b8..febb5d6 100644
---- a/src/testdir/test_statusline.vim
-+++ b/src/testdir/test_statusline.vim
-@@ -393,3 +393,13 @@ func Test_statusline_visual()
-   bwipe! x1
-   bwipe! x2
- endfunc
-+
-+" Used to write beyond allocated memory.  This assumes MAXPATHL is 4096 bytes.
-+func Test_statusline_verylong_filename()
-+  let fname = repeat('x', 4090)
-+  exe "new " .. fname
-+  set buftype=help
-+  set previewwindow
-+  redraw
-+  bwipe!
-+endfunc
--- 
-2.27.0
-
diff --git a/backport-CVE-2021-3875.patch b/backport-CVE-2021-3875.patch
deleted file mode 100644
index ac923907a424620b69f19f699c83473e85837db8..0000000000000000000000000000000000000000
--- a/backport-CVE-2021-3875.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 35a319b77f897744eec1155b736e9372c9c5575f Mon Sep 17 00:00:00 2001
-From: Bram Moolenaar <Bram@vim.org>
-Date: Sat, 9 Oct 2021 13:58:55 +0100
-Subject: [PATCH] patch 8.2.3489: ml_get error after search with range
-
-Problem:    ml_get error after search with range.
-Solution:   Limit the line number to the buffer line count.
----
- src/ex_docmd.c              |  6 ++++--
- src/testdir/test_search.vim | 14 ++++++++++++++
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/src/ex_docmd.c b/src/ex_docmd.c
-index 76daf43..12554fa 100644
---- a/src/ex_docmd.c
-+++ b/src/ex_docmd.c
-@@ -3586,8 +3586,10 @@ get_address(
- 
- 		    // When '/' or '?' follows another address, start from
- 		    // there.
--		    if (lnum != MAXLNUM)
--			curwin->w_cursor.lnum = lnum;
-+		    if (lnum > 0 && lnum != MAXLNUM)
-+			curwin->w_cursor.lnum =
-+				lnum > curbuf->b_ml.ml_line_count
-+					   ? curbuf->b_ml.ml_line_count : lnum;
- 
- 		    // Start a forward search at the end of the line (unless
- 		    // before the first line).
-diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
-index 1876713..ac0881c 100644
---- a/src/testdir/test_search.vim
-+++ b/src/testdir/test_search.vim
-@@ -1366,3 +1366,17 @@ func Test_searchdecl()
- 
-   bwipe!
- endfunc
-+
-+func Test_search_with_invalid_range()
-+  new
-+  let lines =<< trim END
-+    /\%.v
-+    5/
-+    c
-+  END
-+  call writefile(lines, 'Xrangesearch')
-+  source Xrangesearch
-+
-+  bwipe!
-+  call delete('Xrangesearch')
-+endfunc
--- 
-2.27.0
-
diff --git a/backport-CVE-2021-3903.patch b/backport-CVE-2021-3903.patch
deleted file mode 100644
index 98f34c5fb3dd674e33e9e2e4fc85035c28ad6d1e..0000000000000000000000000000000000000000
--- a/backport-CVE-2021-3903.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 777e7c21b7627be80961848ac560cb0a9978ff43 Mon Sep 17 00:00:00 2001
-From: Bram Moolenaar <Bram@vim.org>
-Date: Mon, 25 Oct 2021 17:07:04 +0100
-Subject: [PATCH] patch 8.2.3564: invalid memory access when scrolling without
- valid screen
-
-Problem:    Invalid memory access when scrolling without a valid screen.
-Solution:   Do not set VALID_BOTLINE in w_valid.
----
- src/move.c                  |  1 -
- src/testdir/test_normal.vim | 22 +++++++++++++++++++---
- 2 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/src/move.c b/src/move.c
-index 8e53d8b..10165ef 100644
---- a/src/move.c
-+++ b/src/move.c
-@@ -198,7 +198,6 @@ update_topline(void)
-     {
- 	curwin->w_topline = curwin->w_cursor.lnum;
- 	curwin->w_botline = curwin->w_topline;
--	curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
- 	curwin->w_scbind_pos = 1;
- 	return;
-     }
-diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
-index d45cf41..1f0088a 100644
---- a/src/testdir/test_normal.vim
-+++ b/src/testdir/test_normal.vim
-@@ -33,14 +33,14 @@ func CountSpaces(type, ...)
-   else
-     silent exe "normal! `[v`]y"
-   endif
--  let g:a=strlen(substitute(@@, '[^ ]', '', 'g'))
-+  let g:a = strlen(substitute(@@, '[^ ]', '', 'g'))
-   let &selection = sel_save
-   let @@ = reg_save
- endfunc
- 
- func OpfuncDummy(type, ...)
-   " for testing operatorfunc
--  let g:opt=&linebreak
-+  let g:opt = &linebreak
- 
-   if a:0  " Invoked from Visual mode, use gv command.
-     silent exe "normal! gvy"
-@@ -51,7 +51,7 @@ func OpfuncDummy(type, ...)
-   endif
-   " Create a new dummy window
-   new
--  let g:bufnr=bufnr('%')
-+  let g:bufnr = bufnr('%')
- endfunc
- 
- fun! Test_normal00_optrans()
-@@ -2705,3 +2705,19 @@ func Test_normal_gk()
-   bw!
-   set cpoptions& number& numberwidth&
- endfunc
-+
-+func Test_scroll_in_ex_mode()
-+  " This was using invalid memory because w_botline was invalid.
-+  let lines =<< trim END
-+      diffsplit
-+      norm os00(
-+      call writefile(['done'], 'Xdone')
-+      qa!
-+  END
-+  call writefile(lines, 'Xscript')
-+  call assert_equal(1, RunVim([], [], '--clean -X -Z -e -s -S Xscript'))
-+  call assert_equal(['done'], readfile('Xdone'))
-+
-+  call delete('Xscript')
-+  call delete('Xdone')
-+endfunc
--- 
-1.8.3.1
-
diff --git a/backport-CVE-2021-3927.patch b/backport-CVE-2021-3927.patch
deleted file mode 100644
index 11fc0a9d3236f6908b10e6e32489f42c96e13662..0000000000000000000000000000000000000000
--- a/backport-CVE-2021-3927.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0b5b06cb4777d1401fdf83e7d48d287662236e7e Mon Sep 17 00:00:00 2001
-From: Bram Moolenaar <Bram@vim.org>
-Date: Thu, 4 Nov 2021 15:10:11 +0000
-Subject: [PATCH] patch 8.2.3581: reading character past end of line
-
-Problem:    Reading character past end of line.
-Solution:   Correct the cursor column.
----
- src/ex_docmd.c           | 1 +
- src/testdir/test_put.vim | 9 +++++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/src/ex_docmd.c b/src/ex_docmd.c
-index 12554fa..203174a 100644
---- a/src/ex_docmd.c
-+++ b/src/ex_docmd.c
-@@ -6906,6 +6906,7 @@ ex_put(exarg_T *eap)
- 	eap->forceit = TRUE;
-     }
-     curwin->w_cursor.lnum = eap->line2;
-+    check_cursor_col();
-     do_put(eap->regname, eap->forceit ? BACKWARD : FORWARD, 1L,
- 						       PUT_LINE|PUT_CURSLINE);
- }
-diff --git a/src/testdir/test_put.vim b/src/testdir/test_put.vim
-index 225ebd1..f5037dc 100644
---- a/src/testdir/test_put.vim
-+++ b/src/testdir/test_put.vim
-@@ -113,3 +113,12 @@ func Test_put_p_indent_visual()
-   call assert_equal('select that text', getline(2))
-   bwipe!
- endfunc
-+
-+func Test_put_above_first_line()
-+  new
-+  let @" = 'text'
-+  silent! normal 0o00
-+  0put
-+  call assert_equal('text', getline(1))
-+  bwipe!
-+endfunc
--- 
-1.8.3.1
-
diff --git a/backport-CVE-2021-3928.patch b/backport-CVE-2021-3928.patch
deleted file mode 100644
index 5a96fdad03c214dde5eff62ab5459c4f63b8cd11..0000000000000000000000000000000000000000
--- a/backport-CVE-2021-3928.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 15d9890eee53afc61eb0a03b878a19cb5672f732 Mon Sep 17 00:00:00 2001
-From: Bram Moolenaar <Bram@vim.org>
-Date: Thu, 4 Nov 2021 15:46:05 +0000
-Subject: [PATCH] patch 8.2.3582: reading uninitialized memory when giving
- spell suggestions
-
-Problem:    Reading uninitialized memory when giving spell suggestions.
-Solution:   Check that preword is not empty.
----
- src/spellsuggest.c         | 2 +-
- src/testdir/test_spell.vim | 8 ++++++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/spellsuggest.c b/src/spellsuggest.c
-index 9d6df79..8615d52 100644
---- a/src/spellsuggest.c
-+++ b/src/spellsuggest.c
-@@ -1600,7 +1600,7 @@ suggest_trie_walk(
- 		    // char, e.g., "thes," -> "these".
- 		    p = fword + sp->ts_fidx;
- 		    MB_PTR_BACK(fword, p);
--		    if (!spell_iswordp(p, curwin))
-+		    if (!spell_iswordp(p, curwin) && *preword != NUL)
- 		    {
- 			p = preword + STRLEN(preword);
- 			MB_PTR_BACK(preword, p);
-diff --git a/src/testdir/test_spell.vim b/src/testdir/test_spell.vim
-index 79fb892..e435e91 100644
---- a/src/testdir/test_spell.vim
-+++ b/src/testdir/test_spell.vim
-@@ -498,6 +498,14 @@ func Test_spell_screendump()
-   call delete('XtestSpell')
- endfunc
- 
-+func Test_spell_single_word()
-+  new
-+  silent! norm 0R00
-+  spell! ßÂ
-+  silent 0norm 0r$ Dvz=
-+  bwipe!
-+endfunc
-+
- let g:test_data_aff1 = [
-       \"SET ISO8859-1",
-       \"TRY esianrtolcdugmphbyfvkwjkqxz-\xEB\xE9\xE8\xEA\xEF\xEE\xE4\xE0\xE2\xF6\xFC\xFB'ESIANRTOLCDUGMPHBYFVKWJKQXZ",
--- 
-1.8.3.1
-
diff --git a/backport-Configure-does-not-recognize-gcc-10.0-and-later.patch b/backport-Configure-does-not-recognize-gcc-10.0-and-later.patch
deleted file mode 100644
index c366e24c5fb34869c775d899e2f2881303b018d3..0000000000000000000000000000000000000000
--- a/backport-Configure-does-not-recognize-gcc-10.0-and-later.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 7077892a7918845a00ce8d7833b43cc6cbed2081 Mon Sep 17 00:00:00 2001
-From: Bram Moolenaar <Bram@vim.org>
-Date: Wed, 5 Feb 2020 20:44:24 +0100
-Subject: [PATCH] patch 8.2.0213: configure does not recognize gcc 10.0 and
- later
-
-Problem:    Configure does not recognize gcc 10.0 and later.
-Solution:   Adjust the pattern matching the version number. (Sergei
-            Trofimovich, closes #5580)
----
- src/auto/configure | 2 +-
- src/configure.ac   | 4 ++--
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/auto/configure b/src/auto/configure
-index 1b5094e972b2..59f3e68d63cf 100755
---- a/src/auto/configure
-+++ b/src/auto/configure
-@@ -14762,7 +14762,7 @@ DEPEND_CFLAGS_FILTER=
- if test "$GCC" = yes; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC 3 or later" >&5
- $as_echo_n "checking for GCC 3 or later... " >&6; }
--  gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
-+  gccmajor=`echo "$gccversion" | sed -e 's/^\([0-9]\+\)\..*$/\1/g'`
-   if test "$gccmajor" -gt "2"; then
-     DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-diff --git a/src/configure.ac b/src/configure.ac
-index a098da82ec84..bf10eac5511b 100644
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -2195,7 +2195,7 @@ else
-   fi
- 
-   dnl On my HPUX system the X include dir is found, but the lib dir not.
--  dnl This is a desparate try to fix this.
-+  dnl This is a desperate try to fix this.
- 
-   if test -d "$x_includes" && test ! -d "$x_libraries"; then
-     x_libraries=`echo "$x_includes" | sed s/include/lib/`
-@@ -4447,7 +4447,7 @@ dnl the number before the version number.
- DEPEND_CFLAGS_FILTER=
- if test "$GCC" = yes; then
-   AC_MSG_CHECKING(for GCC 3 or later)
--  gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'`
-+  gccmajor=`echo "$gccversion" | sed -e 's/^\([[0-9]]\+\)\..*$/\1/g'`
-   if test "$gccmajor" -gt "2"; then
-     DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
-     AC_MSG_RESULT(yes)
diff --git a/backport-Fix-build-failuers-with-perl-5.32.patch b/backport-Fix-build-failuers-with-perl-5.32.patch
deleted file mode 100644
index 63b2150a770ac0a40bdf4c3643905786dd91cb87..0000000000000000000000000000000000000000
--- a/backport-Fix-build-failuers-with-perl-5.32.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 5d35e2ad1027e394877e096f618536da0ad11ffa Mon Sep 17 00:00:00 2001
-From: Felix Yan <felixonmars@archlinux.org>
-Date: Mon, 22 Jun 2020 00:00:44 +0800
-Subject: [PATCH] Fix build failures with Perl 5.32
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-More functions are needed in latest Perl 5.32. This patch fixes the following build failures:
-```
-In file included from /usr/lib/perl5/5.32/core_perl/CORE/perl.h:3909,
-                 from if_perl.xs:61:
-if_perl.xs: In function ‘perl_win_free’:
-/usr/lib/perl5/5.32/core_perl/CORE/sv.h:351:26: warning: implicit declaration of function ‘Perl_SvREFCNT_dec’; did you mean ‘S_SvREFCNT_dec’? [-Wimplicit-function-declaration]
-  351 | #define SvREFCNT_dec(sv) Perl_SvREFCNT_dec(aTHX_ MUTABLE_SV(sv))
-      |                          ^~~~~~~~~~~~~~~~~
-/usr/lib/perl5/5.32/core_perl/CORE/sv.h:351:26: note: in definition of macro ‘SvREFCNT_dec’
-  351 | #define SvREFCNT_dec(sv) Perl_SvREFCNT_dec(aTHX_ MUTABLE_SV(sv))
-      |                          ^~~~~~~~~~~~~~~~~
-if_perl.xs: In function ‘ex_perl’:
-/usr/lib/perl5/5.32/core_perl/CORE/sv.h:1842:28: warning: implicit declaration of function ‘Perl_SvTRUE’ [-Wimplicit-function-declaration]
- 1842 | #define SvTRUE(sv)         Perl_SvTRUE(aTHX_ sv)
-      |                            ^~~~~~~~~~~
-/usr/lib/perl5/5.32/core_perl/CORE/sv.h:1842:28: note: in definition of macro ‘SvTRUE’
- 1842 | #define SvTRUE(sv)         Perl_SvTRUE(aTHX_ sv)
-      |                            ^~~~~~~~~~~
-In file included from /usr/lib/perl5/5.32/core_perl/CORE/perl.h:5544,
-                 from if_perl.xs:61:
-if_perl.c: In function ‘XS_VIM_Msg’:
-/usr/lib/perl5/5.32/core_perl/CORE/pp.h:71:17: warning: implicit declaration of function ‘Perl_POPMARK’; did you mean ‘S_POPMARK’? [-Wimplicit-function-declaration]
-   71 | #define POPMARK Perl_POPMARK(aTHX)
-      |                 ^~~~~~~~~~~~
-/usr/lib/perl5/5.32/core_perl/CORE/pp.h:71:17: note: in definition of macro ‘POPMARK’
-   71 | #define POPMARK Perl_POPMARK(aTHX)
-      |                 ^~~~~~~~~~~~
-/usr/lib/perl5/5.32/core_perl/CORE/XSUB.h:157:7: note: in expansion of macro ‘dAXMARK’
-  157 |  dSP; dAXMARK; dITEMS
-      |       ^~~~~~~
-if_perl.c:1661:11: note: in expansion of macro ‘dXSARGS’
-gcc -c -I. -Iproto -DHAVE_CONFIG_H     -march=x86-64 -mtune=generic -O2 -pipe -fno-plt -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1        version.c -o objects/version.o
-link.sh: $LINK_AS_NEEDED set to 'yes': invoking linker directly.
-  gcc   -L. -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now -fstack-protector-strong -rdynamic -Wl,-export-dynamic -Wl,-E -Wl,-rpath,/usr/lib/perl5/5.32/core_perl/CORE  -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now -L/usr/local/lib -Wl,--as-needed    -o vim objects/arabic.o objects/arglist.o objects/autocmd.o objects/beval.o objects/buffer.o objects/change.o objects/blob.o objects/blowfish.o objects/cindent.o objects/clientserver.o objects/clipboard.o objects/cmdexpand.o objects/cmdhist.o objects/crypt.o objects/crypt_zip.o objects/debugger.o objects/dict.o objects/diff.o objects/digraph.o objects/drawline.o objects/drawscreen.o objects/edit.o objects/eval.o objects/evalbuffer.o objects/evalfunc.o objects/evalvars.o objects/evalwindow.o objects/ex_cmds.o objects/ex_cmds2.o objects/ex_docmd.o objects/ex_eval.o objects/ex_getln.o objects/fileio.o objects/filepath.o objects/findfile.o objects/fold.o objects/getchar.o objects/hardcopy.o objects/hashtab.o objects/highlight.o objects/if_cscope.o objects/if_xcmdsrv.o objects/indent.o objects/insexpand.o objects/list.o objects/map.o objects/mark.o objects/mbyte.o objects/memline.o objects/menu.o objects/misc1.o objects/misc2.o objects/mouse.o objects/move.o objects/normal.o objects/ops.o objects/option.o objects/optionstr.o objects/os_unix.o objects/pathdef.o objects/popupmenu.o objects/popupwin.o objects/profiler.o objects/pty.o objects/quickfix.o objects/regexp.o objects/register.o objects/screen.o objects/scriptfile.o objects/search.o objects/session.o objects/sha256.o objects/sign.o objects/sound.o objects/spell.o objects/spellfile.o objects/spellsuggest.o objects/syntax.o objects/tag.o objects/term.o objects/terminal.o objects/testing.o objects/textformat.o objects/textobject.o objects/textprop.o objects/time.o objects/ui.o objects/undo.o objects/usercmd.o objects/userfunc.o objects/version.o objects/vim9compile.o objects/vim9execute.o objects/vim9script.o objects/viminfo.o objects/window.o objects/bufwrite.o  objects/vterm_encoding.o objects/vterm_keyboard.o objects/vterm_mouse.o objects/vterm_parser.o objects/vterm_pen.o objects/vterm_screen.o objects/vterm_state.o objects/vterm_unicode.o objects/vterm_vterm.o objects/if_lua.o  objects/if_perl.o objects/if_perlsfio.o objects/if_python.o objects/if_python3.o objects/if_tcl.o objects/if_ruby.o  objects/netbeans.o objects/channel.o objects/xdiffi.o objects/xemit.o objects/xprepare.o objects/xutils.o objects/xhistogram.o objects/xpatience.o  objects/charset.o objects/json.o objects/main.o objects/memfile.o objects/message.o        -lm -ltinfo -lelf    -lacl -lattr -lgpm -ldl   -Wl,-E -Wl,-rpath,/usr/lib/perl5/5.32/core_perl/CORE -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now -fstack-protector-strong -L/usr/local/lib  -L/usr/lib/perl5/5.32/core_perl/CORE -lperl -lpthread -ldl -lm -lcrypt -lutil -lc   -L/usr/lib -ltclstub8.6 -ldl -lz -lpthread -lm
-/usr/bin/ld: objects/if_perl.o: in function `cur_val':
-if_perl.c:(.text+0xaee): undefined reference to `Perl_SvREFCNT_dec'
-/usr/bin/ld: objects/if_perl.o: in function `XS_VIBUF_Count':
-if_perl.c:(.text+0xc29): undefined reference to `Perl_POPMARK'
-/usr/bin/ld: objects/if_perl.o: in function `XS_VIBUF_Number':
-if_perl.c:(.text+0xe89): undefined reference to `Perl_POPMARK'
-/usr/bin/ld: objects/if_perl.o: in function `XS_VIBUF_Name':
-if_perl.c:(.text+0x10e9): undefined reference to `Perl_POPMARK'
-/usr/bin/ld: objects/if_perl.o: in function `XS_VIBUF_DESTROY':
-if_perl.c:(.text+0x13f5): undefined reference to `Perl_POPMARK'
-/usr/bin/ld: objects/if_perl.o: in function `XS_VIBUF_Append':
-if_perl.c:(.text+0x15ea): undefined reference to `Perl_POPMARK'
-/usr/bin/ld: objects/if_perl.o:if_perl.c:(.text+0x1a4a): more undefined references to `Perl_POPMARK' follow
-/usr/bin/ld: objects/if_perl.o: in function `perl_win_free':
-if_perl.c:(.text+0x4bb7): undefined reference to `Perl_SvREFCNT_dec'
-/usr/bin/ld: objects/if_perl.o: in function `perl_buf_free':
-if_perl.c:(.text+0x4c27): undefined reference to `Perl_SvREFCNT_dec'
-/usr/bin/ld: objects/if_perl.o: in function `ex_perl':
-if_perl.c:(.text+0x4d58): undefined reference to `Perl_SvTRUE'
-/usr/bin/ld: if_perl.c:(.text+0x4d8a): undefined reference to `Perl_SvREFCNT_dec'
-/usr/bin/ld: objects/if_perl.o: in function `do_perleval':
-if_perl.c:(.text+0x51f7): undefined reference to `Perl_SvTRUE'
-/usr/bin/ld: if_perl.c:(.text+0x5433): undefined reference to `Perl_SvREFCNT_dec'
-/usr/bin/ld: objects/if_perl.o: in function `ex_perldo':
-if_perl.c:(.text+0x577c): undefined reference to `Perl_SvREFCNT_dec'
-/usr/bin/ld: if_perl.c:(.text+0x5943): undefined reference to `Perl_SvTRUE'
-collect2: error: ld returned 1 exit status
-link.sh: Linking failed
-```
----
- src/if_perl.xs | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff -Naur a/src/if_perl.xs b/src/if_perl.xs
---- a/src/if_perl.xs	2019-02-23 22:00:57.000000000 +0800
-+++ b/src/if_perl.xs	2020-08-15 10:43:20.621318684 +0800
-@@ -649,6 +649,10 @@
- 	    Perl_sv_free2(aTHX_ sv, rc);
-     }
- }
-+/* perl-5.32 needs Perl_SvREFCNT_dec */
-+# if (PERL_REVISION == 5) && (PERL_VERSION >= 32)
-+#define Perl_SvREFCNT_dec S_SvREFCNT_dec
-+# endif
- # endif
- 
- /* perl-5.26 also needs S_TOPMARK and S_POPMARK. */
-@@ -673,6 +677,21 @@
-     assert((PL_markstack_ptr > PL_markstack) || !"MARK underflow");
-     return *PL_markstack_ptr--;
- }
-+/* perl-5.32 needs Perl_POPMARK */
-+# if (PERL_REVISION == 5) && (PERL_VERSION >= 32)
-+#define Perl_POPMARK S_POPMARK
-+# endif
-+# endif
-+
-+/* perl-5.32 needs Perl_SvTRUE */
-+# if (PERL_REVISION == 5) && (PERL_VERSION >= 32)
-+PERL_STATIC_INLINE bool
-+Perl_SvTRUE(pTHX_ SV *sv) {
-+    if (!LIKELY(sv))
-+        return FALSE;
-+    SvGETMAGIC(sv);
-+    return SvTRUE_nomg_NN(sv);
-+}
- # endif
- 
- /*
diff --git a/backport-memory-leak-for-retab-with-invalid-argument.patch b/backport-memory-leak-for-retab-with-invalid-argument.patch
deleted file mode 100644
index fa19957dd33a9ef43fd38fe78125f76b5d466de6..0000000000000000000000000000000000000000
--- a/backport-memory-leak-for-retab-with-invalid-argument.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 2ddb89f8a94425cda1e5491efc80c1ccccb6e08e Mon Sep 17 00:00:00 2001
-From: Bram Moolenaar <Bram@vim.org>
-Date: Sat, 4 Sep 2021 21:20:41 +0200
-Subject: [PATCH] patch 8.2.3403: memory leak for :retab with invalid argument
-
-Problem:    Memory leak for :retab with invalid argument.
-Solution:   Free the memory.  Make error messages consistent.
----
- src/indent.c  | 13 +++++++++++--
- src/version.c |  2 ++
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/src/indent.c b/src/indent.c
-index 7e196c2..7d04373 100644
---- a/src/indent.c
-+++ b/src/indent.c
-@@ -70,9 +70,12 @@ tabstop_set(char_u *var, int **array)
-     {
- 	int n = atoi((char *)cp);
- 
-+	// Catch negative values, overflow and ridiculous big values.
- 	if (n < 0 || n > 9999)
- 	{
- 	    semsg(_(e_invarg2), cp);
-+	    vim_free(*array);
-+	    *array = NULL;
- 	    return FAIL;
- 	}
- 	(*array)[t++] = n;
-@@ -1580,12 +1583,18 @@ ex_retab(exarg_T *eap)
-     else
- 	new_ts_str = vim_strnsave(new_ts_str, eap->arg - new_ts_str);
- #else
--    new_ts = getdigits(&(eap->arg));
--    if (new_ts < 0)
-+    ptr = eap->arg;
-+    new_ts = getdigits(&ptr);
-+    if (new_ts < 0 && *eap->arg == '-')
-     {
- 	emsg(_(e_positive));
- 	return;
-     }
-+    if (new_ts < 0 || new_ts > 9999)
-+    {
-+	semsg(_(e_invarg2), eap->arg);
-+	return;
-+    }
-     if (new_ts == 0)
- 	new_ts = curbuf->b_p_ts;
- #endif
-diff --git a/src/version.c b/src/version.c
-index 8912f62..f8e4561 100644
---- a/src/version.c
-+++ b/src/version.c
-@@ -743,6 +743,8 @@ static char *(features[]) =
- static int included_patches[] =
- {   /* Add new patch number below this line */
- /**/
-+    3403,
-+/**/
-     3402,
- /**/
-     0
--- 
-1.8.3.1
-
diff --git a/bugfix-rm-modify-info-version.patch b/bugfix-rm-modify-info-version.patch
index 1d070f081332220eba3a69990f5ee4a61c8dcb3d..1f6d7622ac71339b7a964caab58e3beacdf45429 100644
--- a/bugfix-rm-modify-info-version.patch
+++ b/bugfix-rm-modify-info-version.patch
@@ -5,10 +5,11 @@ Subject: [PATCH] vim:fix-rm-modify-info-version
 
 reason:fix-rm-modify-info-version
 
-diff -uNr vim74/src/version.c vimnew/src/version.c
---- vim74/src/version.c	2016-01-05 19:36:17.832565621 +0800
-+++ vimnew/src/version.c	2016-01-05 19:38:35.597565621 +0800
-@@ -26,7 +26,7 @@
+diff --git a/src/version.c b/src/version.c
+index b7a93ed..48f7018 100644
+--- a/src/version.c
++++ b/src/version.c
+@@ -23,7 +23,7 @@
   */
  
  #include "version.h"
@@ -17,3 +18,6 @@ diff -uNr vim74/src/version.c vimnew/src/version.c
  char		*Version = VIM_VERSION_SHORT;
  static char	*mediumVersion = VIM_VERSION_MEDIUM;
  
+-- 
+1.8.3.1
+
diff --git a/vim-8.2.tar.bz2 b/v8.2.3678.tar.gz
similarity index 53%
rename from vim-8.2.tar.bz2
rename to v8.2.3678.tar.gz
index ceeb7c26e5f950f5018d6d732ddc1d186c0cbcbf..a3e0a2c34d9996a8b5939b079a73e1f74a9c984b 100644
Binary files a/vim-8.2.tar.bz2 and b/v8.2.3678.tar.gz differ
diff --git a/vim-7.0-fixkeys.patch b/vim-7.0-fixkeys.patch
index 4092b3e63c15ab798f9bf13d4942350685b5a8e8..9de5adb6ebfc0bc8ea59803f15cc4bfae607ae06 100644
--- a/vim-7.0-fixkeys.patch
+++ b/vim-7.0-fixkeys.patch
@@ -1,9 +1,10 @@
-diff -up vim81/src/term.c.fixkeys vim81/src/term.c
---- vim81/src/term.c.fixkeys	2019-12-12 09:00:20.685567074 +0100
-+++ vim81/src/term.c	2019-12-12 09:21:36.708769626 +0100
-@@ -957,14 +957,14 @@ static struct builtin_term builtin_termc
-     {K_XRIGHT,		IF_EB("\033[1;*C", ESC_STR "[1;*C")},
-     {K_XLEFT,		IF_EB("\033[1;*D", ESC_STR "[1;*D")},
+diff --git a/src/term.c b/src/term.c
+index 52533e9..2b5ab6b 100644
+--- a/src/term.c
++++ b/src/term.c
+@@ -928,14 +928,14 @@ static struct builtin_term builtin_termcaps[] =
+     {K_XRIGHT,		IF_EB("\033[@;*C", ESC_STR "[@;*C")},
+     {K_XLEFT,		IF_EB("\033[@;*D", ESC_STR "[@;*D")},
      // An extra set of function keys for vt100 mode
 -    {K_XF1,		IF_EB("\033O*P", ESC_STR "O*P")},
 -    {K_XF2,		IF_EB("\033O*Q", ESC_STR "O*Q")},
@@ -24,3 +25,6 @@ diff -up vim81/src/term.c.fixkeys vim81/src/term.c
      {K_F5,		IF_EB("\033[15;*~", ESC_STR "[15;*~")},
      {K_F6,		IF_EB("\033[17;*~", ESC_STR "[17;*~")},
      {K_F7,		IF_EB("\033[18;*~", ESC_STR "[18;*~")},
+-- 
+1.8.3.1
+
diff --git a/vim-7.0-rclocation.patch b/vim-7.0-rclocation.patch
deleted file mode 100644
index 840f53e8cc330d89947618569d2a16ec2ab5305a..0000000000000000000000000000000000000000
--- a/vim-7.0-rclocation.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- vim62/src/os_unix.h.rcloc	2003-08-04 15:38:05.000000000 +0200
-+++ vim62/src/os_unix.h	2003-08-04 15:39:25.000000000 +0200
-@@ -230,10 +230,10 @@
-  * Unix system-dependent file names
-  */
- #ifndef SYS_VIMRC_FILE
--# define SYS_VIMRC_FILE "$VIM/vimrc"
-+# define SYS_VIMRC_FILE "/etc/vimrc"
- #endif
- #ifndef SYS_GVIMRC_FILE
--# define SYS_GVIMRC_FILE "$VIM/gvimrc"
-+# define SYS_GVIMRC_FILE "/etc/gvimrc"
- #endif
- #ifndef DFLT_HELPFILE
- # define DFLT_HELPFILE	"$VIMRUNTIME/doc/help.txt"
diff --git a/vim-7.4-checkhl.patch b/vim-7.4-checkhl.patch
deleted file mode 100644
index f7fbf90418a27761f6ea65d230fae6248d349e83..0000000000000000000000000000000000000000
--- a/vim-7.4-checkhl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up vim74/runtime/syntax/spec.vim.kh1 vim74/runtime/syntax/spec.vim
---- vim74/runtime/syntax/spec.vim.kh1	2016-08-04 15:23:25.275955301 +0200
-+++ vim74/runtime/syntax/spec.vim	2016-08-04 15:24:56.699417602 +0200
-@@ -114,7 +114,7 @@ syn region specDescriptionArea matchgrou
- syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
- 
- "%% Scripts Section %%
--syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
-+syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|check\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
- 
- "%% Changelog Section %%
- syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense
diff --git a/vim-7.4-fstabsyntax.patch b/vim-7.4-fstabsyntax.patch
index 87ddef43a943ff2ad42fb8252a24df2312e73b6d..3ffc4763de2bd77831aa34f0628bcfb952957eec 100644
--- a/vim-7.4-fstabsyntax.patch
+++ b/vim-7.4-fstabsyntax.patch
@@ -1,7 +1,8 @@
-diff -up vim81/runtime/syntax/fstab.vim.fstabsyntax vim81/runtime/syntax/fstab.vim
---- vim81/runtime/syntax/fstab.vim.fstabsyntax	2019-06-11 09:55:23.000000000 +0200
-+++ vim81/runtime/syntax/fstab.vim	2019-06-11 10:14:22.223616868 +0200
-@@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword containe
+diff --git a/runtime/syntax/fstab.vim b/runtime/syntax/fstab.vim
+index 3184887..47e6219 100644
+--- a/runtime/syntax/fstab.vim
++++ b/runtime/syntax/fstab.vim
+@@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword contained none swap
  " Type
  syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
  syn match fsTypeUnknown /\s\+\zs\w\+/ contained
@@ -10,12 +11,15 @@ diff -up vim81/runtime/syntax/fstab.vim.fstabsyntax vim81/runtime/syntax/fstab.v
  
  " Options
  " -------
-@@ -68,7 +68,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-]
+@@ -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 norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx nofail
+-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 nofail failok
 +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 nofail
  syn match fsOptionsGeneral /_netdev/
  
  " Options: adfs
+-- 
+1.8.3.1
+
diff --git a/vim-7.4-globalsyntax.patch b/vim-7.4-globalsyntax.patch
index 1e0b08ed9a4b024841811343ee83f1e8bcfb9cb7..8bc63aada75c3fc381cd9dbe9611dc43493fa55a 100644
--- a/vim-7.4-globalsyntax.patch
+++ b/vim-7.4-globalsyntax.patch
@@ -1,12 +1,16 @@
-diff -up vim74/runtime/syntax/spec.vim.orig vim74/runtime/syntax/spec.vim
---- vim74/runtime/syntax/spec.vim.orig	2016-01-12 13:51:55.727569873 +0100
-+++ vim74/runtime/syntax/spec.vim	2016-01-12 13:53:08.124991178 +0100
-@@ -114,7 +114,7 @@ syn region specDescriptionArea matchgrou
+diff --git a/runtime/syntax/spec.vim b/runtime/syntax/spec.vim
+index 2dc22a2..d19aa0a 100644
+--- a/runtime/syntax/spec.vim
++++ b/runtime/syntax/spec.vim
+@@ -111,7 +111,7 @@ syn region specDescriptionArea matchgroup=specSection start='^%description' end=
  syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
  
  "%% Scripts Section %%
--syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|check\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
-+syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|check\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|global\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
+-syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
++syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|global\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
  
  "%% Changelog Section %%
  syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense
+-- 
+1.8.3.1
+
diff --git a/vim-7.4-nowarnings.patch b/vim-7.4-nowarnings.patch
deleted file mode 100644
index a98e9d61aeb45495221c5c4e15b026aba5a2414f..0000000000000000000000000000000000000000
--- a/vim-7.4-nowarnings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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)
-     void
- ex_ni(exarg_T *eap)
- {
-+    return;
-     if (!eap->skip)
- 	eap->errmsg = N_("E319: Sorry, the command is not available in this version");
- }
diff --git a/vim-7.4-releasestring-1318991.patch b/vim-7.4-releasestring-1318991.patch
index 291b957fbba3a8ec06d408377f8ce592817817d1..e0a64fcb202076232d6cf184b2118093752c3c14 100644
--- a/vim-7.4-releasestring-1318991.patch
+++ b/vim-7.4-releasestring-1318991.patch
@@ -1,6 +1,7 @@
-diff -up vim74/runtime/ftplugin/spec.vim.1318991 vim74/runtime/ftplugin/spec.vim
---- vim74/runtime/ftplugin/spec.vim.1318991	2016-08-04 15:29:42.423862424 +0200
-+++ vim74/runtime/ftplugin/spec.vim	2016-08-04 15:31:08.797299188 +0200
+diff --git a/runtime/ftplugin/spec.vim b/runtime/ftplugin/spec.vim
+index ce00021..c94cc2e 100644
+--- a/runtime/ftplugin/spec.vim
++++ b/runtime/ftplugin/spec.vim
 @@ -41,8 +41,8 @@ else:
          headers = spec.sourceHeader
          version = headers["Version"]
@@ -12,3 +13,6 @@ diff -up vim74/runtime/ftplugin/spec.vim.1318991 vim74/runtime/ftplugin/spec.vim
  PYEND
  		endif
  	endfunction
+-- 
+1.8.3.1
+
diff --git a/vim-7.4-specsyntax.patch b/vim-7.4-specsyntax.patch
index 3c028b567c999bb9b41c195b20f0e10b869ebe75..7e40c2015a35bb859ad0d7b8e98f1c1710ec1080 100644
--- a/vim-7.4-specsyntax.patch
+++ b/vim-7.4-specsyntax.patch
@@ -1,7 +1,8 @@
-diff -up vim74/runtime/syntax/spec.vim.highlite vim74/runtime/syntax/spec.vim
---- vim74/runtime/syntax/spec.vim.highlite	2016-07-04 10:17:45.000000000 +0200
-+++ vim74/runtime/syntax/spec.vim	2016-08-04 15:20:26.116049343 +0200
-@@ -38,7 +38,7 @@ syn match specNoNumberHilite 'X11\|X11R6
+diff --git a/runtime/syntax/spec.vim b/runtime/syntax/spec.vim
+index d7d5877..2dc22a2 100644
+--- a/runtime/syntax/spec.vim
++++ b/runtime/syntax/spec.vim
+@@ -35,7 +35,7 @@ syn match specNoNumberHilite 'X11\|X11R6\|[a-zA-Z]*\.\d\|[a-zA-Z][-/]\d'
  syn match specManpageFile '[a-zA-Z]\.1'
  
  "Day, Month and most used license acronyms
@@ -10,7 +11,7 @@ diff -up vim74/runtime/syntax/spec.vim.highlite vim74/runtime/syntax/spec.vim
  syn keyword specWeekday contained Mon Tue Wed Thu Fri Sat Sun
  syn keyword specMonth   contained Jan Feb Mar Apr Jun Jul Aug Sep Oct Nov Dec
  syn keyword specMonth   contained January February March April May June July August September October November December
-@@ -61,9 +61,9 @@ syn cluster specListedFiles contains=spe
+@@ -58,9 +58,9 @@ syn cluster specListedFiles contains=specListedFilesBin,specListedFilesLib,specL
  
  "specComands
  syn match   specConfigure  contained '\./configure'
@@ -22,7 +23,7 @@ diff -up vim74/runtime/syntax/spec.vim.highlite vim74/runtime/syntax/spec.vim
  syn cluster specCommands contains=specCommand,specTarCommand,specConfigure,specCommandSpecial
  
  "frequently used rpm env vars
-@@ -105,7 +105,7 @@ syn case ignore
+@@ -102,7 +102,7 @@ syn case ignore
  "%% PreAmble Section %%
  "Copyright and Serial were deprecated by License and Epoch
  syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
@@ -31,3 +32,6 @@ diff -up vim74/runtime/syntax/spec.vim.highlite vim74/runtime/syntax/spec.vim
  
  "%% Description Section %%
  syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment
+-- 
+1.8.3.1
+
diff --git a/vim-7.4-syncolor.patch b/vim-7.4-syncolor.patch
deleted file mode 100644
index b41f2fe3bf6bfd3a63c90860b276d8d8cbebadbb..0000000000000000000000000000000000000000
--- a/vim-7.4-syncolor.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/highlight.c b/src/highlight.c
-index 9322f96..f7147a0 100644
---- a/src/highlight.c
-+++ b/src/highlight.c
-@@ -211,8 +211,8 @@ static char *(highlight_init_light[]) = {
-     CENT("Visual term=reverse",
- 	 "Visual term=reverse guibg=LightGrey"),
- #ifdef FEAT_DIFF
--    CENT("DiffAdd term=bold ctermbg=LightBlue",
--	 "DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue"),
-+    CENT("DiffAdd term=bold ctermbg=LightRed",
-+	  "DiffAdd term=bold ctermbg=LightRed guibg=LightBlue"),
-     CENT("DiffChange term=bold ctermbg=LightMagenta",
- 	 "DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta"),
-     CENT("DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan",
-@@ -304,8 +304,8 @@ static char *(highlight_init_dark[]) = {
-     CENT("Visual term=reverse",
- 	 "Visual term=reverse guibg=DarkGrey"),
- #ifdef FEAT_DIFF
--    CENT("DiffAdd term=bold ctermbg=DarkBlue",
--	 "DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue"),
-+    CENT("DiffAdd term=bold ctermbg=DarkRed",
-+	  "DiffAdd term=bold ctermbg=DarkRed guibg=DarkBlue"),
-     CENT("DiffChange term=bold ctermbg=DarkMagenta",
- 	 "DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta"),
-     CENT("DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan",
diff --git a/vim-7.4-syntax.patch b/vim-7.4-syntax.patch
deleted file mode 100644
index 5131c80318f371e39642952db05bb067c00f8730..0000000000000000000000000000000000000000
--- a/vim-7.4-syntax.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vim74/runtime/filetype.vim.orig	2013-08-12 14:51:58.669350813 +0200
-+++ vim74/runtime/filetype.vim	2013-08-12 14:56:12.432540523 +0200
-@@ -2475,7 +2475,7 @@
- 
- " More Apache config files
- au BufNewFile,BufRead access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*	call s:StarSetf('apache')
--au BufNewFile,BufRead */etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.d/*.conf*		call s:StarSetf('apache')
-+au BufNewFile,BufRead */etc/apache2/*.conf*,*/etc/httpd/conf.*/*,*/etc/httpd/mods-*/*,*/etc/httpd/sites-*/*,*/etc/httpd/conf.d/*.conf*,auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf*		call s:StarSetf('apache')
- 
- " Asterisk config file
- au BufNewFile,BufRead *asterisk/*.conf*		call s:StarSetf('asterisk')
diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch
index 1ef4c9b154dec44af75606739602fcb0ece39481..3ac97e2fdcbd4f37d0119486ae15fbbff1726ac5 100644
--- a/vim-8.0-copy-paste.patch
+++ b/vim-8.0-copy-paste.patch
@@ -1,6 +1,7 @@
-diff -up vim81/runtime/defaults.vim.copypaste vim81/runtime/defaults.vim
---- vim81/runtime/defaults.vim.copypaste	2019-10-30 10:30:23.108710252 +0100
-+++ vim81/runtime/defaults.vim	2019-10-30 10:36:19.127508406 +0100
+diff --git a/runtime/defaults.vim b/runtime/defaults.vim
+index 4a44ebf..63a18a2 100644
+--- a/runtime/defaults.vim
++++ b/runtime/defaults.vim
 @@ -73,18 +73,6 @@ map Q gq
  " Revert with ":iunmap <C-U>".
  inoremap <C-U> <C-G>u<C-U>
@@ -17,6 +18,9 @@ diff -up vim81/runtime/defaults.vim.copypaste vim81/runtime/defaults.vim
 -  endif
 -endif
 -
- " Switch syntax highlighting on when the terminal has colors or when using the
- " GUI (which always has colors).
- if &t_Co > 2 || has("gui_running")
+ " Only do this part when Vim was compiled with the +eval feature.
+ if 1
+ 
+-- 
+1.8.3.1
+
diff --git a/vim-python3-tests.patch b/vim-python3-tests.patch
index 26027f748db5e88eaa31280cedc4ea92baf5d328..fd0a233eeb01dbc785fcb59bc82a91477c5a4666 100644
--- a/vim-python3-tests.patch
+++ b/vim-python3-tests.patch
@@ -1,16 +1,18 @@
-diff -up vim80/runtime/tools/demoserver.py.python3-tests vim80/runtime/tools/demoserver.py
---- vim80/runtime/tools/demoserver.py.python3-tests	2018-05-11 08:24:41.774618804 +0200
-+++ vim80/runtime/tools/demoserver.py	2018-05-11 09:24:48.363309856 +0200
+diff --git a/runtime/tools/demoserver.py b/runtime/tools/demoserver.py
+index 00fe8bf..2125014 100644
+--- a/runtime/tools/demoserver.py
++++ b/runtime/tools/demoserver.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
  #
  # Server that will accept connections from a Vim channel.
  # Run this server and then in Vim you can open the channel:
-diff -up vim80/src/auto/configure.python3-tests vim80/src/auto/configure
---- vim80/src/auto/configure.python3-tests	2018-05-11 08:25:03.632420873 +0200
-+++ vim80/src/auto/configure	2018-05-11 09:25:26.062000471 +0200
-@@ -6396,7 +6396,7 @@ eof
+diff --git a/src/auto/configure b/src/auto/configure
+index c7f6940..5a8f9ff 100755
+--- a/src/auto/configure
++++ b/src/auto/configure
+@@ -6437,7 +6437,7 @@ eof
  	    if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
  		"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
  	      vi_cv_path_python_plibs="-framework Python"
@@ -19,10 +21,11 @@ diff -up vim80/src/auto/configure.python3-tests vim80/src/auto/configure
  		  vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
  	      fi
  	    else
-diff -up vim80/src/configure.ac.python3-tests vim80/src/configure.ac
---- vim80/src/configure.ac.python3-tests	2018-05-11 08:25:26.070218957 +0200
-+++ vim80/src/configure.ac	2018-05-11 09:26:01.603708243 +0200
-@@ -1248,7 +1248,7 @@ eof
+diff --git a/src/configure.ac b/src/configure.ac
+index b4948e2..72bf44c 100644
+--- a/src/configure.ac
++++ b/src/configure.ac
+@@ -1286,7 +1286,7 @@ eof
  	    if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
  		"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
  	      vi_cv_path_python_plibs="-framework Python"
@@ -31,57 +34,66 @@ diff -up vim80/src/configure.ac.python3-tests vim80/src/configure.ac
  		  vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
  	      fi
  	    else
-diff -up vim80/src/testdir/test_channel_pipe.py.python3-tests vim80/src/testdir/test_channel_pipe.py
---- vim80/src/testdir/test_channel_pipe.py.python3-tests	2018-05-11 09:23:05.738146018 +0200
-+++ vim80/src/testdir/test_channel_pipe.py	2018-05-11 09:26:37.354413350 +0200
+diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
+index 36aad2b..67c3b48 100644
+--- a/src/testdir/test_channel.py
++++ b/src/testdir/test_channel.py
 @@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
+-#!/usr/bin/env python
++#!/usr/bin/env python3
  #
- # Server that will communicate over stdin/stderr
- #
-diff -up vim80/src/testdir/test_channel.py.python3-tests vim80/src/testdir/test_channel.py
---- vim80/src/testdir/test_channel.py.python3-tests	2018-05-11 09:22:48.522284266 +0200
-+++ vim80/src/testdir/test_channel.py	2018-05-11 09:26:17.762574955 +0200
+ # Server that will accept connections from a Vim channel.
+ # Used by test_channel.vim.
+diff --git a/src/testdir/test_channel_pipe.py b/src/testdir/test_channel_pipe.py
+index 5202908..66de456 100644
+--- a/src/testdir/test_channel_pipe.py
++++ b/src/testdir/test_channel_pipe.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
  #
- # Server that will accept connections from a Vim channel.
- # Used by test_channel.vim.
-diff -up vim80/src/testdir/test_channel_write.py.python3-tests vim80/src/testdir/test_channel_write.py
---- vim80/src/testdir/test_channel_write.py.python3-tests	2018-05-11 09:23:21.254021422 +0200
-+++ vim80/src/testdir/test_channel_write.py	2018-05-11 09:26:54.952268193 +0200
+ # Server that will communicate over stdin/stderr
+ #
+diff --git a/src/testdir/test_channel_write.py b/src/testdir/test_channel_write.py
+index 9c8813b..cf4cfa8 100644
+--- a/src/testdir/test_channel_write.py
++++ b/src/testdir/test_channel_write.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
  #
  # Program that writes a number to stdout repeatedly
  #
-diff -up vim80/src/testdir/test_makeencoding.py.python3-tests vim80/src/testdir/test_makeencoding.py
---- vim80/src/testdir/test_makeencoding.py.python3-tests	2018-05-11 09:23:38.990878990 +0200
-+++ vim80/src/testdir/test_makeencoding.py	2018-05-11 09:27:14.402107759 +0200
+diff --git a/src/testdir/test_makeencoding.py b/src/testdir/test_makeencoding.py
+index 041edad..f62edb3 100644
+--- a/src/testdir/test_makeencoding.py
++++ b/src/testdir/test_makeencoding.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
  # -*- coding: utf-8 -*-
  
  # Test program for :make, :grep and :cgetfile.
-diff -up vim80/src/testdir/test_netbeans.py.python3-tests vim80/src/testdir/test_netbeans.py
---- vim80/src/testdir/test_netbeans.py.python3-tests	2018-05-11 09:23:54.398752732 +0200
-+++ vim80/src/testdir/test_netbeans.py	2018-05-11 09:27:30.489975057 +0200
+diff --git a/src/testdir/test_netbeans.py b/src/testdir/test_netbeans.py
+index 112602a..f18b2d2 100644
+--- a/src/testdir/test_netbeans.py
++++ b/src/testdir/test_netbeans.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
  #
  # Server that will communicate with Vim through the netbeans interface.
  # Used by test_netbeans.vim.
-diff -up vim80/src/testdir/test_short_sleep.py.python3-tests vim80/src/testdir/test_short_sleep.py
---- vim80/src/testdir/test_short_sleep.py.python3-tests	2018-05-11 09:24:09.134631798 +0200
-+++ vim80/src/testdir/test_short_sleep.py	2018-05-11 09:27:48.432827053 +0200
+diff --git a/src/testdir/test_short_sleep.py b/src/testdir/test_short_sleep.py
+index a290443..705d0f0 100644
+--- a/src/testdir/test_short_sleep.py
++++ b/src/testdir/test_short_sleep.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
  #
  # Program that sleeps for 100 msec
  #
+-- 
+1.8.3.1
+
diff --git a/vim.spec b/vim.spec
index ac2226f5083e7822d34daf2bed1705b6f64972c4..0ee8601c6178e01a913e00f1933788b06a31dda7 100644
--- a/vim.spec
+++ b/vim.spec
@@ -7,44 +7,26 @@
 %{!?_with_netbeans__:%define _with_netbeans__ 1}
 
 %define vimdir vim82
-%define python_ver 3.8
+%define python_ver %{python3_version}
 
 Name:           vim
 Epoch:          2
-Version:        8.2
-Release:        14
+Version:        8.2.3678
+Release:        1
 Summary:        Vim is a highly configurable text editor for efficiently creating and changing any kind of text.
 License:        Vim and MIT
 URL:            http://www.vim.org
-Source0:        ftp://ftp.vim.org/pub/vim/unix/vim-8.2.tar.bz2
+Source0:        https://github.com/vim/vim/archive/refs/tags/v%{version}.tar.gz 
 Source1:	    virc
 Source2:	    vimrc
 
 Patch0000:      vim-7.0-fixkeys.patch
 Patch0001:      vim-7.4-specsyntax.patch
-Patch0002:      vim-7.4-syntax.patch
-Patch0003:      vim-7.4-nowarnings.patch
-Patch0004:      vim-7.0-rclocation.patch
-Patch0005:      vim-7.4-checkhl.patch
 Patch0006:      vim-7.4-fstabsyntax.patch
-Patch0007:      vim-7.4-syncolor.patch
 Patch0009:      vim-7.4-globalsyntax.patch
 Patch0010:      vim-7.4-releasestring-1318991.patch
 Patch0011:      vim-8.0-copy-paste.patch
 Patch0012:      vim-python3-tests.patch
-Patch0013:	Fix-vim-lua5.4.0-defines+luaL_typeerror-twice.patch
-Patch0014:	backport-Fix-build-failuers-with-perl-5.32.patch
-Patch6000:      backport-Configure-does-not-recognize-gcc-10.0-and-later.patch
-Patch6001:      backport-8.2.2550-signal-stack-size-is-wrong-with-lates.patch
-Patch6002:      backport-CVE-2021-3770.patch
-Patch6003:      backport-memory-leak-for-retab-with-invalid-argument.patch
-Patch6004:      backport-CVE-2021-3778.patch
-Patch6005:      backport-CVE-2021-3796.patch
-Patch6006:      backport-CVE-2021-3872.patch
-Patch6007:      backport-CVE-2021-3875.patch
-Patch6008:      backport-CVE-2021-3903.patch
-Patch6009:      backport-CVE-2021-3927.patch
-Patch6010:      backport-CVE-2021-3928.patch
 
 Patch9000:      bugfix-rm-modify-info-version.patch
 
@@ -130,7 +112,7 @@ Suggests:       lua-libs
 This X11 package serves you the ability to use vim with graphics and mouse.
 
 %prep
-%autosetup -b 0 -n %{vimdir} -p1
+%autosetup -b 0 -n vim-%{version} -p1
 
 %build
 %define _make_cmd__() %{make_build} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}; cp vim %{?1}; %{!?2:make clean}
@@ -230,7 +212,7 @@ do
     install -d %{buildroot}%{_datadir}/%{name}/vimfiles/after/${dir}
 done
 
-install -m644 %{_builddir}/%{vimdir}/runtime/doc/uganda.txt %{_builddir}/%{vimdir}/LICENSE
+install -m644 %{_builddir}/vim-%{version}/runtime/doc/uganda.txt %{_builddir}/vim-%{version}/LICENSE
 
 install -d %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
 
@@ -287,7 +269,7 @@ ln -sf vi.1.gz rvi.1.gz
 ln -sf vim.1.gz vimdiff.1.gz
 popd
 
-desktop-file-install --dir %{buildroot}%{_datadir}/applications %{_builddir}/%{vimdir}/runtime/gvim.desktop
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{_builddir}/vim-%{version}/runtime/gvim.desktop
 
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
 
@@ -404,6 +386,9 @@ popd
 %lang(ja) %{_mandir}/ja/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
 %lang(ru) %{_mandir}/ru/man1/*
+%lang(tr) %{_mandir}/tr/man1/*
+%lang(tr.ISO8859-9) %{_mandir}/tr.ISO8859-9/man1/*
+%lang(tr.UTF-8) %{_mandir}/tr.UTF-8/man1/*
 %{_mandir}/man1/{gex.*,gview.*,gvim*,rvim.*,vim.*,vimdiff.*}
 %{_mandir}/man1/{vimtutor.*,vimx.*,xxd.*}
 %{_mandir}/man5/vimrc.*
@@ -433,6 +418,9 @@ popd
 %{_mandir}/man1/evim.*
 
 %changelog
+* Sat Nov 27 2021 shixuantong<shixuantong@huawei> - 2:8.2.3678-1 
+- update version to 8.2.3678
+
 * Sat Nov 13 2021 shixuantong<shixuantong@huawei> - 2:8.2-14
 - Type:CVE
 - ID:CVE-2021-3927 CVE-2021-3927