Skip to content

Commit 356ff72

Browse files
author
Git for Windows Build Agent
committed
Update 1 package
vim (9.1.0740-1 -> 9.1.0785-1) Signed-off-by: Git for Windows Build Agent <[email protected]>
1 parent 13bd80a commit 356ff72

Some content is hidden

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

109 files changed

+2631
-905
lines changed

usr/bin/ex.exe

4 KB
Binary file not shown.

usr/bin/rview.exe

4 KB
Binary file not shown.

usr/bin/rvim.exe

4 KB
Binary file not shown.

usr/bin/view.exe

4 KB
Binary file not shown.

usr/bin/vim.exe

4 KB
Binary file not shown.

usr/bin/vimdiff.exe

4 KB
Binary file not shown.

usr/bin/xxd.exe

0 Bytes
Binary file not shown.

usr/share/vim/vim91/autoload/getscript.vim

Lines changed: 44 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
" Maintainer: This runtime file is looking for a new maintainer.
44
" Original Author: Charles E. Campbell
55
" Date: Jan 21, 2014
6-
" Version: 36
6+
" Version: 37
77
" Installing: :help glvs-install
88
" Usage: :help glvs
99
" Last Change: {{{1
10-
" 2024 Sep 08 by Vim Project: several small fixes
10+
" 2024 Sep 08 by Vim Project: several small fixes (#15640)
11+
" 2024 Sep 23 by Vim Project: runtime dir selection fix (#15722)
12+
" autoloading search path fix
13+
" substitution of hardcoded commands with global variables
1114
" }}}
1215
"
1316
" GetLatestVimScripts: 642 1 :AutoInstall: getscript.vim
@@ -19,7 +22,7 @@
1922
if exists("g:loaded_getscript")
2023
finish
2124
endif
22-
let g:loaded_getscript= "v36"
25+
let g:loaded_getscript= "v37"
2326
if &cp
2427
echoerr "GetLatestVimScripts is not vi-compatible; not loaded (you need to set nocp)"
2528
finish
@@ -87,6 +90,24 @@ if !exists("g:GetLatestVimScripts_downloadaddr")
8790
let g:GetLatestVimScripts_downloadaddr = 'https://www.vim.org/scripts/download_script.php?src_id='
8891
endif
8992

93+
" define decompression tools (on windows this allows redirection to wsl or git tools).
94+
" Note tar is available as builtin since Windows 11.
95+
if !exists("g:GetLatestVimScripts_bunzip2")
96+
let g:GetLatestVimScripts_bunzip2= "bunzip2"
97+
endif
98+
99+
if !exists("g:GetLatestVimScripts_gunzip")
100+
let g:GetLatestVimScripts_gunzip= "gunzip"
101+
endif
102+
103+
if !exists("g:GetLatestVimScripts_unxz")
104+
let g:GetLatestVimScripts_unxz= "unxz"
105+
endif
106+
107+
if !exists("g:GetLatestVimScripts_unzip")
108+
let g:GetLatestVimScripts_unzip= "unzip"
109+
endif
110+
90111
"" For debugging:
91112
"let g:GetLatestVimScripts_wget = "echo"
92113
"let g:GetLatestVimScripts_options = "options"
@@ -96,18 +117,16 @@ endif
96117
let s:autoinstall= ""
97118
if g:GetLatestVimScripts_allowautoinstall
98119

99-
if (has("win32") || has("gui_win32") || has("gui_win32s") || has("win16") || has("win64") || has("win32unix") || has("win95")) && &shell !~ '\cbash\|pwsh\|powershell'
100-
" windows (but not cygwin/bash)
101-
let s:dotvim= "vimfiles"
102-
if !exists("g:GetLatestVimScripts_mv")
103-
let g:GetLatestVimScripts_mv= "move"
104-
endif
120+
let s:is_windows = has("win32") || has("gui_win32") || has("gui_win32s") || has("win16") || has("win64") || has("win32unix") || has("win95")
121+
let s:dotvim= s:is_windows ? "vimfiles" : ".vim"
105122

106-
else
107-
" unix
108-
let s:dotvim= ".vim"
109-
if !exists("g:GetLatestVimScripts_mv")
110-
let g:GetLatestVimScripts_mv= "mv"
123+
if !exists("g:GetLatestVimScripts_mv")
124+
if s:is_windows && &shell !~ '\cbash\|pwsh\|powershell'
125+
" windows (but not cygwin/bash)
126+
let g:GetLatestVimScripts_mv= "move"
127+
else
128+
" unix
129+
let g:GetLatestVimScripts_mv= "mv"
111130
endif
112131
endif
113132

@@ -215,10 +234,15 @@ fun! getscript#GetLatestVimScripts()
215234
" call Decho("searching plugins for GetLatestVimScripts dependencies")
216235
let lastline = line("$")
217236
" call Decho("lastline#".lastline)
218-
let firstdir = substitute(&rtp,',.{-}$','','')
237+
let firstdir = substitute(&rtp,',.*$','','')
219238
let plugins = split(globpath(firstdir,"plugin/**/*.vim"),'\n')
220239
let plugins += split(globpath(firstdir,"ftplugin/**/*.vim"),'\n')
221240
let plugins += split(globpath(firstdir,"AsNeeded/**/*.vim"),'\n')
241+
" extend the search to the packages too (this script predates the feature)
242+
let plugins += split(globpath(firstdir,"pack/*/start/*/plugin/**/*.vim"),'\n')
243+
let plugins += split(globpath(firstdir,"pack/*/opt/*/plugin/**/*.vim"),'\n')
244+
let plugins += split(globpath(firstdir,"pack/*/start/*/ftplugin/**/*.vim"),'\n')
245+
let plugins += split(globpath(firstdir,"pack/*/opt/*/ftplugin/**/*.vim"),'\n')
222246
let foundscript = 0
223247

224248
" this loop updates the GetLatestVimScripts.dat file
@@ -341,7 +365,7 @@ fun! getscript#GetLatestVimScripts()
341365
endfun
342366

343367
" ---------------------------------------------------------------------
344-
" GetOneScript: (Get Latest Vim Script) this function operates {{{1
368+
" GetOneScript: (Get Latest Vim script) this function operates {{{1
345369
" on the current line, interpreting two numbers and text as
346370
" ScriptID, SourceID, and Filename.
347371
" It downloads any scripts that have newer versions from vim.sourceforge.net.
@@ -564,17 +588,17 @@ fun! s:GetOneScript(...)
564588
" decompress
565589
if sname =~ '\.bz2$'
566590
" call Decho("decompress: attempt to bunzip2 ".sname)
567-
exe "sil !bunzip2 ".shellescape(sname)
591+
exe "sil !".g:GetLatestVimScripts_bunzip2." ".shellescape(sname)
568592
let sname= substitute(sname,'\.bz2$','','')
569593
" call Decho("decompress: new sname<".sname."> after bunzip2")
570594
elseif sname =~ '\.gz$'
571595
" call Decho("decompress: attempt to gunzip ".sname)
572-
exe "sil !gunzip ".shellescape(sname)
596+
exe "sil !".g:GetLatestVimScripts_gunzip." ".shellescape(sname)
573597
let sname= substitute(sname,'\.gz$','','')
574598
" call Decho("decompress: new sname<".sname."> after gunzip")
575599
elseif sname =~ '\.xz$'
576600
" call Decho("decompress: attempt to unxz ".sname)
577-
exe "sil !unxz ".shellescape(sname)
601+
exe "sil !".g:GetLatestVimScripts_unxz." ".shellescape(sname)
578602
let sname= substitute(sname,'\.xz$','','')
579603
" call Decho("decompress: new sname<".sname."> after unxz")
580604
else
@@ -584,7 +608,7 @@ fun! s:GetOneScript(...)
584608
" distribute archive(.zip, .tar, .vba, .vmb, ...) contents
585609
if sname =~ '\.zip$'
586610
" call Decho("dearchive: attempt to unzip ".sname)
587-
exe "silent !unzip -o ".shellescape(sname)
611+
exe "silent !".g:GetLatestVimScripts_unzip." -o ".shellescape(sname)
588612
elseif sname =~ '\.tar$'
589613
" call Decho("dearchive: attempt to untar ".sname)
590614
exe "silent !tar -xvf ".shellescape(sname)
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
" Vim formatting plugin file
2+
" Language: Java
3+
" Maintainer: Aliaksei Budavei <0x000c70 AT gmail DOT com>
4+
" Repository: https://github.com/zzzyxwvut/java-vim.git
5+
" Last Change: 2024 Sep 26
6+
7+
" Documented in ":help ft-java-plugin".
8+
if &cp || exists("g:loaded_javaformat") || exists("g:java_ignore_javadoc") || exists("g:java_ignore_markdown")
9+
finish
10+
endif
11+
12+
let g:loaded_javaformat = 1
13+
14+
"""" STRIVE TO REMAIN COMPATIBLE FOR AT LEAST VIM 7.0.
15+
16+
function! javaformat#RemoveCommonMarkdownWhitespace() abort
17+
if mode() != 'n'
18+
return 0
19+
endif
20+
21+
let pattern = '\(^\s*///\)\(\s*\)\(.*\)'
22+
23+
" E121 for v:numbermax before v8.2.2388.
24+
" E15 for expr-<< before v8.2.5003.
25+
let common = 0x7fffffff
26+
let comments = []
27+
28+
for n in range(v:lnum, (v:lnum + v:count - 1))
29+
let parts = matchlist(getline(n), pattern)
30+
let whitespace = get(parts, 2, '')
31+
let nonwhitespace = get(parts, 3, '')
32+
33+
if !empty(whitespace)
34+
let common = min([common, strlen(whitespace)])
35+
elseif !empty(nonwhitespace) || empty(parts)
36+
" No whitespace prefix or not a Markdown comment.
37+
return 0
38+
endif
39+
40+
call add(comments, [whitespace, parts[1], nonwhitespace])
41+
endfor
42+
43+
let cursor = v:lnum
44+
45+
for line in comments
46+
call setline(cursor, join(line[1 :], strpart(line[0], common)))
47+
let cursor += 1
48+
endfor
49+
50+
return 0
51+
endfunction
52+
53+
" See ":help vim9-mix".
54+
if !has("vim9script")
55+
finish
56+
endif
57+
58+
def! g:javaformat#RemoveCommonMarkdownWhitespace(): number
59+
if mode() != 'n'
60+
return 0
61+
endif
62+
63+
const pattern: string = '\(^\s*///\)\(\s*\)\(.*\)'
64+
var common: number = v:numbermax
65+
var comments: list<list<string>> = []
66+
67+
for n in range(v:lnum, (v:lnum + v:count - 1))
68+
const parts: list<string> = matchlist(getline(n), pattern)
69+
const whitespace: string = get(parts, 2, '')
70+
const nonwhitespace: string = get(parts, 3, '')
71+
72+
if !empty(whitespace)
73+
common = min([common, strlen(whitespace)])
74+
elseif !empty(nonwhitespace) || empty(parts)
75+
# No whitespace prefix or not a Markdown comment.
76+
return 0
77+
endif
78+
79+
add(comments, [whitespace, parts[1], nonwhitespace])
80+
endfor
81+
82+
var cursor: number = v:lnum
83+
84+
for line in comments
85+
setline(cursor, join(line[1 :], strpart(line[0], common)))
86+
cursor += 1
87+
endfor
88+
89+
return 0
90+
enddef
91+
92+
" vim: fdm=syntax sw=4 ts=8 noet sta

usr/share/vim/vim91/autoload/netrw.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
" 2024 Aug 22 by Vim Project: adjust echo output of mx command (#15550)
2626
" 2024 Sep 15 by Vim Project: more strict confirmation dialog (#15680)
2727
" 2024 Sep 19 by Vim Project: mf-selection highlight uses wrong pattern (#15700)
28+
" 2024 Sep 21 by Vim Project: remove extraneous closing bracket (#15718)
2829
" }}}
2930
" Former Maintainer: Charles E Campbell
3031
" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
@@ -4233,7 +4234,7 @@ fun! s:NetrwGetBuffer(islocal,dirname)
42334234
endif
42344235
" call Decho(" NetrwTreeListing: bufnum#".bufnum,'~'.expand("<slnum>"))
42354236
if !bufexists(bufnum)
4236-
call remove(s:netrwbuf,"NetrwTreeListing"])
4237+
call remove(s:netrwbuf,"NetrwTreeListing")
42374238
let bufnum= -1
42384239
endif
42394240
elseif bufnr("NetrwTreeListing") != -1

0 commit comments

Comments
 (0)