import vim-8.0.1763-10.el8
This commit is contained in:
CentOS Sources
commit
646cab66bf
|
|
@ -0,0 +1,3 @@
|
|||
SOURCES/Changelog.rpm
|
||||
SOURCES/gvim64.png
|
||||
SOURCES/vim-8.0-1763.tar.bz2
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
5ea81545fc28b57c490d25bda67a63a2838dd25b SOURCES/Changelog.rpm
|
||||
c32bd520a1498b71ee9bbcddc7ad05df1565d085 SOURCES/gvim64.png
|
||||
6716ebb416c9da91d16a2b17dc6bc2cecf65b4eb SOURCES/vim-8.0-1763.tar.bz2
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 226 B |
Binary file not shown.
|
After Width: | Height: | Size: 347 B |
Binary file not shown.
|
After Width: | Height: | Size: 474 B |
|
|
@ -0,0 +1 @@
|
|||
%vimfiles_root %{_datadir}/vim/vimfiles
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
Name:
|
||||
Version:
|
||||
Release: 1%{?dist}
|
||||
Summary:
|
||||
|
||||
Group:
|
||||
License:
|
||||
URL:
|
||||
Source0:
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
BuildRequires:
|
||||
Requires:
|
||||
|
||||
%description
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
|
||||
%build
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
Name:
|
||||
Version:
|
||||
Release: 1%{?dist}
|
||||
Summary:
|
||||
|
||||
Group:
|
||||
License:
|
||||
URL:
|
||||
Source0:
|
||||
|
||||
BuildRequires:
|
||||
Requires:
|
||||
|
||||
%description
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
|
||||
%build
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
%make_install
|
||||
|
||||
|
||||
%files
|
||||
%doc
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
|
|
@ -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;*~")},
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
--- 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"
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
--- vim70/runtime/ftplugin/spec.vim.rh1 2006-05-10 19:37:45.000000000 +0200
|
||||
+++ vim70/runtime/ftplugin/spec.vim 2006-11-13 12:21:32.000000000 +0100
|
||||
@@ -18,11 +18,18 @@
|
||||
|
||||
if !exists("*s:SpecChangelog")
|
||||
function s:SpecChangelog(format)
|
||||
+ let save_time = v:lc_time
|
||||
if strlen(a:format) == 0
|
||||
if !exists("g:spec_chglog_format")
|
||||
- let email = input("Email address: ")
|
||||
- let g:spec_chglog_format = "%a %b %d %Y " . l:email
|
||||
- echo "\r"
|
||||
+ if !exists("g:packager")
|
||||
+ let email = input("Email address: ")
|
||||
+ let g:spec_chglog_format = "%a %b %d %Y " . l:email
|
||||
+ echo "\r"
|
||||
+ else
|
||||
+ let email = g:packager
|
||||
+ let g:spec_chglog_format = "%a %b %d %Y " . l:email
|
||||
+ echo "\r"
|
||||
+ endif
|
||||
endif
|
||||
let format = g:spec_chglog_format
|
||||
else
|
||||
@@ -58,7 +65,7 @@
|
||||
let line = line+1
|
||||
endwhile
|
||||
if (nameline != -1 && verline != -1 && relline != -1)
|
||||
- let include_release_info = exists("g:spec_chglog_release_info")
|
||||
+ let include_release_info = 1
|
||||
let name = s:ParseRpmVars(name, nameline)
|
||||
let ver = s:ParseRpmVars(ver, verline)
|
||||
let rel = s:ParseRpmVars(rel, relline)
|
||||
@@ -79,8 +86,10 @@
|
||||
endif
|
||||
endif
|
||||
if (chgline != -1)
|
||||
+ execute "language time C"
|
||||
let parsed_format = "* ".strftime(format)
|
||||
- let release_info = "+ ".name."-".ver."-".rel
|
||||
+ execute "language time " . save_time
|
||||
+ let release_info = ver."-".rel
|
||||
let wrong_format = 0
|
||||
let wrong_release = 0
|
||||
let insert_line = 0
|
||||
@@ -97,15 +106,14 @@
|
||||
execute relline
|
||||
normal
|
||||
let rel = substitute(strpart(getline(relline),8), '^[ ]*\([^ ]\+\)[ ]*$','\1','')
|
||||
- let release_info = "+ ".name."-".ver."-".rel
|
||||
+ let release_info = ver."-".rel
|
||||
endif
|
||||
endif
|
||||
let n = 0
|
||||
- call append(chgline+n, parsed_format)
|
||||
if include_release_info
|
||||
- let n = n + 1
|
||||
- call append(chgline+n, release_info)
|
||||
+ let parsed_format = parsed_format." ".release_info
|
||||
endif
|
||||
+ call append(chgline+n, parsed_format)
|
||||
let n = n + 1
|
||||
call append(chgline+n,"- ")
|
||||
let n = n + 1
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
diff -up vim73/runtime/doc/vim.1.668894 vim73/runtime/doc/vim.1
|
||||
--- vim73/runtime/doc/vim.1.668894 2010-05-15 13:04:00.000000000 +0200
|
||||
+++ vim73/runtime/doc/vim.1 2012-08-28 12:41:36.000000000 +0200
|
||||
@@ -73,7 +73,7 @@ To edit a file that starts with a dash,
|
||||
.TP
|
||||
\-
|
||||
The file to edit is read from stdin. Commands are read from stderr, which
|
||||
-should be a tty.
|
||||
+should be a TTY.
|
||||
.TP
|
||||
\-t {tag}
|
||||
The file to edit and the initial cursor position depends on a "tag", a sort
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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");
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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",
|
||||
|
|
@ -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')
|
||||
|
|
@ -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")
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
diff --git a/src/ex_getln.c b/src/ex_getln.c
|
||||
index 9fdfac5..6451378 100644
|
||||
--- a/src/ex_getln.c
|
||||
+++ b/src/ex_getln.c
|
||||
@@ -797,6 +797,7 @@ getcmdline(
|
||||
redrawcmd();
|
||||
goto cmdline_changed;
|
||||
}
|
||||
+ vim_free(p);
|
||||
}
|
||||
}
|
||||
beep_flush();
|
||||
diff --git a/src/memline.c b/src/memline.c
|
||||
index 4be1036..366de4c 100644
|
||||
--- a/src/memline.c
|
||||
+++ b/src/memline.c
|
||||
@@ -344,7 +344,7 @@ ml_open(buf_T *buf)
|
||||
b0p->b0_magic_int = (int)B0_MAGIC_INT;
|
||||
b0p->b0_magic_short = (short)B0_MAGIC_SHORT;
|
||||
b0p->b0_magic_char = B0_MAGIC_CHAR;
|
||||
- STRNCPY(b0p->b0_version, "VIM ", 4);
|
||||
+ mch_memmove(b0p->b0_version, "VIM ", 4);
|
||||
STRNCPY(b0p->b0_version + 4, Version, 6);
|
||||
long_to_char((long)mfp->mf_page_size, b0p->b0_page_size);
|
||||
|
||||
diff --git a/src/move.c b/src/move.c
|
||||
index a560030..2ea3975 100644
|
||||
--- a/src/move.c
|
||||
+++ b/src/move.c
|
||||
@@ -1939,7 +1939,7 @@ scroll_cursor_bot(int min_scroll, int set_topbot)
|
||||
scrolled += loff.height;
|
||||
if (loff.lnum == curwin->w_botline
|
||||
#ifdef FEAT_DIFF
|
||||
- && boff.fill == 0
|
||||
+ && loff.fill == 0
|
||||
#endif
|
||||
)
|
||||
scrolled -= curwin->w_empty_rows;
|
||||
diff --git a/src/term.c b/src/term.c
|
||||
index 9ac824f..89b663a 100644
|
||||
--- a/src/term.c
|
||||
+++ b/src/term.c
|
||||
@@ -1460,7 +1460,7 @@ parse_builtin_tcap(char_u *term)
|
||||
if (term_7to8bit(t))
|
||||
{
|
||||
*t = term_7to8bit(t);
|
||||
- STRCPY(t + 1, t + 2);
|
||||
+ STRMOVE(t + 1, t + 2);
|
||||
}
|
||||
term_strings[p->bt_entry] = s;
|
||||
set_term_option_alloced(&term_strings[p->bt_entry]);
|
||||
|
|
@ -0,0 +1,326 @@
|
|||
diff -up vim73/runtime/doc/vim.man.rh1 vim73/runtime/doc/vim.man
|
||||
--- vim73/runtime/doc/vim.man.rh1 2013-07-26 11:26:20.566576864 +0200
|
||||
+++ vim73/runtime/doc/vim.man 2013-07-26 11:47:42.061351469 +0200
|
||||
@@ -11,9 +11,9 @@ SYNOPSIS
|
||||
vim [options] -t tag
|
||||
vim [options] -q [errorfile]
|
||||
|
||||
- ex
|
||||
+ ex gex
|
||||
view
|
||||
- gvim gview evim eview
|
||||
+ gvim gview vimx evim eview
|
||||
rvim rview rgvim rgview
|
||||
|
||||
DESCRIPTION
|
||||
@@ -79,8 +79,13 @@ DESCRIPTION
|
||||
the files. Can also be done with the "-R" argument.
|
||||
|
||||
gvim gview
|
||||
- The GUI version. Starts a new window. Can also be done with
|
||||
- the "-g" argument.
|
||||
+ The GUI version. Starts a new window.
|
||||
+
|
||||
+ gex Starts a new gvim window in Ex mode. Can also be done with
|
||||
+ the "-e" argument to gvim.
|
||||
+
|
||||
+ vimx Starts gvim in "Vi" mode similar to "vim", but with
|
||||
+ additional features like xterm clipboard support.
|
||||
|
||||
evim eview
|
||||
The GUI version in easy mode. Starts a new window. Can also
|
||||
diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1
|
||||
--- vim73/runtime/doc/vim.1 2013-07-31 14:13:01.039765800 +0200
|
||||
+++ vim73_new/runtime/doc/vim.1 2013-07-31 13:57:59.861912768 +0200
|
||||
@@ -17,11 +17,13 @@
|
||||
.PP
|
||||
.br
|
||||
.B ex
|
||||
+.B gex
|
||||
.br
|
||||
.B view
|
||||
.br
|
||||
.B gvim
|
||||
.B gview
|
||||
+.B vimx
|
||||
.B evim
|
||||
.B eview
|
||||
.br
|
||||
@@ -114,7 +116,12 @@
|
||||
gvim gview
|
||||
The GUI version.
|
||||
Starts a new window.
|
||||
-Can also be done with the "\-g" argument.
|
||||
+.TP
|
||||
+gex
|
||||
+Starts a new gvim window in Ex mode. Can also be done with the "-e" argument to gvim
|
||||
+.TP
|
||||
+vimx
|
||||
+Starts gvim in "Vi" mode similar to "vim", but with additional features like xterm clipboard support
|
||||
.TP
|
||||
evim eview
|
||||
The GUI version in easy mode.
|
||||
@@ -458,6 +458,12 @@
|
||||
\-\-remote\-wait\-silent
|
||||
As \-\-remote\-wait, but without the warning when no server is found.
|
||||
.TP
|
||||
+\-\-remote\-tab[\-wait][\-silent]
|
||||
+As \-\-remote but use tab page per file
|
||||
+.TP
|
||||
+\-\-role
|
||||
+Set a unique role to identify the main window
|
||||
+.TP
|
||||
\-\-serverlist
|
||||
List the names of all Vim servers that can be found.
|
||||
.TP
|
||||
diff -urN vim73/runtime/doc/vim-fr.1 vim73_new/runtime/doc/vim-fr.1
|
||||
--- vim73/runtime/doc/vim-fr.1 2010-05-15 13:04:00.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vim-fr.1 2013-07-31 13:59:10.587467916 +0200
|
||||
@@ -24,11 +24,13 @@
|
||||
.PP
|
||||
.br
|
||||
.B ex
|
||||
+.B gex
|
||||
.br
|
||||
.B view
|
||||
.br
|
||||
.B gvim
|
||||
.B gview
|
||||
+.B vimx
|
||||
.B evim
|
||||
.B eview
|
||||
.br
|
||||
diff -urN vim73/runtime/doc/vim-fr.UTF-8.1 vim73_new/runtime/doc/vim-fr.UTF-8.1
|
||||
--- vim73/runtime/doc/vim-fr.UTF-8.1 2010-05-15 13:04:00.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vim-fr.UTF-8.1 2013-07-31 13:59:28.394852347 +0200
|
||||
@@ -24,11 +24,13 @@
|
||||
.PP
|
||||
.br
|
||||
.B ex
|
||||
+.B gex
|
||||
.br
|
||||
.B view
|
||||
.br
|
||||
.B gvim
|
||||
.B gview
|
||||
+.B vimx
|
||||
.B evim
|
||||
.B eview
|
||||
.br
|
||||
diff -urN vim73/runtime/doc/vim-it.1 vim73_new/runtime/doc/vim-it.1
|
||||
--- vim73/runtime/doc/vim-it.1 2010-07-27 22:22:52.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vim-it.1 2013-07-31 13:59:43.474331077 +0200
|
||||
@@ -17,11 +17,13 @@
|
||||
.PP
|
||||
.br
|
||||
.B ex
|
||||
+.B gex
|
||||
.br
|
||||
.B view
|
||||
.br
|
||||
.B gvim
|
||||
.B gview
|
||||
+.B vimx
|
||||
.B evim
|
||||
.B eview
|
||||
.br
|
||||
diff -urN vim73/runtime/doc/vim-it.UTF-8.1 vim73_new/runtime/doc/vim-it.UTF-8.1
|
||||
--- vim73/runtime/doc/vim-it.UTF-8.1 2010-07-30 20:53:57.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vim-it.UTF-8.1 2013-07-31 13:59:55.985898573 +0200
|
||||
@@ -17,11 +17,13 @@
|
||||
.PP
|
||||
.br
|
||||
.B ex
|
||||
+.B gex
|
||||
.br
|
||||
.B view
|
||||
.br
|
||||
.B gvim
|
||||
.B gview
|
||||
+.B vimx
|
||||
.B evim
|
||||
.B eview
|
||||
.br
|
||||
diff -urN vim73/runtime/doc/vim.man vim73_new/runtime/doc/vim.man
|
||||
--- vim73/runtime/doc/vim.man 2013-07-31 14:13:01.044765627 +0200
|
||||
+++ vim73_new/runtime/doc/vim.man 2013-07-31 13:53:35.107064804 +0200
|
||||
@@ -82,10 +82,10 @@
|
||||
The GUI version. Starts a new window.
|
||||
|
||||
gex Starts a new gvim window in Ex mode. Can also be done with
|
||||
- the "-e" argument to gvim.
|
||||
+ the "-e" argument to gvim
|
||||
|
||||
vimx Starts gvim in "Vi" mode similar to "vim", but with
|
||||
- additional features like xterm clipboard support.
|
||||
+ additional features like xterm clipboard support
|
||||
|
||||
evim eview
|
||||
The GUI version in easy mode. Starts a new window. Can also
|
||||
diff -urN vim73/runtime/doc/vim-pl.1 vim73_new/runtime/doc/vim-pl.1
|
||||
--- vim73/runtime/doc/vim-pl.1 2010-05-15 13:04:01.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vim-pl.1 2013-07-31 14:00:21.282024131 +0200
|
||||
@@ -17,11 +17,13 @@
|
||||
.PP
|
||||
.br
|
||||
.B ex
|
||||
+.B gex
|
||||
.br
|
||||
.B view
|
||||
.br
|
||||
.B gvim
|
||||
.B gview
|
||||
+.B vimx
|
||||
.B evim
|
||||
.B eview
|
||||
.br
|
||||
diff -urN vim73/runtime/doc/vim-pl.UTF-8.1 vim73_new/runtime/doc/vim-pl.UTF-8.1
|
||||
--- vim73/runtime/doc/vim-pl.UTF-8.1 2010-05-15 13:37:38.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vim-pl.UTF-8.1 2013-07-31 14:00:36.056513402 +0200
|
||||
@@ -17,11 +17,13 @@
|
||||
.PP
|
||||
.br
|
||||
.B ex
|
||||
+.B gex
|
||||
.br
|
||||
.B view
|
||||
.br
|
||||
.B gvim
|
||||
.B gview
|
||||
+.B vimx
|
||||
.B evim
|
||||
.B eview
|
||||
.br
|
||||
diff -urN vim73/runtime/doc/vim-ru.1 vim73_new/runtime/doc/vim-ru.1
|
||||
--- vim73/runtime/doc/vim-ru.1 2010-05-15 13:04:00.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vim-ru.1 2013-07-31 14:01:10.071337568 +0200
|
||||
@@ -17,11 +17,15 @@
|
||||
.PP
|
||||
.br
|
||||
.B ex
|
||||
+.B gex
|
||||
.br
|
||||
.B view
|
||||
.br
|
||||
.B gvim
|
||||
.B gview
|
||||
+.B vimx
|
||||
+.B evim
|
||||
+.B eview
|
||||
.br
|
||||
.B rvim
|
||||
.B rview
|
||||
diff -urN vim73/runtime/doc/vim-ru.UTF-8.1 vim73_new/runtime/doc/vim-ru.UTF-8.1
|
||||
--- vim73/runtime/doc/vim-ru.UTF-8.1 2010-05-15 13:04:00.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vim-ru.UTF-8.1 2013-07-31 14:01:34.494493301 +0200
|
||||
@@ -17,11 +17,15 @@
|
||||
.PP
|
||||
.br
|
||||
.B ex
|
||||
+.B gex
|
||||
.br
|
||||
.B view
|
||||
.br
|
||||
.B gvim
|
||||
.B gview
|
||||
+.B vimx
|
||||
+.B evim
|
||||
+.B eview
|
||||
.br
|
||||
.B rvim
|
||||
.B rview
|
||||
diff -urN vim73/runtime/doc/vimtutor.1 vim73_new/runtime/doc/vimtutor.1
|
||||
--- vim73/runtime/doc/vimtutor.1 2010-05-15 13:04:00.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vimtutor.1 2013-07-31 14:10:10.093671964 +0200
|
||||
@@ -4,6 +4,8 @@
|
||||
.SH SYNOPSIS
|
||||
.br
|
||||
.B vimtutor [\-g] [language]
|
||||
+.br
|
||||
+.B gvimtutor
|
||||
.SH DESCRIPTION
|
||||
.B Vimtutor
|
||||
starts the
|
||||
diff -urN vim73/runtime/doc/vimtutor-it.1 vim73_new/runtime/doc/vimtutor-it.1
|
||||
--- vim73/runtime/doc/vimtutor-it.1 2010-07-27 22:35:32.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vimtutor-it.1 2013-07-31 14:10:33.564861055 +0200
|
||||
@@ -4,6 +4,8 @@
|
||||
.SH SINTASSI
|
||||
.br
|
||||
.B vimtutor [\-g] [lingua]
|
||||
+.br
|
||||
+.B gvimtutor
|
||||
.SH DESCRIZIONE
|
||||
.B Vimtutor
|
||||
inizia il
|
||||
diff -urN vim73/runtime/doc/vimtutor-it.UTF-8.1 vim73_new/runtime/doc/vimtutor-it.UTF-8.1
|
||||
--- vim73/runtime/doc/vimtutor-it.UTF-8.1 2010-07-30 20:53:57.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vimtutor-it.UTF-8.1 2013-07-31 14:10:40.483622016 +0200
|
||||
@@ -4,6 +4,8 @@
|
||||
.SH SINTASSI
|
||||
.br
|
||||
.B vimtutor [\-g] [lingua]
|
||||
+.br
|
||||
+.B gvimtutor
|
||||
.SH DESCRIZIONE
|
||||
.B Vimtutor
|
||||
inizia il
|
||||
diff -urN vim73/runtime/doc/vimtutor.man vim73_new/runtime/doc/vimtutor.man
|
||||
--- vim73/runtime/doc/vimtutor.man 2010-05-15 13:04:00.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vimtutor.man 2013-07-31 14:11:04.786782356 +0200
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
SYNOPSIS
|
||||
vimtutor [-g] [language]
|
||||
+ gvimtutor
|
||||
|
||||
DESCRIPTION
|
||||
Vimtutor starts the Vim tutor. It copies the tutor file first, so that
|
||||
diff -urN vim73/runtime/doc/vimtutor-pl.1 vim73_new/runtime/doc/vimtutor-pl.1
|
||||
--- vim73/runtime/doc/vimtutor-pl.1 2010-05-15 13:04:00.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vimtutor-pl.1 2013-07-31 14:11:13.602477777 +0200
|
||||
@@ -4,6 +4,8 @@
|
||||
.SH SYNOPSIS
|
||||
.br
|
||||
.B vimtutor -g [j陑yk]
|
||||
+.br
|
||||
+.B gvimtutor
|
||||
.SH OPIS
|
||||
.B Vimtutor
|
||||
uruchamia nauczyciela
|
||||
diff -urN vim73/runtime/doc/vimtutor-pl.UTF-8.1 vim73_new/runtime/doc/vimtutor-pl.UTF-8.1
|
||||
--- vim73/runtime/doc/vimtutor-pl.UTF-8.1 2010-05-15 13:04:00.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vimtutor-pl.UTF-8.1 2013-07-31 14:11:20.571237009 +0200
|
||||
@@ -4,6 +4,8 @@
|
||||
.SH SYNOPSIS
|
||||
.br
|
||||
.B vimtutor -g [j臋zyk]
|
||||
+.br
|
||||
+.B gvimtutor
|
||||
.SH OPIS
|
||||
.B Vimtutor
|
||||
uruchamia nauczyciela
|
||||
diff -urN vim73/runtime/doc/vimtutor-ru.1 vim73_new/runtime/doc/vimtutor-ru.1
|
||||
--- vim73/runtime/doc/vimtutor-ru.1 2010-05-15 13:04:00.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vimtutor-ru.1 2013-07-31 14:11:35.673715221 +0200
|
||||
@@ -4,6 +4,8 @@
|
||||
.SH 腼磲钿钺<E992BF> 篝蝻脶
|
||||
.br
|
||||
.B vimtutor [掩偎]
|
||||
+.br
|
||||
+.B gvimtutor
|
||||
.SH 镳轶犷殄
|
||||
胂土文<E59C9F>
|
||||
.B vimtutor
|
||||
diff -urN vim73/runtime/doc/vimtutor-ru.UTF-8.1 vim73_new/runtime/doc/vimtutor-ru.UTF-8.1
|
||||
--- vim73/runtime/doc/vimtutor-ru.UTF-8.1 2010-05-15 13:04:00.000000000 +0200
|
||||
+++ vim73_new/runtime/doc/vimtutor-ru.UTF-8.1 2013-07-31 14:11:46.649335999 +0200
|
||||
@@ -7,6 +7,8 @@
|
||||
.SH 袨袩袠小袗袧袠袝
|
||||
袣芯屑邪薪写邪
|
||||
.B vimtutor
|
||||
+.br
|
||||
+.B gvimtutor
|
||||
蟹邪锌褍褋泻邪械褌 褍褔械斜薪懈泻 锌芯
|
||||
.B Vim.
|
||||
袩褉懈 褝褌芯屑 褋薪邪褔邪谢邪 锌褉芯懈褋褏芯写懈褌 褋芯蟹写邪薪懈械 泻芯锌懈懈 褎邪泄谢邪 褍褔械斜薪懈泻邪,
|
||||
|
|
@ -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
|
||||
#
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
if ( -x /usr/bin/id ) then
|
||||
if ( "`/usr/bin/id -u`" > 200 ) then
|
||||
alias vi vim
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
if [ -n "${BASH_VERSION-}" -o -n "${KSH_VERSION-}" -o -n "${ZSH_VERSION-}" ]; then
|
||||
[ "`/usr/bin/id -u 2>/dev/null || echo 0`" -le 200 ] && return
|
||||
# for bash and zsh, only if no alias is already set
|
||||
alias vi >/dev/null 2>&1 || alias vi=vim
|
||||
fi
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
if v:lang =~ "utf8$" || v:lang =~ "UTF-8$"
|
||||
set fileencodings=ucs-bom,utf-8,latin1
|
||||
endif
|
||||
|
||||
set nocompatible " Use Vim defaults (much better!)
|
||||
set bs=indent,eol,start " allow backspacing over everything in insert mode
|
||||
"set ai " always set autoindenting on
|
||||
"set backup " keep a backup file
|
||||
set viminfo='20,\"50 " read/write a .viminfo file, don't store more
|
||||
" than 50 lines of registers
|
||||
set history=50 " keep 50 lines of command line history
|
||||
set ruler " show the cursor position all the time
|
||||
|
||||
" Only do this part when compiled with support for autocommands
|
||||
if has("autocmd")
|
||||
augroup fedora
|
||||
autocmd!
|
||||
" In text files, always limit the width of text to 78 characters
|
||||
" autocmd BufRead *.txt set tw=78
|
||||
" When editing a file, always jump to the last cursor position
|
||||
autocmd BufReadPost *
|
||||
\ if line("'\"") > 0 && line ("'\"") <= line("$") |
|
||||
\ exe "normal! g'\"" |
|
||||
\ endif
|
||||
" don't write swapfile on most commonly used directories for NFS mounts or USB sticks
|
||||
autocmd BufNewFile,BufReadPre /media/*,/run/media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp
|
||||
" start with spec file template
|
||||
autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec
|
||||
augroup END
|
||||
endif
|
||||
|
||||
if has("cscope") && filereadable("/usr/bin/cscope")
|
||||
set csprg=/usr/bin/cscope
|
||||
set csto=0
|
||||
set cst
|
||||
set nocsverb
|
||||
" add any database in current directory
|
||||
if filereadable("cscope.out")
|
||||
cs add $PWD/cscope.out
|
||||
" else add database pointed to by environment
|
||||
elseif $CSCOPE_DB != ""
|
||||
cs add $CSCOPE_DB
|
||||
endif
|
||||
set csverb
|
||||
endif
|
||||
|
||||
" Switch syntax highlighting on, when the terminal has colors
|
||||
" Also switch on highlighting the last used search pattern.
|
||||
if &t_Co > 2 || has("gui_running")
|
||||
syntax on
|
||||
set hlsearch
|
||||
endif
|
||||
|
||||
filetype plugin on
|
||||
|
||||
if &term=="xterm"
|
||||
set t_Co=8
|
||||
set t_Sb=[4%dm
|
||||
set t_Sf=[3%dm
|
||||
endif
|
||||
|
||||
" Don't wake up system with blinking cursor:
|
||||
" http://www.linuxpowertop.org/known.php
|
||||
let &guicursor = &guicursor . ",a:blinkon0"
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
if v:lang =~ "utf8$" || v:lang =~ "UTF-8$"
|
||||
set fileencodings=ucs-bom,utf-8,latin1
|
||||
endif
|
||||
|
||||
set nocompatible " Use Vim defaults (much better!)
|
||||
set bs=indent,eol,start " allow backspacing over everything in insert mode
|
||||
"set ai " always set autoindenting on
|
||||
"set backup " keep a backup file
|
||||
set history=50 " keep 50 lines of command line history
|
||||
set ruler " show the cursor position all the time
|
||||
|
||||
" Only do this part when compiled with support for autocommands
|
||||
if has("autocmd")
|
||||
augroup fedora
|
||||
autocmd!
|
||||
" In text files, always limit the width of text to 78 characters
|
||||
" autocmd BufRead *.txt set tw=78
|
||||
" When editing a file, always jump to the last cursor position
|
||||
autocmd BufReadPost *
|
||||
\ if line("'\"") > 0 && line ("'\"") <= line("$") |
|
||||
\ exe "normal! g'\"" |
|
||||
\ endif
|
||||
" don't write swapfile on most commonly used directories for NFS mounts or USB sticks
|
||||
autocmd BufNewFile,BufReadPre /media/*,/run/media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp
|
||||
" start with spec file template
|
||||
autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec
|
||||
augroup END
|
||||
endif
|
||||
|
||||
|
||||
filetype plugin on
|
||||
|
||||
if &term=="xterm"
|
||||
set t_Co=8
|
||||
set t_Sb=[4%dm
|
||||
set t_Sf=[3%dm
|
||||
endif
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue