aboutsummaryrefslogtreecommitdiff
path: root/runtime/autoload
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/autoload')
-rw-r--r--runtime/autoload/modula2.vim31
-rw-r--r--runtime/autoload/netrw.vim132
-rw-r--r--runtime/autoload/netrwFileHandlers.vim3
-rw-r--r--runtime/autoload/netrwSettings.vim3
-rw-r--r--runtime/autoload/provider/perl.vim80
-rw-r--r--runtime/autoload/provider/python3.vim44
-rw-r--r--runtime/autoload/provider/pythonx.vim112
-rw-r--r--runtime/autoload/provider/ruby.vim67
-rw-r--r--runtime/autoload/remote/host.vim6
-rw-r--r--runtime/autoload/rubycomplete.vim7
-rw-r--r--runtime/autoload/tar.vim39
-rw-r--r--runtime/autoload/tohtml.vim951
-rw-r--r--runtime/autoload/userreg.vim7
-rw-r--r--runtime/autoload/zip.vim3
14 files changed, 162 insertions, 1323 deletions
diff --git a/runtime/autoload/modula2.vim b/runtime/autoload/modula2.vim
new file mode 100644
index 0000000000..284dc2768f
--- /dev/null
+++ b/runtime/autoload/modula2.vim
@@ -0,0 +1,31 @@
+" Vim filetype plugin file
+" Language: Modula-2
+" Maintainer: Doug Kearns <dougkearns@gmail.com>
+" Last Change: 2024 Jan 04
+
+" Dialect can be one of pim, iso, r10
+function modula2#GetDialect() abort
+
+ if exists("b:modula2.dialect")
+ return b:modula2.dialect
+ endif
+
+ if exists("g:modula2_default_dialect")
+ let dialect = g:modula2_default_dialect
+ else
+ let dialect = "pim"
+ endif
+
+ return dialect
+endfunction
+
+function modula2#SetDialect(dialect, extension = "") abort
+ if exists("b:modula2")
+ unlockvar! b:modula2
+ endif
+
+ let b:modula2 = #{ dialect: a:dialect, extension: a:extension }
+ lockvar! b:modula2
+endfunction
+
+" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index b8092ebeeb..fa08bb3848 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -1,11 +1,14 @@
" netrw.vim: Handles file transfer and remote directory listing across
" AUTOLOAD SECTION
-" Date: May 03, 2023
+" Maintainer: This runtime file is looking for a new maintainer.
+" Date: May 03, 2023
" Version: 173a
" Last Change:
" 2023 Nov 21 by Vim Project: ignore wildignore when expanding $COMSPEC (v173a)
" 2023 Nov 22 by Vim Project: fix handling of very long filename on longlist style (v173a)
-" Maintainer: Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" 2024 Feb 19 by Vim Project: (announce adoption)
+" 2024 Feb 29 by Vim Project: handle symlinks in tree mode correctly
+" Former Maintainer: Charles E Campbell
" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
" Copyright: Copyright (C) 2016 Charles E. Campbell {{{1
" Permission is hereby granted to use and distribute this code,
@@ -1973,7 +1976,7 @@ fun! NetrwStatusLine()
if !exists("w:netrw_explore_bufnr") || w:netrw_explore_bufnr != bufnr("%") || !exists("w:netrw_explore_line") || w:netrw_explore_line != line(".") || !exists("w:netrw_explore_list")
" restore user's status line
- let &stl = s:netrw_users_stl
+ let &l:stl = s:netrw_users_stl
let &laststatus = s:netrw_users_ls
if exists("w:netrw_explore_bufnr")|unlet w:netrw_explore_bufnr|endif
if exists("w:netrw_explore_line") |unlet w:netrw_explore_line |endif
@@ -2074,9 +2077,9 @@ fun! netrw#NetRead(mode,...)
let wholechoice = wholechoice . " " . choice
let ichoice = ichoice + 1
if ichoice > a:0
- if !exists("g:netrw_quiet")
- call netrw#ErrorMsg(s:ERROR,"Unbalanced string in filename '". wholechoice ."'",3)
- endif
+ if !exists("g:netrw_quiet")
+ call netrw#ErrorMsg(s:ERROR,"Unbalanced string in filename '". wholechoice ."'",3)
+ endif
" call Dret("netrw#NetRead :2 getcwd<".getcwd().">")
return
endif
@@ -2497,9 +2500,9 @@ fun! netrw#NetWrite(...) range
let wholechoice= wholechoice . " " . choice
let ichoice = ichoice + 1
if choice > a:0
- if !exists("g:netrw_quiet")
- call netrw#ErrorMsg(s:ERROR,"Unbalanced string in filename '". wholechoice ."'",13)
- endif
+ if !exists("g:netrw_quiet")
+ call netrw#ErrorMsg(s:ERROR,"Unbalanced string in filename '". wholechoice ."'",13)
+ endif
" call Dret("netrw#NetWrite")
return
endif
@@ -2770,7 +2773,7 @@ fun! netrw#NetWrite(...) range
if a:firstline == 1 && a:lastline == line("$")
" restore modifiability; usually equivalent to set nomod
- let &mod= mod
+ let &l:mod= mod
" call Decho(" ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("<slnum>"))
elseif !exists("leavemod")
" indicate that the buffer has not been modified since last written
@@ -2959,7 +2962,7 @@ fun! s:NetrwGetFile(readcmd, tfile, method)
setl isk-=/
filetype detect
" call Decho("..local filetype<".&ft."> for buf#".bufnr()."<".bufname().">")
- let &isk= iskkeep
+ let &l:isk= iskkeep
" call Dredir("ls!","NetrwGetFile (renamed buffer back to remote filename<".rfile."> : expand(%)<".expand("%").">)")
let line1 = 1
let line2 = line("$")
@@ -4956,12 +4959,12 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
if g:netrw_chgwin >= 1
" call Decho("edit-a-file: changing window to #".g:netrw_chgwin.": (due to g:netrw_chgwin)",'~'.expand("<slnum>"))
if winnr("$")+1 == g:netrw_chgwin
- " if g:netrw_chgwin is set to one more than the last window, then
- " vertically split the last window to make that window available.
- let curwin= winnr()
- exe "NetrwKeepj keepalt ".winnr("$")."wincmd w"
- vs
- exe "NetrwKeepj keepalt ".g:netrw_chgwin."wincmd ".curwin
+ " if g:netrw_chgwin is set to one more than the last window, then
+ " vertically split the last window to make that window available.
+ let curwin= winnr()
+ exe "NetrwKeepj keepalt ".winnr("$")."wincmd w"
+ vs
+ exe "NetrwKeepj keepalt ".g:netrw_chgwin."wincmd ".curwin
endif
exe "NetrwKeepj keepalt ".g:netrw_chgwin."wincmd w"
endif
@@ -5268,7 +5271,8 @@ fun! s:NetrwBrowseUpDir(islocal)
endif
call s:RestorePosn(s:netrw_posn)
let curdir= substitute(curdir,'^.*[\/]','','')
- call search('\<'.curdir.'/','wc')
+ let curdir= '\<'. escape(curdir, '~'). '/'
+ call search(curdir,'wc')
endif
" call Dret("s:NetrwBrowseUpDir")
endfun
@@ -6069,7 +6073,7 @@ fun! s:NetrwServerEdit(islocal,fname)
" used something like <cr>.
" call Decho("user must have closed server AND did not use ctrl-r",'~'.expand("<slnum>"))
if exists("g:netrw_browse_split")
- unlet g:netrw_browse_split
+ unlet g:netrw_browse_split
endif
let g:netrw_browse_split= 0
if exists("s:netrw_browse_split_".winnr())
@@ -6103,7 +6107,7 @@ fun! s:NetrwServerEdit(islocal,fname)
if !ctrlr
" call Decho("server<".g:netrw_servername."> not available and ctrl-r not used",'~'.expand("<slnum>"))
if exists("g:netrw_browse_split")
- unlet g:netrw_browse_split
+ unlet g:netrw_browse_split
endif
let g:netrw_browse_split= 0
call s:NetrwBrowse(islocal,s:NetrwBrowseChgDir(islocal,a:fname))
@@ -6619,14 +6623,14 @@ fun! s:NetrwMaps(islocal)
nmap <buffer> <2-leftmouse> <Plug>Netrw2Leftmouse
imap <buffer> <leftmouse> <Plug>ILeftmouse
imap <buffer> <middlemouse> <Plug>IMiddlemouse
- nno <buffer> <silent> <Plug>NetrwLeftmouse <leftmouse>:call <SID>NetrwLeftmouse(1)<cr>
- nno <buffer> <silent> <Plug>NetrwCLeftmouse <leftmouse>:call <SID>NetrwCLeftmouse(1)<cr>
- nno <buffer> <silent> <Plug>NetrwMiddlemouse <leftmouse>:call <SID>NetrwPrevWinOpen(1)<cr>
- nno <buffer> <silent> <Plug>NetrwSLeftmouse <leftmouse>:call <SID>NetrwSLeftmouse(1)<cr>
- nno <buffer> <silent> <Plug>NetrwSLeftdrag <leftmouse>:call <SID>NetrwSLeftdrag(1)<cr>
+ nno <buffer> <silent> <Plug>NetrwLeftmouse :exec "norm! \<lt>leftmouse>"<bar>call <SID>NetrwLeftmouse(1)<cr>
+ nno <buffer> <silent> <Plug>NetrwCLeftmouse :exec "norm! \<lt>leftmouse>"<bar>call <SID>NetrwCLeftmouse(1)<cr>
+ nno <buffer> <silent> <Plug>NetrwMiddlemouse :exec "norm! \<lt>leftmouse>"<bar>call <SID>NetrwPrevWinOpen(1)<cr>
+ nno <buffer> <silent> <Plug>NetrwSLeftmouse :exec "norm! \<lt>leftmouse>"<bar>call <SID>NetrwSLeftmouse(1)<cr>
+ nno <buffer> <silent> <Plug>NetrwSLeftdrag :exec "norm! \<lt>leftmouse>"<bar>call <SID>NetrwSLeftdrag(1)<cr>
nmap <buffer> <silent> <Plug>Netrw2Leftmouse -
- exe 'nnoremap <buffer> <silent> <rightmouse> <leftmouse>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
- exe 'vnoremap <buffer> <silent> <rightmouse> <leftmouse>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
+ exe 'nnoremap <buffer> <silent> <rightmouse> :exec "norm! \<lt>leftmouse>"<bar>call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
+ exe 'vnoremap <buffer> <silent> <rightmouse> :exec "norm! \<lt>leftmouse>"<bar>call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
endif
exe 'nnoremap <buffer> <silent> <nowait> <del> :call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
exe 'nnoremap <buffer> <silent> <nowait> D :call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
@@ -6719,22 +6723,22 @@ fun! s:NetrwMaps(islocal)
nnoremap <buffer> <silent> <Plug>NetrwRefresh :call <SID>NetrwRefresh(0,<SID>NetrwBrowseChgDir(0,'./'))<cr>
if g:netrw_mousemaps == 1
nmap <buffer> <leftmouse> <Plug>NetrwLeftmouse
- nno <buffer> <silent> <Plug>NetrwLeftmouse <leftmouse>:call <SID>NetrwLeftmouse(0)<cr>
+ nno <buffer> <silent> <Plug>NetrwLeftmouse :exec "norm! \<lt>leftmouse>"<bar>call <SID>NetrwLeftmouse(0)<cr>
nmap <buffer> <c-leftmouse> <Plug>NetrwCLeftmouse
- nno <buffer> <silent> <Plug>NetrwCLeftmouse <leftmouse>:call <SID>NetrwCLeftmouse(0)<cr>
+ nno <buffer> <silent> <Plug>NetrwCLeftmouse :exec "norm! \<lt>leftmouse>"<bar>call <SID>NetrwCLeftmouse(0)<cr>
nmap <buffer> <s-leftmouse> <Plug>NetrwSLeftmouse
- nno <buffer> <silent> <Plug>NetrwSLeftmouse <leftmouse>:call <SID>NetrwSLeftmouse(0)<cr>
+ nno <buffer> <silent> <Plug>NetrwSLeftmouse :exec "norm! \<lt>leftmouse>"<bar>call <SID>NetrwSLeftmouse(0)<cr>
nmap <buffer> <s-leftdrag> <Plug>NetrwSLeftdrag
- nno <buffer> <silent> <Plug>NetrwSLeftdrag <leftmouse>:call <SID>NetrwSLeftdrag(0)<cr>
+ nno <buffer> <silent> <Plug>NetrwSLeftdrag :exec "norm! \<lt>leftmouse>"<bar>call <SID>NetrwSLeftdrag(0)<cr>
nmap <middlemouse> <Plug>NetrwMiddlemouse
- nno <buffer> <silent> <middlemouse> <Plug>NetrwMiddlemouse <leftmouse>:call <SID>NetrwPrevWinOpen(0)<cr>
+ nno <buffer> <silent> <middlemouse> <Plug>NetrwMiddlemouse :exec "norm! \<lt>leftmouse>"<bar>call <SID>NetrwPrevWinOpen(0)<cr>
nmap <buffer> <2-leftmouse> <Plug>Netrw2Leftmouse
nmap <buffer> <silent> <Plug>Netrw2Leftmouse -
imap <buffer> <leftmouse> <Plug>ILeftmouse
imap <buffer> <middlemouse> <Plug>IMiddlemouse
imap <buffer> <s-leftmouse> <Plug>ISLeftmouse
- exe 'nnoremap <buffer> <silent> <rightmouse> <leftmouse>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
- exe 'vnoremap <buffer> <silent> <rightmouse> <leftmouse>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
+ exe 'nnoremap <buffer> <silent> <rightmouse> :exec "norm! \<lt>leftmouse>"<bar>call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
+ exe 'vnoremap <buffer> <silent> <rightmouse> :exec "norm! \<lt>leftmouse>"<bar>call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
endif
exe 'nnoremap <buffer> <silent> <nowait> <del> :call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
exe 'nnoremap <buffer> <silent> <nowait> d :call <SID>NetrwMakeDir("'.mapsafeusermach.'")<cr>'
@@ -7445,7 +7449,7 @@ fun! s:NetrwMarkFileExe(islocal,enbloc)
for fname in s:netrwmarkfilelist_{curbufnr}
if a:islocal
if g:netrw_keepdir
- let fname= s:ShellEscape(netrw#WinPath(s:ComposePath(curdir,fname)))
+ let fname= s:ShellEscape(netrw#WinPath(s:ComposePath(curdir,fname)))
endif
else
let fname= s:ShellEscape(netrw#WinPath(b:netrw_curdir.fname))
@@ -7801,7 +7805,7 @@ fun! s:NetrwMarkFileMove(islocal)
let movecmd = netrw#WinPath(movecmd).movecmdargs
" call Decho("windows exception: movecmd<".movecmd."> (#1: had a space)",'~'.expand("<slnum>"))
else
- let movecmd = netrw#WinPath(movecmd)
+ let movecmd = netrw#WinPath(g:netrw_localmovecmd)
" call Decho("windows exception: movecmd<".movecmd."> (#2: no space)",'~'.expand("<slnum>"))
endif
else
@@ -7815,10 +7819,6 @@ fun! s:NetrwMarkFileMove(islocal)
endif
if !g:netrw_cygwin && (has("win32") || has("win95") || has("win64") || has("win16"))
let fname= substitute(fname,'/','\\','g')
- if g:netrw_keepdir
- " Jul 19, 2022: fixing file move when g:netrw_keepdir is 1
- let fname= b:netrw_curdir."\\".fname
- endif
endif
" call Decho("system(".movecmd." ".s:ShellEscape(fname)." ".tgt.")",'~'.expand("<slnum>"))
let ret= system(movecmd.g:netrw_localmovecmdopt." ".s:ShellEscape(fname)." ".tgt)
@@ -9377,7 +9377,7 @@ fun! s:NetrwTreeDir(islocal)
" call Decho("treedir<".treedir.">",'~'.expand("<slnum>"))
elseif curline =~ '@$'
" call Decho("handle symbolic link from current line",'~'.expand("<slnum>"))
- let treedir= resolve(substitute(substitute(getline('.'),'@.*$','','e'),'^|*\s*','','e'))
+ let potentialdir= resolve(substitute(substitute(getline('.'),'@.*$','','e'),'^|*\s*','','e'))
" call Decho("treedir<".treedir.">",'~'.expand("<slnum>"))
else
" call Decho("do not extract tree subdirectory from current line and set treedir to empty",'~'.expand("<slnum>"))
@@ -9402,7 +9402,6 @@ fun! s:NetrwTreeDir(islocal)
" call Decho("COMBAK#23 : mod=".&mod." win#".winnr())
" call Decho("islocal=".a:islocal." curline<".curline.">",'~'.expand("<slnum>"))
- let potentialdir= s:NetrwFile(substitute(curline,'^'.s:treedepthstring.'\+ \(.*\)@$','\1',''))
" call Decho("potentialdir<".potentialdir."> isdir=".isdirectory(potentialdir),'~'.expand("<slnum>"))
" call Decho("COMBAK#24 : mod=".&mod." win#".winnr())
@@ -9415,8 +9414,15 @@ fun! s:NetrwTreeDir(islocal)
" " call Decho("newdir <".newdir.">",'~'.expand("<slnum>"))
" else
" call Decho("apply NetrwTreePath to treetop<".w:netrw_treetop.">",'~'.expand("<slnum>"))
- let treedir = s:NetrwTreePath(w:netrw_treetop)
-" endif
+ if a:islocal && curline =~ '@$'
+ if isdirectory(s:NetrwFile(potentialdir))
+ let treedir = w:netrw_treetop.'/'.potentialdir.'/'
+ let w:netrw_treetop = treedir
+ endif
+ else
+ let potentialdir= s:NetrwFile(substitute(curline,'^'.s:treedepthstring.'\+ \(.*\)@$','\1',''))
+ let treedir = s:NetrwTreePath(w:netrw_treetop)
+ endif
endif
" call Decho("COMBAK#25 : mod=".&mod." win#".winnr())
@@ -10104,7 +10110,7 @@ fun! s:SetupNetrwStatusLine(statline)
" set up status line (may use User9 highlighting)
" insure that windows have a statusline
" make sure statusline is displayed
- let &stl=a:statline
+ let &l:stl=a:statline
setl laststatus=2
" call Decho("stl=".&stl,'~'.expand("<slnum>"))
redraw
@@ -10220,7 +10226,7 @@ fun! s:NetrwRemoteFtpCmd(path,listcmd)
setl ff=unix
" restore settings
- let &ff= ffkeep
+ let &l:ff= ffkeep
" call Dret("NetrwRemoteFtpCmd")
return
@@ -10257,7 +10263,7 @@ fun! s:NetrwRemoteFtpCmd(path,listcmd)
endif
" restore settings " {{{3
- let &ff= ffkeep
+ let &l:ff= ffkeep
" call Dret("NetrwRemoteFtpCmd")
endfun
@@ -10270,7 +10276,7 @@ fun! s:NetrwRemoteListing()
let w:netrw_bannercnt= s:bannercnt
endif
if !exists("w:netrw_bannercnt") && exists("b:bannercnt")
- let w:netrw_bannercnt= s:bannercnt
+ let w:netrw_bannercnt= b:bannercnt
endif
call s:RemotePathAnalysis(b:netrw_curdir)
@@ -10561,7 +10567,7 @@ fun! s:NetrwRemoteRmFile(path,rmfile,all)
NetrwKeepj call netrw#ErrorMsg(s:ERROR,"for some reason b:netrw_curdir doesn't exist!",53)
let ok="q"
else
- let remotedir= substitute(b:netrw_curdir,'^.*//[^/]\+/\(.*\)$','\1','')
+ let remotedir= substitute(b:netrw_curdir,'^.\{-}//[^/]\+/\(.*\)$','\1','')
" call Decho("netrw_rm_cmd<".netrw_rm_cmd.">",'~'.expand("<slnum>"))
" call Decho("remotedir<".remotedir.">",'~'.expand("<slnum>"))
" call Decho("rmfile<".a:rmfile.">",'~'.expand("<slnum>"))
@@ -10574,7 +10580,7 @@ fun! s:NetrwRemoteRmFile(path,rmfile,all)
let ret= system(netrw_rm_cmd)
if v:shell_error != 0
if exists("b:netrw_curdir") && b:netrw_curdir != getcwd() && !g:netrw_keepdir
- call netrw#ErrorMsg(s:ERROR,"remove failed; perhaps due to vim's current directory<".getcwd()."> not matching netrw's (".b:netrw_curdir.") (see :help netrw-cd)",102)
+ call netrw#ErrorMsg(s:ERROR,"remove failed; perhaps due to vim's current directory<".getcwd()."> not matching netrw's (".b:netrw_curdir.") (see :help netrw-cd)",102)
else
call netrw#ErrorMsg(s:WARNING,"cmd<".netrw_rm_cmd."> failed",60)
endif
@@ -10852,6 +10858,10 @@ fun! s:LocalBrowseRefresh()
" call Dret("s:LocalBrowseRefresh : don't refresh when focus not on netrw window")
return
endif
+ if !empty(getcmdwintype())
+ " cannot move away from cmdline window, see :h E11
+ return
+ endif
if exists("s:netrw_events") && s:netrw_events == 1
" s:LocalFastBrowser gets called (indirectly) from a
let s:netrw_events= 2
@@ -11078,16 +11088,16 @@ fun! s:LocalListing()
" call Decho("pfile <".pfile.">",'~'.expand("<slnum>"))
if w:netrw_liststyle == s:LONGLIST
- let longfile= printf("%-".g:netrw_maxfilenamelen."S",pfile)
- let sz = getfsize(filename)
- let szlen = 15 - (strdisplaywidth(longfile) - g:netrw_maxfilenamelen)
- let szlen = (szlen > 0) ? szlen : 0
+ let longfile = printf("%-".g:netrw_maxfilenamelen."S",pfile)
+ let sz = getfsize(filename)
+ let szlen = 15 - (strdisplaywidth(longfile) - g:netrw_maxfilenamelen)
+ let szlen = (szlen > 0) ? szlen : 0
if g:netrw_sizestyle =~# "[hH]"
let sz= s:NetrwHumanReadable(sz)
endif
let fsz = printf("%".szlen."S",sz)
- let pfile = longfile." ".fsz." ".strftime(g:netrw_timefmt,getftime(filename))
+ let pfile= longfile." ".fsz." ".strftime(g:netrw_timefmt,getftime(filename))
" call Decho("longlist support: sz=".sz." fsz=".fsz,'~'.expand("<slnum>"))
endif
@@ -11164,6 +11174,10 @@ endfun
fun! s:NetrwLocalRename(path) range
" call Dfunc("NetrwLocalRename(path<".a:path.">)")
+ if !exists("w:netrw_bannercnt")
+ let w:netrw_bannercnt= b:netrw_bannercnt
+ endif
+
" preparation for removing multiple files/directories
let ykeep = @@
let ctr = a:firstline
@@ -11265,6 +11279,10 @@ fun! s:NetrwLocalRm(path) range
" call Dfunc("s:NetrwLocalRm(path<".a:path.">)")
" call Decho("firstline=".a:firstline." lastline=".a:lastline,'~'.expand("<slnum>"))
+ if !exists("w:netrw_bannercnt")
+ let w:netrw_bannercnt= b:netrw_bannercnt
+ endif
+
" preparation for removing multiple files/directories
let ykeep = @@
let ret = 0
@@ -11464,7 +11482,7 @@ endfun
" netrw#RFC2396: converts %xx into characters {{{2
fun! netrw#RFC2396(fname)
" call Dfunc("netrw#RFC2396(fname<".a:fname.">)")
- let fname = escape(substitute(a:fname,'%\(\x\x\)','\=nr2char("0x".submatch(1))','ge')," \t")
+ let fname = escape(substitute(a:fname,'%\(\x\x\)','\=printf("%c","0x".submatch(1))','ge')," \t")
" call Dret("netrw#RFC2396 ".fname)
return fname
endfun
@@ -12099,7 +12117,7 @@ fun! s:NetrwLcd(newdir)
if (has("win32") || has("win95") || has("win64") || has("win16")) && !g:netrw_cygwin
if a:newdir =~ '^\\\\\w\+' || a:newdir =~ '^//\w\+'
let dirname = '\'
- exe 'NetrwKeepj sil lcd '.fnameescape(dirname)
+ exe 'NetrwKeepj sil lcd '.fnameescape(dirname)
endif
endif
catch /^Vim\%((\a\+)\)\=:E472/
diff --git a/runtime/autoload/netrwFileHandlers.vim b/runtime/autoload/netrwFileHandlers.vim
index d07235c107..2b6f8f7a0f 100644
--- a/runtime/autoload/netrwFileHandlers.vim
+++ b/runtime/autoload/netrwFileHandlers.vim
@@ -1,6 +1,7 @@
" netrwFileHandlers: contains various extension-based file handlers for
" netrw's browsers' x command ("eXecute launcher")
-" Author: Charles E. Campbell
+" Maintainer: This runtime file is looking for a new maintainer.
+" Original Author: Charles E. Campbell
" Date: Sep 18, 2020
" Version: 11
" Copyright: Copyright (C) 1999-2012 Charles E. Campbell {{{1
diff --git a/runtime/autoload/netrwSettings.vim b/runtime/autoload/netrwSettings.vim
index d65f83144e..5525c0d035 100644
--- a/runtime/autoload/netrwSettings.vim
+++ b/runtime/autoload/netrwSettings.vim
@@ -1,6 +1,7 @@
" netrwSettings.vim: makes netrw settings simpler
" Date: Nov 15, 2021
-" Maintainer: Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Maintainer: This runtime file is looking for a new maintainer.
+" Former Maintainer: Charles E Campbell
" Version: 18
" Copyright: Copyright (C) 1999-2007 Charles E. Campbell {{{1
" Permission is hereby granted to use and distribute this code,
diff --git a/runtime/autoload/provider/perl.vim b/runtime/autoload/provider/perl.vim
index 24f2b018bb..b439f751ae 100644
--- a/runtime/autoload/provider/perl.vim
+++ b/runtime/autoload/provider/perl.vim
@@ -1,83 +1,15 @@
-if exists('s:loaded_perl_provider')
+if exists('g:loaded_perl_provider')
finish
endif
-let s:loaded_perl_provider = 1
-
-function! provider#perl#Detect() abort
- " use g:perl_host_prog if set or check if perl is on the path
- let prog = exepath(get(g:, 'perl_host_prog', 'perl'))
- if empty(prog)
- return ['', '']
- endif
-
- " if perl is available, make sure we have 5.22+
- call system([prog, '-e', 'use v5.22'])
- if v:shell_error
- return ['', 'Perl version is too old, 5.22+ required']
- endif
-
- " if perl is available, make sure the required module is available
- call system([prog, '-W', '-MNeovim::Ext', '-e', ''])
- if v:shell_error
- return ['', '"Neovim::Ext" cpan module is not installed']
- endif
-
- return [prog, '']
-endfunction
-
-function! provider#perl#Prog() abort
- return s:prog
+function! provider#perl#Call(method, args) abort
+ return v:lua.vim.provider.perl.call(a:method, a:args)
endfunction
function! provider#perl#Require(host) abort
- if s:err != ''
- echoerr s:err
- return
- endif
-
- let prog = provider#perl#Prog()
- let args = [s:prog, '-e', 'use Neovim::Ext; start_host();']
-
- " Collect registered perl plugins into args
- let perl_plugins = remote#host#PluginsForHost(a:host.name)
- for plugin in perl_plugins
- call add(args, plugin.path)
- endfor
-
- return provider#Poll(args, a:host.orig_name, '$NVIM_PERL_LOG_FILE')
+ return v:lua.vim.provider.perl.require(a:host, s:prog)
endfunction
-function! provider#perl#Call(method, args) abort
- if s:err != ''
- echoerr s:err
- return
- endif
-
- if !exists('s:host')
- try
- let s:host = remote#host#Require('legacy-perl-provider')
- catch
- let s:err = v:exception
- echohl WarningMsg
- echomsg v:exception
- echohl None
- return
- endtry
- endif
- return call('rpcrequest', insert(insert(a:args, 'perl_'.a:method), s:host))
-endfunction
-
-let [s:prog, s:err] = provider#perl#Detect()
+let s:prog = v:lua.vim.provider.perl.detect()
let g:loaded_perl_provider = empty(s:prog) ? 1 : 2
-
-if g:loaded_perl_provider != 2
- let s:err = 'Cannot find perl or the required perl module'
-endif
-
-
-" The perl provider plugin will run in a separate instance of the perl
-" host.
-call remote#host#RegisterClone('legacy-perl-provider', 'perl')
-call remote#host#RegisterPlugin('legacy-perl-provider', 'ScriptHost.pm', [])
-
+call v:lua.require'vim.provider.perl'.start()
diff --git a/runtime/autoload/provider/python3.vim b/runtime/autoload/provider/python3.vim
index 38ef0cccfc..43c14122d0 100644
--- a/runtime/autoload/provider/python3.vim
+++ b/runtime/autoload/provider/python3.vim
@@ -1,45 +1,15 @@
-" The Python3 provider uses a Python3 host to emulate an environment for running
-" python3 plugins. :help provider
-"
-" Associating the plugin with the Python3 host is the first step because
-" plugins will be passed as command-line arguments
-
if exists('g:loaded_python3_provider')
finish
endif
-let [s:prog, s:err] = provider#pythonx#Detect(3)
-let g:loaded_python3_provider = empty(s:prog) ? 1 : 2
-function! provider#python3#Prog() abort
- return s:prog
+function! provider#python3#Call(method, args) abort
+ return v:lua.vim.provider.python.call(a:method, a:args)
endfunction
-function! provider#python3#Error() abort
- return s:err
+function! provider#python3#Require(host) abort
+ return v:lua.vim.provider.python.require(a:host)
endfunction
-" The Python3 provider plugin will run in a separate instance of the Python3
-" host.
-call remote#host#RegisterClone('legacy-python3-provider', 'python3')
-call remote#host#RegisterPlugin('legacy-python3-provider', 'script_host.py', [])
-
-function! provider#python3#Call(method, args) abort
- if s:err != ''
- return
- endif
- if !exists('s:host')
- let s:rpcrequest = function('rpcrequest')
-
- " Ensure that we can load the Python3 host before bootstrapping
- try
- let s:host = remote#host#Require('legacy-python3-provider')
- catch
- let s:err = v:exception
- echohl WarningMsg
- echomsg v:exception
- echohl None
- return
- endtry
- endif
- return call(s:rpcrequest, insert(insert(a:args, 'python_'.a:method), s:host))
-endfunction
+let s:prog = v:lua.vim.provider.python.detect_by_module('neovim')
+let g:loaded_python3_provider = empty(s:prog) ? 1 : 2
+call v:lua.require'vim.provider.python'.start()
diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim
deleted file mode 100644
index 48b96c699a..0000000000
--- a/runtime/autoload/provider/pythonx.vim
+++ /dev/null
@@ -1,112 +0,0 @@
-" The Python provider helper
-if exists('s:loaded_pythonx_provider')
- finish
-endif
-
-let s:loaded_pythonx_provider = 1
-
-function! provider#pythonx#Require(host) abort
- " Python host arguments
- let prog = provider#python3#Prog()
- let args = [prog, '-c', 'import sys; sys.path = [p for p in sys.path if p != ""]; import neovim; neovim.start_host()']
-
-
- " Collect registered Python plugins into args
- let python_plugins = remote#host#PluginsForHost(a:host.name)
- for plugin in python_plugins
- call add(args, plugin.path)
- endfor
-
- return provider#Poll(args, a:host.orig_name, '$NVIM_PYTHON_LOG_FILE', {'overlapped': v:true})
-endfunction
-
-function! s:get_python_executable_from_host_var(major_version) abort
- return expand(get(g:, 'python'.(a:major_version == 3 ? '3' : execute("throw 'unsupported'")).'_host_prog', ''), v:true)
-endfunction
-
-function! s:get_python_candidates(major_version) abort
- return {
- \ 3: ['python3', 'python3.12', 'python3.11', 'python3.10', 'python3.9', 'python3.8', 'python3.7', 'python']
- \ }[a:major_version]
-endfunction
-
-" Returns [path_to_python_executable, error_message]
-function! provider#pythonx#Detect(major_version) abort
- return provider#pythonx#DetectByModule('neovim', a:major_version)
-endfunction
-
-" Returns [path_to_python_executable, error_message]
-function! provider#pythonx#DetectByModule(module, major_version) abort
- let python_exe = s:get_python_executable_from_host_var(a:major_version)
-
- if !empty(python_exe)
- return [exepath(expand(python_exe, v:true)), '']
- endif
-
- let candidates = s:get_python_candidates(a:major_version)
- let errors = []
-
- for exe in candidates
- let [result, error] = provider#pythonx#CheckForModule(exe, a:module, a:major_version)
- if result
- return [exe, error]
- endif
- " Accumulate errors in case we don't find any suitable Python executable.
- call add(errors, error)
- endfor
-
- " No suitable Python executable found.
- return ['', 'Could not load Python '.a:major_version.":\n".join(errors, "\n")]
-endfunction
-
-" Returns array: [prog_exitcode, prog_version]
-function! s:import_module(prog, module) abort
- let prog_version = system([a:prog, '-W', 'ignore', '-c', printf(
- \ 'import sys, importlib.util; ' .
- \ 'sys.path = [p for p in sys.path if p != ""]; ' .
- \ 'sys.stdout.write(str(sys.version_info[0]) + "." + str(sys.version_info[1])); ' .
- \ 'sys.exit(2 * int(importlib.util.find_spec("%s") is None))',
- \ a:module)])
- return [v:shell_error, prog_version]
-endfunction
-
-" Returns array: [was_success, error_message]
-function! provider#pythonx#CheckForModule(prog, module, major_version) abort
- let prog_path = exepath(a:prog)
- if prog_path ==# ''
- return [0, a:prog . ' not found in search path or not executable.']
- endif
-
- let min_version = '3.7'
-
- " Try to load module, and output Python version.
- " Exit codes:
- " 0 module can be loaded.
- " 2 module cannot be loaded.
- " Otherwise something else went wrong (e.g. 1 or 127).
- let [prog_exitcode, prog_version] = s:import_module(a:prog, a:module)
-
- if prog_exitcode == 2 || prog_exitcode == 0
- " Check version only for expected return codes.
- if prog_version !~ '^' . a:major_version
- return [0, prog_path . ' is Python ' . prog_version . ' and cannot provide Python '
- \ . a:major_version . '.']
- elseif prog_version =~ '^' . a:major_version && str2nr(prog_version[2:]) < str2nr(min_version[2:])
- return [0, prog_path . ' is Python ' . prog_version . ' and cannot provide Python >= '
- \ . min_version . '.']
- endif
- endif
-
- if prog_exitcode == 2
- return [0, prog_path.' does not have the "' . a:module . '" module.']
- elseif prog_exitcode == 127
- " This can happen with pyenv's shims.
- return [0, prog_path . ' does not exist: ' . prog_version]
- elseif prog_exitcode
- return [0, 'Checking ' . prog_path . ' caused an unknown error. '
- \ . '(' . prog_exitcode . ', output: ' . prog_version . ')'
- \ . ' Report this at https://github.com/neovim/neovim']
- endif
-
- return [1, '']
-endfunction
diff --git a/runtime/autoload/provider/ruby.vim b/runtime/autoload/provider/ruby.vim
index 1428fab1cc..07b4aca23f 100644
--- a/runtime/autoload/provider/ruby.vim
+++ b/runtime/autoload/provider/ruby.vim
@@ -1,73 +1,16 @@
-" The Ruby provider helper
if exists('g:loaded_ruby_provider')
finish
endif
-let g:loaded_ruby_provider = 1
-
-function! provider#ruby#Detect() abort
- let e = empty(s:prog) ? 'missing ruby or ruby-host' : ''
- return [s:prog, e]
-endfunction
-
-function! provider#ruby#Prog() abort
- return s:prog
-endfunction
function! provider#ruby#Require(host) abort
- let prog = provider#ruby#Prog()
- let ruby_plugins = remote#host#PluginsForHost(a:host.name)
-
- for plugin in ruby_plugins
- let prog .= " " . shellescape(plugin.path)
- endfor
-
- return provider#Poll(prog, a:host.orig_name, '$NVIM_RUBY_LOG_FILE')
+ return v:lua.vim.provider.ruby.require(a:host)
endfunction
function! provider#ruby#Call(method, args) abort
- if s:err != ''
- echoerr s:err
- return
- endif
-
- if !exists('s:host')
- try
- let s:host = remote#host#Require('legacy-ruby-provider')
- catch
- let s:err = v:exception
- echohl WarningMsg
- echomsg v:exception
- echohl None
- return
- endtry
- endif
- return call('rpcrequest', insert(insert(a:args, 'ruby_'.a:method), s:host))
+ return v:lua.vim.provider.ruby.call(a:method, a:args)
endfunction
-function! s:detect()
- if exists("g:ruby_host_prog")
- return expand(g:ruby_host_prog, v:true)
- elseif has('win32')
- return exepath('neovim-ruby-host.bat')
- else
- let p = exepath('neovim-ruby-host')
- if empty(p)
- return ''
- endif
- " neovim-ruby-host could be an rbenv shim for another Ruby version.
- call system(p)
- return v:shell_error ? '' : p
- end
-endfunction
-
-let s:err = ''
-let s:prog = s:detect()
-let s:plugin_path = expand('<sfile>:p:h') . '/script_host.rb'
+let s:prog = v:lua.vim.provider.ruby.detect()
let g:loaded_ruby_provider = empty(s:prog) ? 1 : 2
-
-if g:loaded_ruby_provider != 2
- let s:err = 'Cannot find the neovim RubyGem. Try :checkhealth'
-endif
-
-call remote#host#RegisterClone('legacy-ruby-provider', 'ruby')
-call remote#host#RegisterPlugin('legacy-ruby-provider', s:plugin_path, [])
+let s:plugin_path = expand('<sfile>:p:h') . '/script_host.rb'
+call v:lua.require'vim.provider.ruby'.start(s:plugin_path)
diff --git a/runtime/autoload/remote/host.vim b/runtime/autoload/remote/host.vim
index 884b478f19..0032a4b71e 100644
--- a/runtime/autoload/remote/host.vim
+++ b/runtime/autoload/remote/host.vim
@@ -190,11 +190,9 @@ endfunction
" Registration of standard hosts
-" Python/Python3
-call remote#host#Register('python', '*',
- \ function('provider#pythonx#Require'))
+" Python3
call remote#host#Register('python3', '*',
- \ function('provider#pythonx#Require'))
+ \ function('provider#python3#Require'))
" Ruby
call remote#host#Register('ruby', '*.rb',
diff --git a/runtime/autoload/rubycomplete.vim b/runtime/autoload/rubycomplete.vim
index 3677b25aeb..6ead0fd837 100644
--- a/runtime/autoload/rubycomplete.vim
+++ b/runtime/autoload/rubycomplete.vim
@@ -2,8 +2,7 @@
" Language: Ruby
" Maintainer: Mark Guzman <segfault@hasno.info>
" URL: https://github.com/vim-ruby/vim-ruby
-" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
-" Last Change: 2020 Apr 12
+" Last Change: 2023 Dec 31
" ----------------------------------------------------------------------------
"
" Ruby IRB/Complete author: Keiju ISHITSUKA(keiju@ishitsuka.com)
@@ -490,7 +489,7 @@ class VimRubyCompletion
trail = "%s%s" % [ dir, sub ]
tcfg = "%sconfig" % trail
- if File.exists?( tcfg )
+ if File.exist?( tcfg )
rails_base = trail
break
end
@@ -503,7 +502,7 @@ class VimRubyCompletion
bootfile = rails_base + "config/boot.rb"
envfile = rails_base + "config/environment.rb"
- if File.exists?( bootfile ) && File.exists?( envfile )
+ if File.exist?( bootfile ) && File.exist?( envfile )
begin
require bootfile
require envfile
diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim
index e242fe98e3..f2a74db5ed 100644
--- a/runtime/autoload/tar.vim
+++ b/runtime/autoload/tar.vim
@@ -2,7 +2,8 @@
" AUTOLOAD PORTION
" Date: Nov 14, 2023
" Version: 32b (with modifications from the Vim Project)
-" Maintainer: Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Maintainer: This runtime file is looking for a new maintainer.
+" Former Maintainer: Charles E Campbell
" License: Vim License (see vim's :help license)
"
" Contains many ideas from Michael Toren's <tar.vim>
@@ -163,9 +164,9 @@ fun! tar#Browse(tarfile)
" call Decho("1: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
- elseif tarfile =~# '\.\(tgz\)$' || tarfile =~# '\.\(tbz\)$' || tarfile =~# '\.\(txz\)$' || tarfile =~# '\.\(tzs\)$'
+ elseif tarfile =~# '\.\(tgz\)$' || tarfile =~# '\.\(tbz\)$' || tarfile =~# '\.\(txz\)$' || tarfile =~# '\.\(tzst\)$'
if has("unix") && executable("file")
- let filekind= system("file ".shellescape(tarfile,1)) =~ "bzip2"
+ let filekind= system("file ".shellescape(tarfile,1))
else
let filekind= ""
endif
@@ -192,7 +193,7 @@ fun! tar#Browse(tarfile)
elseif tarfile =~# '\.\(xz\|txz\)$'
" call Decho("3: exe silent r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
exe "sil! r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
- elseif tarfile =~# '\.\(zst\|tzs\)$'
+ elseif tarfile =~# '\.\(zst\|tzst\)$'
exe "sil! r! zstd --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
else
if tarfile =~ '^\s*-'
@@ -230,7 +231,7 @@ fun! tar#Browse(tarfile)
" set up maps supported for tar
setlocal noma nomod ro
noremap <silent> <buffer> <cr> :call <SID>TarBrowseSelect()<cr>
- noremap <silent> <buffer> x :call tar#Extract()<cr>
+ noremap <silent> <buffer> x :call tar#Extract()<cr>
if &mouse != ""
noremap <silent> <buffer> <leftmouse> <leftmouse>:call <SID>TarBrowseSelect()<cr>
endif
@@ -468,9 +469,9 @@ fun! tar#Write(fname)
let compress= "xz -- ".shellescape(tarfile,0)
" call Decho("compress<".compress.">")
elseif tarfile =~# '\.zst'
- call system("zstd --decompress -- ".shellescape(tarfile,0))
+ call system("zstd --decompress --rm -- ".shellescape(tarfile,0))
let tarfile = substitute(tarfile,'\.zst','','e')
- let compress= "zstd -- ".shellescape(tarfile,0)
+ let compress= "zstd --rm -- ".shellescape(tarfile,0)
elseif tarfile =~# '\.lzma'
call system("lzma -d -- ".shellescape(tarfile,0))
let tarfile = substitute(tarfile,'\.lzma','','e')
@@ -486,7 +487,7 @@ fun! tar#Write(fname)
else
" call Decho("tarfile<".tarfile."> fname<".fname.">")
-
+
if fname =~ '/'
let dirpath = substitute(fname,'/[^/]\+$','','e')
if has("win32unix") && executable("cygpath")
@@ -502,7 +503,7 @@ fun! tar#Write(fname)
let tarfile = substitute(tarfile, '-', './-', '')
endif
" call Decho("tarfile<".tarfile."> fname<".fname.">")
-
+
if exists("g:tar_secure")
let tar_secure= " -- "
else
@@ -512,7 +513,7 @@ fun! tar#Write(fname)
if has("win32unix") && executable("cygpath")
let tarfile = substitute(system("cygpath ".shellescape(tarfile,0)),'\n','','e')
endif
-
+
" delete old file from tarfile
" call Decho("system(".g:tar_cmd." ".g:tar_delfile." ".shellescape(tarfile,0)." -- ".shellescape(fname,0).")")
call system(g:tar_cmd." ".g:tar_delfile." ".shellescape(tarfile,0).tar_secure.shellescape(fname,0))
@@ -521,8 +522,8 @@ fun! tar#Write(fname)
" call Decho("***error*** (tar#Write) sorry, unable to update ".fnameescape(tarfile)." with ".fnameescape(fname))
echohl Error | echo "***error*** (tar#Write) sorry, unable to update ".fnameescape(tarfile)." with ".fnameescape(fname) | echohl None
else
-
- " update tarfile with new file
+
+ " update tarfile with new file
" call Decho(g:tar_cmd." -".g:tar_writeoptions." ".shellescape(tarfile,0).tar_secure.shellescape(fname,0))
call system(g:tar_cmd." -".g:tar_writeoptions." ".shellescape(tarfile,0).tar_secure.shellescape(fname,0))
if v:shell_error != 0
@@ -555,7 +556,7 @@ fun! tar#Write(fname)
unlet s:tblfile_{winnr()}
endif
endif
-
+
" cleanup and restore current directory
cd ..
call s:Rmdir("_ZIPVIM_")
@@ -696,13 +697,13 @@ fun! tar#Extract()
echo "***note*** successfully extracted ".fname
endif
- elseif filereadable(tarbase.".tzs")
+ elseif filereadable(tarbase.".tzst")
let extractcmd= substitute(extractcmd,"-","--zstd","")
-" call Decho("system(".extractcmd." ".shellescape(tarbase).".tzs ".shellescape(fname).")")
- call system(extractcmd." ".shellescape(tarbase).".txz ".shellescape(fname))
+" call Decho("system(".extractcmd." ".shellescape(tarbase).".tzst ".shellescape(fname).")")
+ call system(extractcmd." ".shellescape(tarbase).".tzst ".shellescape(fname))
if v:shell_error != 0
- echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tzs ".fname.": failed!" | echohl NONE
-" call Decho("***error*** ".extractcmd." ".tarbase.".tzs ".fname.": failed!")
+ echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tzst ".fname.": failed!" | echohl NONE
+" call Decho("***error*** ".extractcmd." ".tarbase.".tzst ".fname.": failed!")
else
echo "***note*** successfully extracted ".fname
endif
@@ -710,7 +711,7 @@ fun! tar#Extract()
elseif filereadable(tarbase.".tar.zst")
let extractcmd= substitute(extractcmd,"-","--zstd","")
" call Decho("system(".extractcmd." ".shellescape(tarbase).".tar.zst ".shellescape(fname).")")
- call system(extractcmd." ".shellescape(tarbase).".tar.xz ".shellescape(fname))
+ call system(extractcmd." ".shellescape(tarbase).".tar.zst ".shellescape(fname))
if v:shell_error != 0
echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tar.zst ".fname.": failed!" | echohl NONE
" call Decho("***error*** ".extractcmd." ".tarbase.".tar.zst ".fname.": failed!")
diff --git a/runtime/autoload/tohtml.vim b/runtime/autoload/tohtml.vim
deleted file mode 100644
index b1693efc5d..0000000000
--- a/runtime/autoload/tohtml.vim
+++ /dev/null
@@ -1,951 +0,0 @@
-" Vim autoload file for the tohtml plugin.
-" Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2023 Sep 03
-"
-" Additional contributors:
-"
-" Original by Bram Moolenaar <Bram@vim.org>
-" Diff2HTML() added by Christian Brabandt <cb@256bit.org>
-"
-" See Mercurial change logs for more!
-
-" this file uses line continuations
-let s:cpo_sav = &cpo
-set cpo&vim
-
-" Automatically find charsets from all encodings supported natively by Vim. With
-" the 8bit- and 2byte- prefixes, Vim can actually support more encodings than
-" this. Let the user specify these however since they won't be supported on
-" every system.
-"
-" Note, not all of Vim's supported encodings have a charset to use.
-"
-" Names in this list are from:
-" http://www.iana.org/assignments/character-sets
-" g:tohtml#encoding_to_charset: {{{
-let g:tohtml#encoding_to_charset = {
- \ 'latin1' : 'ISO-8859-1',
- \ 'iso-8859-2' : 'ISO-8859-2',
- \ 'iso-8859-3' : 'ISO-8859-3',
- \ 'iso-8859-4' : 'ISO-8859-4',
- \ 'iso-8859-5' : 'ISO-8859-5',
- \ 'iso-8859-6' : 'ISO-8859-6',
- \ 'iso-8859-7' : 'ISO-8859-7',
- \ 'iso-8859-8' : 'ISO-8859-8',
- \ 'iso-8859-9' : 'ISO-8859-9',
- \ 'iso-8859-10' : '',
- \ 'iso-8859-13' : 'ISO-8859-13',
- \ 'iso-8859-14' : '',
- \ 'iso-8859-15' : 'ISO-8859-15',
- \ 'koi8-r' : 'KOI8-R',
- \ 'koi8-u' : 'KOI8-U',
- \ 'macroman' : 'macintosh',
- \ 'cp437' : '',
- \ 'cp775' : '',
- \ 'cp850' : '',
- \ 'cp852' : '',
- \ 'cp855' : '',
- \ 'cp857' : '',
- \ 'cp860' : '',
- \ 'cp861' : '',
- \ 'cp862' : '',
- \ 'cp863' : '',
- \ 'cp865' : '',
- \ 'cp866' : 'IBM866',
- \ 'cp869' : '',
- \ 'cp874' : '',
- \ 'cp1250' : 'windows-1250',
- \ 'cp1251' : 'windows-1251',
- \ 'cp1253' : 'windows-1253',
- \ 'cp1254' : 'windows-1254',
- \ 'cp1255' : 'windows-1255',
- \ 'cp1256' : 'windows-1256',
- \ 'cp1257' : 'windows-1257',
- \ 'cp1258' : 'windows-1258',
- \ 'euc-jp' : 'EUC-JP',
- \ 'sjis' : 'Shift_JIS',
- \ 'cp932' : 'Shift_JIS',
- \ 'cp949' : '',
- \ 'euc-kr' : 'EUC-KR',
- \ 'cp936' : 'GBK',
- \ 'euc-cn' : 'GB2312',
- \ 'big5' : 'Big5',
- \ 'cp950' : 'Big5',
- \ 'utf-8' : 'UTF-8',
- \ 'ucs-2' : 'UTF-8',
- \ 'ucs-2le' : 'UTF-8',
- \ 'utf-16' : 'UTF-8',
- \ 'utf-16le' : 'UTF-8',
- \ 'ucs-4' : 'UTF-8',
- \ 'ucs-4le' : 'UTF-8',
- \ }
-lockvar g:tohtml#encoding_to_charset
-" Notes:
-" 1. All UCS/UTF are converted to UTF-8 because it is much better supported
-" 2. Any blank spaces are there because Vim supports it but at least one major
-" web browser does not according to http://wiki.whatwg.org/wiki/Web_Encodings.
-" }}}
-
-" Only automatically find encodings supported natively by Vim, let the user
-" specify the encoding if it's not natively supported. This function is only
-" used when the user specifies the charset, they better know what they are
-" doing!
-"
-" Names in this list are from:
-" http://www.iana.org/assignments/character-sets
-" g:tohtml#charset_to_encoding: {{{
-let g:tohtml#charset_to_encoding = {
- \ 'iso_8859-1:1987' : 'latin1',
- \ 'iso-ir-100' : 'latin1',
- \ 'iso_8859-1' : 'latin1',
- \ 'iso-8859-1' : 'latin1',
- \ 'latin1' : 'latin1',
- \ 'l1' : 'latin1',
- \ 'ibm819' : 'latin1',
- \ 'cp819' : 'latin1',
- \ 'csisolatin1' : 'latin1',
- \ 'iso_8859-2:1987' : 'iso-8859-2',
- \ 'iso-ir-101' : 'iso-8859-2',
- \ 'iso_8859-2' : 'iso-8859-2',
- \ 'iso-8859-2' : 'iso-8859-2',
- \ 'latin2' : 'iso-8859-2',
- \ 'l2' : 'iso-8859-2',
- \ 'csisolatin2' : 'iso-8859-2',
- \ 'iso_8859-3:1988' : 'iso-8859-3',
- \ 'iso-ir-109' : 'iso-8859-3',
- \ 'iso_8859-3' : 'iso-8859-3',
- \ 'iso-8859-3' : 'iso-8859-3',
- \ 'latin3' : 'iso-8859-3',
- \ 'l3' : 'iso-8859-3',
- \ 'csisolatin3' : 'iso-8859-3',
- \ 'iso_8859-4:1988' : 'iso-8859-4',
- \ 'iso-ir-110' : 'iso-8859-4',
- \ 'iso_8859-4' : 'iso-8859-4',
- \ 'iso-8859-4' : 'iso-8859-4',
- \ 'latin4' : 'iso-8859-4',
- \ 'l4' : 'iso-8859-4',
- \ 'csisolatin4' : 'iso-8859-4',
- \ 'iso_8859-5:1988' : 'iso-8859-5',
- \ 'iso-ir-144' : 'iso-8859-5',
- \ 'iso_8859-5' : 'iso-8859-5',
- \ 'iso-8859-5' : 'iso-8859-5',
- \ 'cyrillic' : 'iso-8859-5',
- \ 'csisolatincyrillic' : 'iso-8859-5',
- \ 'iso_8859-6:1987' : 'iso-8859-6',
- \ 'iso-ir-127' : 'iso-8859-6',
- \ 'iso_8859-6' : 'iso-8859-6',
- \ 'iso-8859-6' : 'iso-8859-6',
- \ 'ecma-114' : 'iso-8859-6',
- \ 'asmo-708' : 'iso-8859-6',
- \ 'arabic' : 'iso-8859-6',
- \ 'csisolatinarabic' : 'iso-8859-6',
- \ 'iso_8859-7:1987' : 'iso-8859-7',
- \ 'iso-ir-126' : 'iso-8859-7',
- \ 'iso_8859-7' : 'iso-8859-7',
- \ 'iso-8859-7' : 'iso-8859-7',
- \ 'elot_928' : 'iso-8859-7',
- \ 'ecma-118' : 'iso-8859-7',
- \ 'greek' : 'iso-8859-7',
- \ 'greek8' : 'iso-8859-7',
- \ 'csisolatingreek' : 'iso-8859-7',
- \ 'iso_8859-8:1988' : 'iso-8859-8',
- \ 'iso-ir-138' : 'iso-8859-8',
- \ 'iso_8859-8' : 'iso-8859-8',
- \ 'iso-8859-8' : 'iso-8859-8',
- \ 'hebrew' : 'iso-8859-8',
- \ 'csisolatinhebrew' : 'iso-8859-8',
- \ 'iso_8859-9:1989' : 'iso-8859-9',
- \ 'iso-ir-148' : 'iso-8859-9',
- \ 'iso_8859-9' : 'iso-8859-9',
- \ 'iso-8859-9' : 'iso-8859-9',
- \ 'latin5' : 'iso-8859-9',
- \ 'l5' : 'iso-8859-9',
- \ 'csisolatin5' : 'iso-8859-9',
- \ 'iso-8859-10' : 'iso-8859-10',
- \ 'iso-ir-157' : 'iso-8859-10',
- \ 'l6' : 'iso-8859-10',
- \ 'iso_8859-10:1992' : 'iso-8859-10',
- \ 'csisolatin6' : 'iso-8859-10',
- \ 'latin6' : 'iso-8859-10',
- \ 'iso-8859-13' : 'iso-8859-13',
- \ 'iso-8859-14' : 'iso-8859-14',
- \ 'iso-ir-199' : 'iso-8859-14',
- \ 'iso_8859-14:1998' : 'iso-8859-14',
- \ 'iso_8859-14' : 'iso-8859-14',
- \ 'latin8' : 'iso-8859-14',
- \ 'iso-celtic' : 'iso-8859-14',
- \ 'l8' : 'iso-8859-14',
- \ 'iso-8859-15' : 'iso-8859-15',
- \ 'iso_8859-15' : 'iso-8859-15',
- \ 'latin-9' : 'iso-8859-15',
- \ 'koi8-r' : 'koi8-r',
- \ 'cskoi8r' : 'koi8-r',
- \ 'koi8-u' : 'koi8-u',
- \ 'macintosh' : 'macroman',
- \ 'mac' : 'macroman',
- \ 'csmacintosh' : 'macroman',
- \ 'ibm437' : 'cp437',
- \ 'cp437' : 'cp437',
- \ '437' : 'cp437',
- \ 'cspc8codepage437' : 'cp437',
- \ 'ibm775' : 'cp775',
- \ 'cp775' : 'cp775',
- \ 'cspc775baltic' : 'cp775',
- \ 'ibm850' : 'cp850',
- \ 'cp850' : 'cp850',
- \ '850' : 'cp850',
- \ 'cspc850multilingual' : 'cp850',
- \ 'ibm852' : 'cp852',
- \ 'cp852' : 'cp852',
- \ '852' : 'cp852',
- \ 'cspcp852' : 'cp852',
- \ 'ibm855' : 'cp855',
- \ 'cp855' : 'cp855',
- \ '855' : 'cp855',
- \ 'csibm855' : 'cp855',
- \ 'ibm857' : 'cp857',
- \ 'cp857' : 'cp857',
- \ '857' : 'cp857',
- \ 'csibm857' : 'cp857',
- \ 'ibm860' : 'cp860',
- \ 'cp860' : 'cp860',
- \ '860' : 'cp860',
- \ 'csibm860' : 'cp860',
- \ 'ibm861' : 'cp861',
- \ 'cp861' : 'cp861',
- \ '861' : 'cp861',
- \ 'cp-is' : 'cp861',
- \ 'csibm861' : 'cp861',
- \ 'ibm862' : 'cp862',
- \ 'cp862' : 'cp862',
- \ '862' : 'cp862',
- \ 'cspc862latinhebrew' : 'cp862',
- \ 'ibm863' : 'cp863',
- \ 'cp863' : 'cp863',
- \ '863' : 'cp863',
- \ 'csibm863' : 'cp863',
- \ 'ibm865' : 'cp865',
- \ 'cp865' : 'cp865',
- \ '865' : 'cp865',
- \ 'csibm865' : 'cp865',
- \ 'ibm866' : 'cp866',
- \ 'cp866' : 'cp866',
- \ '866' : 'cp866',
- \ 'csibm866' : 'cp866',
- \ 'ibm869' : 'cp869',
- \ 'cp869' : 'cp869',
- \ '869' : 'cp869',
- \ 'cp-gr' : 'cp869',
- \ 'csibm869' : 'cp869',
- \ 'windows-1250' : 'cp1250',
- \ 'windows-1251' : 'cp1251',
- \ 'windows-1253' : 'cp1253',
- \ 'windows-1254' : 'cp1254',
- \ 'windows-1255' : 'cp1255',
- \ 'windows-1256' : 'cp1256',
- \ 'windows-1257' : 'cp1257',
- \ 'windows-1258' : 'cp1258',
- \ 'extended_unix_code_packed_format_for_japanese' : 'euc-jp',
- \ 'cseucpkdfmtjapanese' : 'euc-jp',
- \ 'euc-jp' : 'euc-jp',
- \ 'shift_jis' : 'sjis',
- \ 'ms_kanji' : 'sjis',
- \ 'sjis' : 'sjis',
- \ 'csshiftjis' : 'sjis',
- \ 'ibm-thai' : 'cp874',
- \ 'csibmthai' : 'cp874',
- \ 'ks_c_5601-1987' : 'cp949',
- \ 'iso-ir-149' : 'cp949',
- \ 'ks_c_5601-1989' : 'cp949',
- \ 'ksc_5601' : 'cp949',
- \ 'korean' : 'cp949',
- \ 'csksc56011987' : 'cp949',
- \ 'euc-kr' : 'euc-kr',
- \ 'cseuckr' : 'euc-kr',
- \ 'gbk' : 'cp936',
- \ 'cp936' : 'cp936',
- \ 'ms936' : 'cp936',
- \ 'windows-936' : 'cp936',
- \ 'gb_2312-80' : 'euc-cn',
- \ 'iso-ir-58' : 'euc-cn',
- \ 'chinese' : 'euc-cn',
- \ 'csiso58gb231280' : 'euc-cn',
- \ 'big5' : 'big5',
- \ 'csbig5' : 'big5',
- \ 'utf-8' : 'utf-8',
- \ 'iso-10646-ucs-2' : 'ucs-2',
- \ 'csunicode' : 'ucs-2',
- \ 'utf-16' : 'utf-16',
- \ 'utf-16be' : 'utf-16',
- \ 'utf-16le' : 'utf-16le',
- \ 'utf-32' : 'ucs-4',
- \ 'utf-32be' : 'ucs-4',
- \ 'utf-32le' : 'ucs-4le',
- \ 'iso-10646-ucs-4' : 'ucs-4',
- \ 'csucs4' : 'ucs-4'
- \ }
-lockvar g:tohtml#charset_to_encoding
-"}}}
-
-func! tohtml#Convert2HTML(line1, line2) "{{{
- let s:settings = tohtml#GetUserSettings()
-
- if !&diff || s:settings.diff_one_file "{{{
- if a:line2 >= a:line1
- let g:html_start_line = a:line1
- let g:html_end_line = a:line2
- else
- let g:html_start_line = a:line2
- let g:html_end_line = a:line1
- endif
- runtime syntax/2html.vim "}}}
- else "{{{
- let win_list = []
- let buf_list = []
- windo if &diff | call add(win_list, winbufnr(0)) | endif
- let s:settings.whole_filler = 1
- let g:html_diff_win_num = 0
- for window in win_list
- " switch to the next buffer to convert
- exe ":" .. bufwinnr(window) .. "wincmd w"
-
- " figure out whether current charset and encoding will work, if not
- " default to UTF-8
- if !exists('g:html_use_encoding') &&
- \ (((&l:fileencoding=='' || (&l:buftype!='' && &l:buftype!=?'help'))
- \ && &encoding!=?s:settings.vim_encoding)
- \ || &l:fileencoding!='' && &l:fileencoding!=?s:settings.vim_encoding)
- echohl WarningMsg
- echomsg "TOhtml: mismatched file encodings in Diff buffers, using UTF-8"
- echohl None
- let s:settings.vim_encoding = 'utf-8'
- let s:settings.encoding = 'UTF-8'
- endif
-
- " set up for diff-mode conversion
- let g:html_start_line = 1
- let g:html_end_line = line('$')
- let g:html_diff_win_num += 1
-
- " convert this file
- runtime syntax/2html.vim
-
- " remember the HTML buffer for later combination
- call add(buf_list, bufnr('%'))
- endfor
- unlet g:html_diff_win_num
- call tohtml#Diff2HTML(win_list, buf_list)
- endif "}}}
-
- unlet g:html_start_line
- unlet g:html_end_line
- unlet s:settings
-endfunc "}}}
-
-func! tohtml#Diff2HTML(win_list, buf_list) "{{{
- let xml_line = ""
- let tag_close = '>'
-
- let s:old_paste = &paste
- set paste
- let s:old_magic = &magic
- set magic
-
- let html = []
- if !s:settings.no_doc
- if s:settings.use_xhtml
- if s:settings.encoding != ""
- let xml_line = "<?xml version=\"1.0\" encoding=\"" .. s:settings.encoding .. "\"?>"
- else
- let xml_line = "<?xml version=\"1.0\"?>"
- endif
- let tag_close = ' />'
- endif
-
- let style = [s:settings.use_xhtml ? "" : '-->']
- let body_line = ''
-
- let s:html5 = 0
- if s:settings.use_xhtml
- call add(html, xml_line)
- endif
- if s:settings.use_xhtml
- call add(html, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">")
- call add(html, '<html xmlns="http://www.w3.org/1999/xhtml">')
- elseif s:settings.use_css && !s:settings.no_pre
- call add(html, "<!DOCTYPE html>")
- call add(html, '<html>')
- let s:html5 = 1
- else
- call add(html, '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"')
- call add(html, ' "http://www.w3.org/TR/html4/loose.dtd">')
- call add(html, '<html>')
- endif
- call add(html, '<head>')
-
- " include encoding as close to the top as possible, but only if not already
- " contained in XML information
- if s:settings.encoding != "" && !s:settings.use_xhtml
- if s:html5
- call add(html, '<meta charset="' .. s:settings.encoding .. '"' .. tag_close)
- else
- call add(html, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" .. s:settings.encoding .. '"' .. tag_close)
- endif
- endif
-
- call add(html, '<title>diff</title>')
- call add(html, '<meta name="Generator" content="Vim/'..v:version/100..'.'..v:version%100..'"'..tag_close)
- call add(html, '<meta name="plugin-version" content="'..g:loaded_2html_plugin..'"'..tag_close)
- call add(html, '<meta name="settings" content="'.
- \ join(filter(keys(s:settings),'s:settings[v:val]'),',').
- \ ',prevent_copy='..s:settings.prevent_copy.
- \ ',use_input_for_pc='..s:settings.use_input_for_pc.
- \ '"'..tag_close)
- call add(html, '<meta name="colorscheme" content="'.
- \ (exists('g:colors_name')
- \ ? g:colors_name
- \ : 'none').. '"'..tag_close)
-
- call add(html, '</head>')
- let body_line_num = len(html)
- call add(html, '<body'..(s:settings.line_ids ? ' onload="JumpToLine();"' : '')..'>')
- endif
- call add(html, "<table "..(s:settings.use_css? "" : "border='1' width='100%' ").."id='vimCodeElement"..s:settings.id_suffix.."'>")
-
- call add(html, '<tr>')
- for buf in a:win_list
- call add(html, '<th>'..bufname(buf)..'</th>')
- endfor
- call add(html, '</tr><tr>')
-
- let diff_style_start = 0
- let insert_index = 0
-
- for buf in a:buf_list
- let temp = []
- exe bufwinnr(buf) .. 'wincmd w'
-
- " If text is folded because of user foldmethod settings, etc. we don't want
- " to act on everything in a fold by mistake.
- setlocal nofoldenable
-
- " When not using CSS or when using xhtml, the <body> line can be important.
- " Assume it will be the same for all buffers and grab it from the first
- " buffer. Similarly, need to grab the body end line as well.
- if !s:settings.no_doc
- if body_line == ''
- 1
- call search('<body')
- let body_line = getline('.')
- $
- call search('</body>', 'b')
- let s:body_end_line = getline('.')
- endif
-
- " Grab the style information. Some of this will be duplicated so only insert
- " it if it's not already there. {{{
- 1
- let style_start = search('^<style\( type="text/css"\)\?>')
- 1
- let style_end = search('^</style>')
- if style_start > 0 && style_end > 0
- let buf_styles = getline(style_start + 1, style_end - 1)
- for a_style in buf_styles
- if index(style, a_style) == -1
- if diff_style_start == 0
- if a_style =~ '\<Diff\(Change\|Text\|Add\|Delete\)'
- let diff_style_start = len(style)-1
- endif
- endif
- call insert(style, a_style, insert_index)
- let insert_index += 1
- endif
- endfor
- endif " }}}
-
- " everything new will get added before the diff styles so diff highlight
- " properly overrides normal highlight
- if diff_style_start != 0
- let insert_index = diff_style_start
- endif
-
- " Delete those parts that are not needed so we can include the rest into the
- " resulting table.
- 1,/^<body.*\%(\n<!--.*-->\_s\+.*id='oneCharWidth'.*\_s\+.*id='oneInputWidth'.*\_s\+.*id='oneEmWidth'\)\?\zs/d_
- $
- ?</body>?,$d_
- elseif !s:settings.no_modeline
- " remove modeline from source files if it is included and we haven't deleted
- " due to removing html footer already
- $d
- endif
- let temp = getline(1,'$')
- " clean out id on the main content container because we already set it on
- " the table
- let temp[0] = substitute(temp[0], " id='vimCodeElement[^']*'", "", "")
- " undo deletion of start and end part
- " so we can later save the file as valid html
- " TODO: restore using grabbed lines if undolevel is 1?
- if !s:settings.no_doc
- normal! 2u
- elseif !s:settings.no_modeline
- normal! u
- endif
- if s:settings.use_css
- call add(html, '<td><div>')
- elseif s:settings.use_xhtml
- call add(html, '<td nowrap="nowrap" valign="top"><div>')
- else
- call add(html, '<td nowrap valign="top"><div>')
- endif
- let html += temp
- call add(html, '</div></td>')
-
- " Close this buffer
- " TODO: the comment above says we're going to allow saving the file
- " later...but here we discard it?
- quit!
- endfor
-
- if !s:settings.no_doc
- let html[body_line_num] = body_line
- endif
-
- call add(html, '</tr>')
- call add(html, '</table>')
- if !s:settings.no_doc
- call add(html, s:body_end_line)
- call add(html, '</html>')
- endif
-
- " The generated HTML is admittedly ugly and takes a LONG time to fold.
- " Make sure the user doesn't do syntax folding when loading a generated file,
- " using a modeline.
- if !s:settings.no_modeline
- call add(html, '<!-- vim: set foldmethod=manual : -->')
- endif
-
- let i = 1
- let name = "Diff" .. (s:settings.use_xhtml ? ".xhtml" : ".html")
- " Find an unused file name if current file name is already in use
- while filereadable(name)
- let name = substitute(name, '\d*\.x\?html$', '', '') .. i .. '.' .. fnamemodify(copy(name), ":t:e")
- let i += 1
- endwhile
-
- let s:ei_sav = &eventignore
- set eventignore+=FileType
- exe "topleft new " .. name
- let &eventignore=s:ei_sav
- unlet s:ei_sav
-
- setlocal modifiable
-
- " just in case some user autocmd creates content in the new buffer, make sure
- " it is empty before proceeding
- %d
-
- " set the fileencoding to match the charset we'll be using
- let &l:fileencoding=s:settings.vim_encoding
-
- " According to http://www.w3.org/TR/html4/charset.html#doc-char-set, the byte
- " order mark is highly recommend on the web when using multibyte encodings. But,
- " it is not a good idea to include it on UTF-8 files. Otherwise, let Vim
- " determine when it is actually inserted.
- if s:settings.vim_encoding == 'utf-8'
- setlocal nobomb
- else
- setlocal bomb
- endif
-
- call append(0, html)
-
- if !s:settings.no_doc
- if len(style) > 0
- 1
- let style_start = search('^</head>')-1
-
- " add required javascript in reverse order so we can just call append again
- " and again without adjusting {{{
-
- let s:uses_script = s:settings.dynamic_folds || s:settings.line_ids
-
- " insert script closing tag if needed
- if s:uses_script
- call append(style_start, [
- \ '',
- \ s:settings.use_xhtml ? '//]]>' : '-->',
- \ "</script>"
- \ ])
- endif
-
- " insert javascript to get IDs from line numbers, and to open a fold before
- " jumping to any lines contained therein
- if s:settings.line_ids
- call append(style_start, [
- \ " /* Always jump to new location even if the line was hidden inside a fold, or",
- \ " * we corrected the raw number to a line ID.",
- \ " */",
- \ " if (lineElem) {",
- \ " lineElem.scrollIntoView(true);",
- \ " }",
- \ " return true;",
- \ "}",
- \ "if ('onhashchange' in window) {",
- \ " window.onhashchange = JumpToLine;",
- \ "}"
- \ ])
-
- if s:settings.dynamic_folds
- call append(style_start, [
- \ "",
- \ " /* navigate upwards in the DOM tree to open all folds containing the line */",
- \ " var node = lineElem;",
- \ " while (node && node.id != 'vimCodeElement"..s:settings.id_suffix.."')",
- \ " {",
- \ " if (node.className == 'closed-fold')",
- \ " {",
- \ " /* toggle open the fold ID (remove window ID) */",
- \ " toggleFold(node.id.substr(4));",
- \ " }",
- \ " node = node.parentNode;",
- \ " }",
- \ ])
- endif
- endif
-
- if s:settings.line_ids
- call append(style_start, [
- \ "",
- \ "/* function to open any folds containing a jumped-to line before jumping to it */",
- \ "function JumpToLine()",
- \ "{",
- \ " var lineNum;",
- \ " lineNum = window.location.hash;",
- \ " lineNum = lineNum.substr(1); /* strip off '#' */",
- \ "",
- \ " if (lineNum.indexOf('L') == -1) {",
- \ " lineNum = 'L'+lineNum;",
- \ " }",
- \ " if (lineNum.indexOf('W') == -1) {",
- \ " lineNum = 'W1'+lineNum;",
- \ " }",
- \ " var lineElem = document.getElementById(lineNum);"
- \ ])
- endif
-
- " Insert javascript to toggle matching folds open and closed in all windows,
- " if dynamic folding is active.
- if s:settings.dynamic_folds
- call append(style_start, [
- \ " function toggleFold(objID)",
- \ " {",
- \ " for (win_num = 1; win_num <= "..len(a:buf_list).."; win_num++)",
- \ " {",
- \ " var fold;",
- \ ' fold = document.getElementById("win"+win_num+objID);',
- \ " if(fold.className == 'closed-fold')",
- \ " {",
- \ " fold.className = 'open-fold';",
- \ " }",
- \ " else if (fold.className == 'open-fold')",
- \ " {",
- \ " fold.className = 'closed-fold';",
- \ " }",
- \ " }",
- \ " }",
- \ ])
- endif
-
- if s:uses_script
- " insert script tag if needed
- call append(style_start, [
- \ "<script" .. (s:html5 ? "" : " type='text/javascript'") .. ">",
- \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
- endif
-
- " Insert styles from all the generated html documents and additional styles
- " for the table-based layout of the side-by-side diff. The diff should take
- " up the full browser window (but not more), and be static in size,
- " horizontally scrollable when the lines are too long. Otherwise, the diff
- " is pretty useless for really long lines. {{{
- if s:settings.use_css
- call append(style_start,
- \ ['<style' .. (s:html5 ? '' : 'type="text/css"') .. '>']+
- \ style+
- \ [ s:settings.use_xhtml ? '' : '<!--',
- \ 'table { table-layout: fixed; }',
- \ 'html, body, table, tbody { width: 100%; margin: 0; padding: 0; }',
- \ 'table, td, th { border: 1px solid; }',
- \ 'td { vertical-align: top; }',
- \ 'th, td { width: '..printf("%.1f",100.0/len(a:win_list))..'%; }',
- \ 'td div { overflow: auto; }',
- \ s:settings.use_xhtml ? '' : '-->',
- \ '</style>'
- \])
- endif "}}}
- endif
- endif
-
- let &paste = s:old_paste
- let &magic = s:old_magic
-endfunc "}}}
-
-" Gets a single user option and sets it in the passed-in Dict, or gives it the
-" default value if the option doesn't actually exist.
-func! tohtml#GetOption(settings, option, default) "{{{
- if exists('g:html_'..a:option)
- let a:settings[a:option] = g:html_{a:option}
- else
- let a:settings[a:option] = a:default
- endif
-endfunc "}}}
-
-" returns a Dict containing the values of all user options for 2html, including
-" default values for those not given an explicit value by the user. Discards the
-" html_ prefix of the option for nicer looking code.
-func! tohtml#GetUserSettings() "{{{
- if exists('s:settings')
- " just restore the known options if we've already retrieved them
- return s:settings
- else
- " otherwise figure out which options are set
- let user_settings = {}
-
- " Define the correct option if the old option name exists and we haven't
- " already defined the correct one.
- if exists('g:use_xhtml') && !exists("g:html_use_xhtml")
- echohl WarningMsg
- echomsg "Warning: g:use_xhtml is deprecated, use g:html_use_xhtml"
- echohl None
- let g:html_use_xhtml = g:use_xhtml
- endif
-
- " get current option settings with appropriate defaults {{{
- call tohtml#GetOption(user_settings, 'no_progress', !has("statusline") )
- call tohtml#GetOption(user_settings, 'diff_one_file', 0 )
- call tohtml#GetOption(user_settings, 'number_lines', &number )
- call tohtml#GetOption(user_settings, 'pre_wrap', &wrap )
- call tohtml#GetOption(user_settings, 'use_css', 1 )
- call tohtml#GetOption(user_settings, 'ignore_conceal', 0 )
- call tohtml#GetOption(user_settings, 'ignore_folding', 0 )
- call tohtml#GetOption(user_settings, 'dynamic_folds', 0 )
- call tohtml#GetOption(user_settings, 'no_foldcolumn', user_settings.ignore_folding)
- call tohtml#GetOption(user_settings, 'hover_unfold', 0 )
- call tohtml#GetOption(user_settings, 'no_pre', 0 )
- call tohtml#GetOption(user_settings, 'no_doc', 0 )
- call tohtml#GetOption(user_settings, 'no_links', 0 )
- call tohtml#GetOption(user_settings, 'no_modeline', 0 )
- call tohtml#GetOption(user_settings, 'no_invalid', 0 )
- call tohtml#GetOption(user_settings, 'whole_filler', 0 )
- call tohtml#GetOption(user_settings, 'use_xhtml', 0 )
- call tohtml#GetOption(user_settings, 'line_ids', user_settings.number_lines )
- call tohtml#GetOption(user_settings, 'use_input_for_pc', 'none')
- " }}}
-
- " override those settings that need it {{{
-
- " hover opening implies dynamic folding
- if user_settings.hover_unfold
- let user_settings.dynamic_folds = 1
- endif
-
- " ignore folding overrides dynamic folding
- if user_settings.ignore_folding && user_settings.dynamic_folds
- let user_settings.dynamic_folds = 0
- let user_settings.hover_unfold = 0
- endif
-
- " dynamic folding with no foldcolumn implies hover opens
- if user_settings.dynamic_folds && user_settings.no_foldcolumn
- let user_settings.hover_unfold = 1
- endif
-
- " dynamic folding implies css
- if user_settings.dynamic_folds
- let user_settings.use_css = 1
- else
- let user_settings.no_foldcolumn = 1 " won't do anything but for consistency and for the test suite
- endif
-
- " if we're not using CSS we cannot use a pre section because <font> tags
- " aren't allowed inside a <pre> block
- if !user_settings.use_css
- let user_settings.no_pre = 1
- endif
-
- " pre_wrap doesn't do anything if not using pre or not using CSS
- if user_settings.no_pre || !user_settings.use_css
- let user_settings.pre_wrap = 0
- endif
- "}}}
-
- " set up expand_tabs option after all the overrides so we know the
- " appropriate defaults {{{
- if user_settings.no_pre == 0
- call tohtml#GetOption(user_settings,
- \ 'expand_tabs',
- \ &expandtab || &ts != 8 || (exists("+vts") && &vts != '') || user_settings.number_lines ||
- \ (user_settings.dynamic_folds && !user_settings.no_foldcolumn))
- else
- let user_settings.expand_tabs = 1
- endif
- " }}}
-
- " textual options
- if exists("g:html_use_encoding") "{{{
- " user specified the desired MIME charset, figure out proper
- " 'fileencoding' from it or warn the user if we cannot
- let user_settings.encoding = g:html_use_encoding
- let user_settings.vim_encoding = tohtml#EncodingFromCharset(g:html_use_encoding)
- if user_settings.vim_encoding == ''
- echohl WarningMsg
- echomsg "TOhtml: file encoding for"
- \ g:html_use_encoding
- \ "unknown, please set 'fileencoding'"
- echohl None
- endif
- else
- " Figure out proper MIME charset from 'fileencoding' if possible
- if &l:fileencoding != ''
- " If the buffer is not a "normal" type, the 'fileencoding' value may not
- " be trusted; since the buffer should not be written the fileencoding is
- " not intended to be used.
- if &l:buftype=='' || &l:buftype==?'help'
- let user_settings.vim_encoding = &l:fileencoding
- call tohtml#CharsetFromEncoding(user_settings)
- else
- let user_settings.encoding = '' " trigger detection using &encoding
- endif
- endif
-
- " else from 'encoding' if possible
- if &l:fileencoding == '' || user_settings.encoding == ''
- let user_settings.vim_encoding = &encoding
- call tohtml#CharsetFromEncoding(user_settings)
- endif
-
- " else default to UTF-8 and warn user
- if user_settings.encoding == ''
- let user_settings.vim_encoding = 'utf-8'
- let user_settings.encoding = 'UTF-8'
- echohl WarningMsg
- echomsg "TOhtml: couldn't determine MIME charset, using UTF-8"
- echohl None
- endif
- endif "}}}
-
- " Default to making nothing uncopyable, because we default to
- " not-standards way of doing things, and also because Microsoft Word and
- " others paste the <input> elements anyway.
- "
- " html_prevent_copy only has an effect when using CSS.
- "
- " All options:
- " f - fold column
- " n - line numbers (also within fold text)
- " t - fold text
- " d - diff filler
- " c - concealed text (reserved future)
- " l - listchars (reserved possible future)
- " s - signs (reserved possible future)
- "
- " Normal text is always selectable.
- let user_settings.prevent_copy = ""
- if user_settings.use_css
- if exists("g:html_prevent_copy")
- if user_settings.dynamic_folds && !user_settings.no_foldcolumn && g:html_prevent_copy =~# 'f'
- let user_settings.prevent_copy ..= 'f'
- endif
- if user_settings.number_lines && g:html_prevent_copy =~# 'n'
- let user_settings.prevent_copy ..= 'n'
- endif
- if &diff && g:html_prevent_copy =~# 'd'
- let user_settings.prevent_copy ..= 'd'
- endif
- if !user_settings.ignore_folding && g:html_prevent_copy =~# 't'
- let user_settings.prevent_copy ..= 't'
- endif
- else
- let user_settings.prevent_copy = ""
- endif
- endif
- if empty(user_settings.prevent_copy)
- let user_settings.no_invalid = 0
- endif
-
- " enforce valid values for use_input_for_pc
- if user_settings.use_input_for_pc !~# 'fallback\|none\|all'
- let user_settings.use_input_for_pc = 'none'
- echohl WarningMsg
- echomsg '2html: "' .. g:html_use_input_for_pc .. '" is not valid for g:html_use_input_for_pc'
- echomsg '2html: defaulting to "' .. user_settings.use_input_for_pc .. '"'
- echohl None
- sleep 3
- endif
-
- if exists('g:html_id_expr')
- let user_settings.id_suffix = eval(g:html_id_expr)
- if user_settings.id_suffix !~ '^[-_:.A-Za-z0-9]*$'
- echohl WarningMsg
- echomsg '2html: g:html_id_expr evaluated to invalid string for HTML id attributes'
- echomsg '2html: Omitting user-specified suffix'
- echohl None
- sleep 3
- let user_settings.id_suffix=""
- endif
- else
- let user_settings.id_suffix=""
- endif
-
- " TODO: font
-
- return user_settings
- endif
-endfunc "}}}
-
-" get the proper HTML charset name from a Vim encoding option.
-function! tohtml#CharsetFromEncoding(settings) "{{{
- let l:vim_encoding = a:settings.vim_encoding
- if exists('g:html_charset_override') && has_key(g:html_charset_override, l:vim_encoding)
- let a:settings.encoding = g:html_charset_override[l:vim_encoding]
- else
- if l:vim_encoding =~ '^8bit\|^2byte'
- " 8bit- and 2byte- prefixes are to indicate encodings available on the
- " system that Vim will convert with iconv(), look up just the encoding name,
- " not Vim's prefix.
- let l:vim_encoding = substitute(l:vim_encoding, '^8bit-\|^2byte-', '', '')
- endif
- if has_key(g:tohtml#encoding_to_charset, l:vim_encoding)
- let a:settings.encoding = g:tohtml#encoding_to_charset[l:vim_encoding]
- else
- let a:settings.encoding = ""
- endif
- endif
- if a:settings.encoding != ""
- let l:vim_encoding = tohtml#EncodingFromCharset(a:settings.encoding)
- if l:vim_encoding != ""
- " if the Vim encoding to HTML encoding conversion is set up (by default or
- " by the user) to convert to a different encoding, we need to also change
- " the Vim encoding of the new buffer
- let a:settings.vim_encoding = l:vim_encoding
- endif
- endif
-endfun "}}}
-
-" Get the proper Vim encoding option setting from an HTML charset name.
-function! tohtml#EncodingFromCharset(encoding) "{{{
- if exists('g:html_encoding_override') && has_key(g:html_encoding_override, a:encoding)
- return g:html_encoding_override[a:encoding]
- elseif has_key(g:tohtml#charset_to_encoding, tolower(a:encoding))
- return g:tohtml#charset_to_encoding[tolower(a:encoding)]
- else
- return ""
- endif
-endfun "}}}
-
-let &cpo = s:cpo_sav
-unlet s:cpo_sav
-
-" Make sure any patches will probably use consistent indent
-" vim: ts=8 sw=2 sts=2 noet fdm=marker
diff --git a/runtime/autoload/userreg.vim b/runtime/autoload/userreg.vim
new file mode 100644
index 0000000000..fd026a12e6
--- /dev/null
+++ b/runtime/autoload/userreg.vim
@@ -0,0 +1,7 @@
+" This is used for the default userreg function.
+
+lua vim.userreg = require('vim.userreg')
+
+function! userreg#func(action, register, content) abort
+ return v:lua.vim.userreg.fn(a:action, a:register, a:content)
+endfunction
diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim
index e61293c357..c0034f8a7a 100644
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -2,7 +2,8 @@
" AUTOLOAD PORTION
" Date: Mar 12, 2023
" Version: 33
-" Maintainer: Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Maintainer: This runtime file is looking for a new maintainer.
+" Former Maintainer: Charles E Campbell
" License: Vim License (see vim's :help license)
" Copyright: Copyright (C) 2005-2019 Charles E. Campbell {{{1
" Permission is hereby granted to use and distribute this code,