Skip to content

Commit f84a0ce

Browse files
ychinychin
committed
Merge remote-tracking branch 'vim/master'
2 parents 944005e + 10e4f12 commit f84a0ce

41 files changed

Lines changed: 1346 additions & 346 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 140 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -9,84 +9,144 @@
99
# So if a pull request only touches javascript files, only these owners
1010
# will be requested to review.
1111

12-
#src/libvterm/* @leonerd
12+
src/iscygpty.* @k-takata
13+
src/libvterm/ @leonerd
1314

14-
#runtime/autoload/getscript.vim @cecamp
15-
#runtime/autoload/netrw.vim @cecamp
16-
#runtime/autoload/netrwFileHandlers.vim @cecamp
17-
#runtime/autoload/netrwSettings.vim @cecamp
18-
#runtime/autoload/tar.vim @cecamp
19-
#runtime/autoload/vimball.vim @cecamp
20-
#runtime/autoload/zip.vim @cecamp
21-
#runtime/compiler/checkstyle.vim @dkearns
22-
#runtime/compiler/dart.vim @dkearns
23-
#runtime/compiler/dart2js.vim @dkearns
24-
#runtime/compiler/dart2native.vim @dkearns
25-
#runtime/compiler/dartanalyser.vim @dkearns
26-
#runtime/compiler/dartdevc.vim @dkearns
27-
#runtime/compiler/dartdoc.vim @dkearns
28-
#runtime/compiler/dartfmt.vim @dkearns
29-
#runtime/compiler/eruby.vim @dkearns
30-
#runtime/compiler/gawk.vim @dkearns
31-
#runtime/compiler/gjs.vim @dkearns
32-
#runtime/compiler/javac.vim @dkearns
33-
#runtime/compiler/jest.vim @dkearns
34-
#runtime/compiler/jjs.vim @dkearns
35-
#runtime/compiler/jshint.vim @dkearns
36-
#runtime/compiler/jsonlint.vim @dkearns
37-
#runtime/compiler/php.vim @dkearns
38-
#runtime/compiler/rhino.vim @dkearns
39-
#runtime/compiler/rubocop.vim @dkearns
40-
#runtime/compiler/rubyunit.vim @dkearns
41-
#runtime/compiler/se.vim @dkearns
42-
#runtime/compiler/stylelint.vim @dkearns
43-
#runtime/compiler/tcl.vim @dkearns
44-
#runtime/compiler/tidy.vim @dkearns
45-
#runtime/compiler/ts-node.vim @dkearns
46-
#runtime/compiler/tsc.vim @dkearns
47-
#runtime/compiler/typedoc.vim @dkearns
48-
#runtime/compiler/xmllint.vim @dkearns
49-
#runtime/compiler/xo.vim @dkearns
50-
#runtime/doc/pi_getscript.txt @cecamp
51-
#runtime/doc/pi_logipat.txt @cecamp
52-
#runtime/doc/pi_netrw.txt @cecamp
53-
#runtime/doc/pi_tar.txt @cecamp
54-
#runtime/doc/pi_vimball.txt @cecamp
55-
#runtime/doc/pi_zip.txt @cecamp
56-
#runtime/ftplugin/css.vim @dkearns
57-
#runtime/ftplugin/eiffel.vim @dkearns
58-
#runtime/ftplugin/javascript.vim @dkearns
59-
#runtime/ftplugin/javascriptreact.vim @dkearns
60-
#runtime/ftplugin/typescript.vim @dkearns
61-
#runtime/ftplugin/typescriptreact.vim @dkearns
62-
#runtime/plugin/amiga.vim @cecamp
63-
#runtime/plugin/csh.vim @cecamp
64-
#runtime/plugin/dcl.vim @cecamp
65-
#runtime/plugin/exports.vim @cecamp
66-
#runtime/plugin/getscriptPlugin.vim @cecamp
67-
#runtime/plugin/lex.vim @cecamp
68-
#runtime/plugin/lisp.vim @cecamp
69-
#runtime/plugin/logiPat.vim @cecamp
70-
#runtime/plugin/maple.vim @cecamp
71-
#runtime/plugin/netrw.vim @cecamp
72-
#runtime/plugin/netrwPlugin.vim @cecamp
73-
#runtime/plugin/rpcgen.vim @cecamp
74-
#runtime/plugin/sh.vim @cecamp
75-
#runtime/plugin/sm.vim @cecamp
76-
#runtime/plugin/tags.vim @cecamp
77-
#runtime/plugin/tarPlugin.vim @cecamp
78-
#runtime/plugin/tex.vim @cecamp
79-
#runtime/plugin/vim.vim @cecamp
80-
#runtime/plugin/vimballPlugin.vim @cecamp
81-
#runtime/plugin/wlmfilt.vim @cecamp
82-
#runtime/plugin/xmath.vim @cecamp
83-
#runtime/plugin/xxd.vim @cecamp
84-
#runtime/plugin/yacc.vim @cecamp
85-
#runtime/plugin/zipPlugin.vim @cecamp
86-
#runtime/syntax/lynx.vim @dkearns
87-
#runtime/syntax/mailcap.vim @dkearns
88-
#runtime/syntax/privoxy.vim @dkearns
89-
#runtime/syntax/ruby.vim @dkearns
90-
#runtime/syntax/tidy.vim @dkearns
91-
#runtime/syntax/wget.vim @dkearns
92-
#runtime/syntax/xbl.vim @dkearns
15+
runtime/autoload/getscript.vim @cecamp
16+
runtime/autoload/netrw.vim @cecamp
17+
runtime/autoload/netrwFileHandlers.vim @cecamp
18+
runtime/autoload/netrwSettings.vim @cecamp
19+
runtime/autoload/rubycomplete.vim @segfault @dkearns
20+
runtime/autoload/tar.vim @cecamp
21+
runtime/autoload/vimball.vim @cecamp
22+
runtime/autoload/zip.vim @cecamp
23+
runtime/compiler/checkstyle.vim @dkearns
24+
runtime/compiler/cucumber.vim @tpope
25+
runtime/compiler/dart.vim @dkearns
26+
runtime/compiler/dart2js.vim @dkearns
27+
runtime/compiler/dart2native.vim @dkearns
28+
runtime/compiler/dartanalyser.vim @dkearns
29+
runtime/compiler/dartdevc.vim @dkearns
30+
runtime/compiler/dartdoc.vim @dkearns
31+
runtime/compiler/dartfmt.vim @dkearns
32+
runtime/compiler/eruby.vim @dkearns
33+
runtime/compiler/gawk.vim @dkearns
34+
runtime/compiler/gjs.vim @dkearns
35+
runtime/compiler/haml.vim @tpope
36+
runtime/compiler/javac.vim @dkearns
37+
runtime/compiler/jest.vim @dkearns
38+
runtime/compiler/jjs.vim @dkearns
39+
runtime/compiler/jshint.vim @dkearns
40+
runtime/compiler/jsonlint.vim @dkearns
41+
runtime/compiler/php.vim @dkearns
42+
runtime/compiler/rake.vim @tpope @dkearns
43+
runtime/compiler/rhino.vim @dkearns
44+
runtime/compiler/rspec.vim @tpope @dkearns
45+
runtime/compiler/rubocop.vim @dkearns
46+
runtime/compiler/ruby.vim @tpope @dkearns
47+
runtime/compiler/rubyunit.vim @dkearns
48+
runtime/compiler/sass.vim @tpope
49+
runtime/compiler/se.vim @dkearns
50+
runtime/compiler/stylelint.vim @dkearns
51+
runtime/compiler/tcl.vim @dkearns
52+
runtime/compiler/tidy.vim @dkearns
53+
runtime/compiler/ts-node.vim @dkearns
54+
runtime/compiler/tsc.vim @dkearns
55+
runtime/compiler/typedoc.vim @dkearns
56+
runtime/compiler/xmllint.vim @dkearns
57+
runtime/compiler/xo.vim @dkearns
58+
runtime/doc/pi_getscript.txt @cecamp
59+
runtime/doc/pi_logipat.txt @cecamp
60+
runtime/doc/pi_netrw.txt @cecamp
61+
runtime/doc/pi_tar.txt @cecamp
62+
runtime/doc/pi_vimball.txt @cecamp
63+
runtime/doc/pi_zip.txt @cecamp
64+
runtime/ftplugin/bst.vim @tpope
65+
runtime/ftplugin/css.vim @dkearns
66+
runtime/ftplugin/cucumber.vim @tpope
67+
runtime/ftplugin/eiffel.vim @dkearns
68+
runtime/ftplugin/eruby.vim @tpope @dkearns
69+
runtime/ftplugin/git.vim @tpope
70+
runtime/ftplugin/gitcommit.vim @tpope
71+
runtime/ftplugin/gitconfig.vim @tpope
72+
runtime/ftplugin/gitrebase.vim @tpope
73+
runtime/ftplugin/gitsendemail.vim @tpope
74+
runtime/ftplugin/haml.vim @tpope
75+
runtime/ftplugin/hgcommit.vim @k-takata
76+
runtime/ftplugin/javascript.vim @dkearns
77+
runtime/ftplugin/javascriptreact.vim @dkearns
78+
runtime/ftplugin/liquid.vim @tpope
79+
runtime/ftplugin/markdown.vim @tpope
80+
runtime/ftplugin/matlab.vim @cecamp
81+
runtime/ftplugin/nsis.vim @k-takata
82+
runtime/ftplugin/pdf.vim @tpope
83+
runtime/ftplugin/ruby.vim @tpope @dkearns
84+
runtime/ftplugin/sass.vim @tpope
85+
runtime/ftplugin/scss.vim @tpope
86+
runtime/ftplugin/tmux.vim @ericpruitt
87+
runtime/ftplugin/typescript.vim @dkearns
88+
runtime/ftplugin/typescriptreact.vim @dkearns
89+
runtime/indent/bst.vim @tpope
90+
runtime/indent/cucumber.vim @tpope
91+
runtime/indent/dosbatch.vim @k-takata
92+
runtime/indent/eruby.vim @tpope @dkearns
93+
runtime/indent/gitconfig.vim @tpope
94+
runtime/indent/haml.vim @tpope
95+
runtime/indent/liquid.vim @tpope
96+
runtime/indent/nsis.vim @k-takata
97+
runtime/indent/ruby.vim @AndrewRadev @dkearns
98+
runtime/indent/sass.vim @tpope
99+
runtime/indent/scss.vim @tpope
100+
runtime/indent/teraterm.vim @k-takata
101+
runtime/plugin/getscriptPlugin.vim @cecamp
102+
runtime/plugin/logiPat.vim @cecamp
103+
runtime/plugin/netrwPlugin.vim @cecamp
104+
runtime/plugin/tarPlugin.vim @cecamp
105+
runtime/plugin/vimballPlugin.vim @cecamp
106+
runtime/plugin/zipPlugin.vim @cecamp
107+
runtime/syntax/amiga.vim @cecamp
108+
runtime/syntax/bst.vim @tpope
109+
runtime/syntax/csh.vim @cecamp
110+
runtime/syntax/cucumber.vim @tpope
111+
runtime/syntax/dcl.vim @cecamp
112+
runtime/syntax/elmfilt.vim @cecamp
113+
runtime/syntax/eruby.vim @tpope @dkearns
114+
runtime/syntax/exports.vim @cecamp
115+
runtime/syntax/git.vim @tpope
116+
runtime/syntax/gitcommit.vim @tpope
117+
runtime/syntax/gitconfig.vim @tpope
118+
runtime/syntax/gitrebase.vim @tpope
119+
runtime/syntax/haml.vim @tpope
120+
runtime/syntax/hgcommit.vim @k-takata
121+
runtime/syntax/lex.vim @cecamp
122+
runtime/syntax/liquid.vim @tpope
123+
runtime/syntax/lisp.vim @cecamp
124+
runtime/syntax/lynx.vim @dkearns
125+
runtime/syntax/mailcap.vim @dkearns
126+
runtime/syntax/make.vim @rohieb
127+
runtime/syntax/make.vim @rohieb
128+
runtime/syntax/maple.vim @cecamp
129+
runtime/syntax/markdown.vim @tpope
130+
runtime/syntax/netrw.vim @cecamp
131+
runtime/syntax/nsis.vim @k-takata
132+
runtime/syntax/pdf.vim @tpope
133+
runtime/syntax/php.vim @TysonAndre
134+
runtime/syntax/privoxy.vim @dkearns
135+
runtime/syntax/rpcgen.vim @cecamp
136+
runtime/syntax/ruby.vim @dkearns
137+
runtime/syntax/sass.vim @tpope
138+
runtime/syntax/scss.vim @tpope
139+
runtime/syntax/sh.vim @cecamp
140+
runtime/syntax/sm.vim @cecamp
141+
runtime/syntax/tags.vim @cecamp
142+
runtime/syntax/teraterm.vim @k-takata
143+
runtime/syntax/tex.vim @cecamp
144+
runtime/syntax/tidy.vim @dkearns
145+
runtime/syntax/tmux.vim @ericpruitt
146+
runtime/syntax/vim.vim @cecamp
147+
runtime/syntax/wget.vim @dkearns
148+
runtime/syntax/xbl.vim @dkearns
149+
runtime/syntax/xmath.vim @cecamp
150+
runtime/syntax/xslt.vim @Boobies
151+
runtime/syntax/xxd.vim @cecamp
152+
runtime/syntax/yacc.vim @cecamp

‎nsis/gvim.nsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ Page custom SetCustom ValidateCustom
174174
!include "lang\german.nsi"
175175
!include "lang\italian.nsi"
176176
!include "lang\japanese.nsi"
177+
!include "lang\russian.nsi"
177178
!include "lang\simpchinese.nsi"
178179
!include "lang\tradchinese.nsi"
179180
!include "lang\turkish.nsi"

‎nsis/lang/italian.nsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ LangString str_desc_console ${LANG_ITALIAN} \
5858
"Versione console di Vim (vim.exe)."
5959

6060
LangString str_section_batch ${LANG_ITALIAN} \
61-
"Crea file di invocazione (MS-DOS) .bat"
61+
"Crea file .bat"
6262
LangString str_desc_batch ${LANG_ITALIAN} \
63-
"Crea file di invocazione .bat per varianti di Vim nella directory \
64-
di Windows, per utilizzo da linea di comando (MS-DOS)."
63+
"Crea file .bat per varianti di Vim nella directory \
64+
di Windows, per utilizzo da riga di comando."
6565

6666
LangString str_group_icons ${LANG_ITALIAN} \
6767
"Crea icone per Vim"

0 commit comments

Comments
 (0)