make vi/vim more easier to use

2020-01-21 17:41:08 +08:00 · 2020-01-21 17:41:08 +08:00 · 06b8b94a13
commit 06b8b94a13
parent 42e0debd98
13 changed files with 299 additions and 2 deletions
--- a/vim-7.0-fixkeys.patch
+++ b/vim-7.0-fixkeys.patch
@ -0,0 +1,25 @@
+--- vim70aa/src/term.c.orig	2006-03-01 23:07:55.000000000 +0100
+++ vim70aa/src/term.c	2006-03-14 15:39:12.000000000 +0100
+@@ -1008,14 +1008,14 @@
+     {K_XRIGHT,		IF_EB("\033[1;*C", ESC_STR "[1;*C")},
+     {K_XLEFT,		IF_EB("\033[1;*D", ESC_STR "[1;*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")},
+-    {K_XF3,		IF_EB("\033O*R", ESC_STR "O*R")},
+-    {K_XF4,		IF_EB("\033O*S", ESC_STR "O*S")},
+-    {K_F1,		IF_EB("\033[11;*~", ESC_STR "[11;*~")},
+-    {K_F2,		IF_EB("\033[12;*~", ESC_STR "[12;*~")},
+-    {K_F3,		IF_EB("\033[13;*~", ESC_STR "[13;*~")},
+-    {K_F4,		IF_EB("\033[14;*~", ESC_STR "[14;*~")},
+    {K_XF1,             IF_EB("\033[11~", ESC_STR "[11~")},
+    {K_XF2,             IF_EB("\033[12~", ESC_STR "[12~")},
+    {K_XF3,             IF_EB("\033[13~", ESC_STR "[13~")},
+    {K_XF4,             IF_EB("\033[14~", ESC_STR "[14~")},
+    {K_F1,              IF_EB("\033OP", ESC_STR "OP")},
+    {K_F2,              IF_EB("\033OQ", ESC_STR "OQ")},
+    {K_F3,              IF_EB("\033OR", ESC_STR "OR")},
+    {K_F4,              IF_EB("\033OS", ESC_STR "OS")},
+     {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;*~")},
--- a/vim-7.4-checkhl.patch
+++ b/vim-7.4-checkhl.patch
@ -0,0 +1,12 @@
+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
--- a/vim-7.4-fstabsyntax.patch
+++ b/vim-7.4-fstabsyntax.patch
@ -0,0 +1,21 @@
+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
+-syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 cfs cgroup cifs coda configfs cpuset cramfs devfs devpts devtmpfs e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse fuseblk fusectl hfs hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfsd nilfs2 none ntfs null nwfs overlay ovlfs pipefs portal proc procfs pstore ptyfs qnx4 reiserfs ramfs romfs securityfs shm smbfs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xenfs xfs zisofs
+syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 cfs cgroup cifs coda configfs cpuset cramfs devfs devpts devtmpfs e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse fuseblk fusectl hfs hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfsd nilfs2 none ntfs null nwfs overlay ovlfs pipefs portal proc procfs pstore ptyfs qnx4 reiserfs ramfs romfs rpc_pipefs securityfs shm smbfs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xenfs xfs zisofs
+ 
+ " Options
+ " -------
+@@ -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
+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
--- a/vim-7.4-globalsyntax.patch
+++ b/vim-7.4-globalsyntax.patch
@ -0,0 +1,12 @@
+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
+ 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
+ 
+ "%% Changelog Section %%
+ syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense
--- a/vim-7.4-licensemacro-1151450.patch
+++ b/vim-7.4-licensemacro-1151450.patch
@ -0,0 +1,15 @@
+diff -up vim74_new/runtime/syntax/spec.vim.1151450 vim74_new/runtime/syntax/spec.vim
+--- vim74_new/runtime/syntax/spec.vim.1151450	2014-10-13 10:45:07.570944538 +0200
+++ vim74_new/runtime/syntax/spec.vim	2014-10-13 10:44:09.046945965 +0200
+@@ -88,9 +88,9 @@ syn region specSectionMacroBracketArea o
+ "%% Files Section %%
+ "TODO %config valid parameters: missingok\|noreplace
+ "TODO %verify valid parameters: \(not\)\= \(md5\|atime\|...\)
+-syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier
+syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\|license\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier
+ "tip: remember to include new itens in specFilesArea above
+-syn match  specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\)\>'
+syn match  specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\|license\)\>'
+ 
+ "valid options for certain section headers
+ syn match specDescriptionOpts contained '\s-[ln]\s*\a'ms=s+1,me=e-1
--- a/vim-7.4-nowarnings.patch
+++ b/vim-7.4-nowarnings.patch
@ -0,0 +1,11 @@
+diff -up vim74/src/ex_docmd.c.e319 vim74/src/ex_docmd.c
+--- vim74/src/ex_docmd.c.e319	2016-02-17 14:48:23.033995923 +0100
+++ vim74/src/ex_docmd.c	2016-02-17 14:48:03.712890575 +0100
+@@ -4630,6 +4630,7 @@ get_flags(exarg_T *eap)
+     void
+ ex_ni(exarg_T *eap)
+ {
+    return;
+     if (!eap->skip)
+ 	eap->errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version");
+ }
--- a/vim-7.4-releasestring-1318991.patch
+++ b/vim-7.4-releasestring-1318991.patch
@ -0,0 +1,14 @@
+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
+@@ -41,8 +41,8 @@ else:
+         headers = spec.sourceHeader
+         version = headers["Version"]
+         release = headers["Release"]
+-        vim.command("let ver = " + version)
+-        vim.command("let rel = " + release)
+        vim.command("let ver = '" + version + "'")
+        vim.command("let rel = '" + release + "'")
+ PYEND
+ 		endif
+ 	endfunction
--- a/vim-7.4-specsyntax.patch
+++ b/vim-7.4-specsyntax.patch
@ -0,0 +1,33 @@
+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
+ syn match specManpageFile '[a-zA-Z]\.1'
+ 
+ "Day, Month and most used license acronyms
+-syn keyword specLicense contained GPL LGPL BSD MIT GNU
+syn keyword specLicense contained GPL LGPL BSD MIT GNU distributable
+ 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
+ 
+ "specComands
+ syn match   specConfigure  contained '\./configure'
+-syn match   specTarCommand contained '\<tar\s\+[cxvpzIf]\{,5}\s*'
+syn match   specTarCommand contained '\<tar\s\+[cxvpzIjf]\{,5}\s*'
+ syn keyword specCommandSpecial contained root
+-syn keyword specCommand		contained make xmkmf mkdir chmod ln find sed rm strip moc echo grep ls rm mv mkdir install cp pwd cat tail then else elif cd gzip rmdir ln eval export touch
+syn keyword specCommand		contained make xmkmf mkdir chmod ln find sed rm strip moc echo grep ls rm mv mkdir install cp pwd cat tail then else elif cd gzip rmdir ln eval export touch bzip2 bunzip2 gunzip
+ syn cluster specCommands contains=specCommand,specTarCommand,specConfigure,specCommandSpecial
+ 
+ "frequently used rpm env vars
+@@ -105,7 +105,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
+-syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExcludeOS\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+ 
+ "%% Description Section %%
+ syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment
--- a/vim-7.4-syncolor.patch
+++ b/vim-7.4-syncolor.patch
@ -0,0 +1,25 @@
+diff -up vim80/src/syntax.c.syncolor vim80/src/syntax.c
+--- vim80/src/syntax.c.syncolor	2017-08-15 12:14:21.716020676 +0200
+++ vim80/src/syntax.c	2017-08-15 12:30:31.380158974 +0200
+@@ -6972,8 +6972,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",
+@@ -7066,8 +7066,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",
--- a/vim-7.4-syntax.patch
+++ b/vim-7.4-syntax.patch
@ -0,0 +1,11 @@
+--- 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')
--- a/vim-8.0-copy-paste.patch
+++ b/vim-8.0-copy-paste.patch
@ -0,0 +1,16 @@
+diff -up vim80/runtime/defaults.vim.copy-paste vim80/runtime/defaults.vim
+--- vim80/runtime/defaults.vim.copy-paste	2016-12-19 09:01:20.351119199 +0100
+++ vim80/runtime/defaults.vim	2016-12-19 09:01:53.735738941 +0100
+@@ -64,12 +64,6 @@ map Q gq
+ " Revert with ":iunmap <C-U>".
+ 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
+-
+ " 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")
--- a/vim-python3-tests.patch
+++ b/vim-python3-tests.patch
@ -0,0 +1,87 @@
+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
+@@ -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
+ 	    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"
+-	      if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
+	      if test "x${vi_cv_path_python}" != "x/usr/bin/python2" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
+ 		  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
+ 	    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"
+-	      if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
+	      if test "x${vi_cv_path_python}" != "x/usr/bin/python2" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
+ 		  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
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
+#!/usr/bin/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
+@@ -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
+@@ -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
+@@ -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
+@@ -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
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
+#!/usr/bin/python3
+ #
+ # Program that sleeps for 100 msec
+ #
--- a/vim.spec
+++ b/vim.spec
@ -11,7 +11,7 @@
 Name:           vim
 Epoch:          2
 Version:        8.1.450
-Release:        6
+Release:        7
 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
@ -19,7 +19,19 @@ Source0:        ftp://ftp.vim.org/pub/vim/unix/vim-8.1-450.tar.bz2
 Source1:	    virc
 Source2:	    vimrc

-Patch1:		    vim-7.0-rclocation.patch
+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
+Patch0008:      vim-7.4-licensemacro-1151450.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

 Patch6000:      CVE-2019-12735.patch

@ -409,6 +421,9 @@ popd
 %{_mandir}/man1/evim.*

 %changelog
+* Thu Jan 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 2:8.1.450-7
+- make vi/vim  easy to uses
+
 * Sun Jan 19 2020 openEuler Buildteam <buildteam@openeuler.org> - 2:8.1.450-6
 - fix bug in install files