From 5ef1c6a4838a9629b793f3ae676f72a764171b00 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 10 Nov 2019 22:09:11 +0100 Subject: Update runtime files --- runtime/autoload/netrw.vim | 114 ++++++----- runtime/autoload/netrw_gitignore.vim | 58 +----- runtime/doc/diff.txt | 5 +- runtime/doc/eval.txt | 6 +- runtime/doc/gui.txt | 7 +- runtime/doc/map.txt | 14 +- runtime/doc/motion.txt | 2 +- runtime/doc/options.txt | 8 +- runtime/doc/pi_netrw.txt | 16 +- runtime/doc/quickref.txt | 3 +- runtime/doc/tags | 5 + runtime/doc/tagsrch.txt | 4 +- runtime/doc/terminal.txt | 2 +- runtime/doc/textprop.txt | 4 +- runtime/doc/todo.txt | 54 +++--- runtime/doc/visual.txt | 3 +- runtime/lang/menu_tr.iso_8859-9.vim | 3 + runtime/lang/menu_tr.latin1.vim | 3 - runtime/lang/menu_tr_tr.iso_8859-9.vim | 331 ++++++++++++++++++++++++++++++++ runtime/lang/menu_tr_tr.latin1.vim | 332 --------------------------------- runtime/lang/menu_tr_tr.utf-8.vim | 6 +- runtime/menu.vim | 12 +- runtime/optwin.vim | 6 +- runtime/plugin/netrwPlugin.vim | 6 +- runtime/spell/main.aap | 2 +- runtime/spell/tr/main.aap | 68 +++++++ runtime/syntax/erlang.vim | 11 +- runtime/syntax/netrw.vim | 4 +- runtime/syntax/php.vim | 110 +++++------ runtime/syntax/vim.vim | 3 +- runtime/tutor/tutor.tr.iso9 | 167 +++++++++-------- runtime/tutor/tutor.tr.utf-8 | 167 +++++++++-------- 32 files changed, 821 insertions(+), 715 deletions(-) create mode 100644 runtime/lang/menu_tr.iso_8859-9.vim delete mode 100644 runtime/lang/menu_tr.latin1.vim create mode 100644 runtime/lang/menu_tr_tr.iso_8859-9.vim delete mode 100644 runtime/lang/menu_tr_tr.latin1.vim create mode 100644 runtime/spell/tr/main.aap (limited to 'runtime') diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim index a5b47e06d5..ac1d268476 100644 --- a/runtime/autoload/netrw.vim +++ b/runtime/autoload/netrw.vim @@ -1,7 +1,7 @@ " netrw.vim: Handles file transfer and remote directory listing across " AUTOLOAD SECTION -" Date: Jul 16, 2019 -" Version: 165 +" Date: Nov 06, 2019 +" Version: 166 " Maintainer: Charles E Campbell " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim " Copyright: Copyright (C) 2016 Charles E. Campbell {{{1 @@ -39,7 +39,7 @@ if exists("s:needspatches") endfor endif -let g:loaded_netrw = "v165" +let g:loaded_netrw = "v166" if !exists("s:NOTE") let s:NOTE = 0 let s:WARNING = 1 @@ -232,12 +232,12 @@ if !exists("g:netrw_ftp_options") let g:netrw_ftp_options= "-i -n" endif if !exists("g:netrw_http_cmd") - if executable("curl") - let g:netrw_http_cmd = "curl" - call s:NetrwInit("g:netrw_http_xcmd","-L -o") - elseif executable("wget") + if executable("wget") let g:netrw_http_cmd = "wget" call s:NetrwInit("g:netrw_http_xcmd","-q -O") + elseif executable("curl") + let g:netrw_http_cmd = "curl" + call s:NetrwInit("g:netrw_http_xcmd","-L -o") elseif executable("elinks") let g:netrw_http_cmd = "elinks" call s:NetrwInit("g:netrw_http_xcmd","-source >") @@ -689,6 +689,7 @@ fun! netrw#Explore(indx,dosplit,style,...) " save registers if has("clipboard") +" call Decho("(netrw#Explore) save @* and @+",'~'.expand("")) sil! let keepregstar = @* sil! let keepregplus = @+ endif @@ -916,6 +917,7 @@ fun! netrw#Explore(indx,dosplit,style,...) if !exists("w:netrw_explore_list") " sanity check NetrwKeepj call netrw#ErrorMsg(s:WARNING,"using Nexplore or improperly; see help for netrw-starstar",40) if has("clipboard") +" call Decho("(netrw#Explore) restore @* and @+",'~'.expand("")) sil! let @* = keepregstar sil! let @+ = keepregplus endif @@ -941,6 +943,7 @@ fun! netrw#Explore(indx,dosplit,style,...) if !exists("w:netrw_explore_list") " sanity check NetrwKeepj call netrw#ErrorMsg(s:WARNING,"using Pexplore or improperly; see help for netrw-starstar",41) if has("clipboard") +" call Decho("(netrw#Explore) restore @* and @+",'~'.expand("")) sil! let @* = keepregstar sil! let @+ = keepregplus endif @@ -996,6 +999,7 @@ fun! netrw#Explore(indx,dosplit,style,...) keepalt call netrw#ErrorMsg(s:WARNING,'no files matched pattern<'.pattern.'>',45) if &hls | let keepregslash= s:ExplorePatHls(pattern) | endif if has("clipboard") +" call Decho("(netrw#Explore) restore @* and @+",'~'.expand("")) sil! let @* = keepregstar sil! let @+ = keepregplus endif @@ -1032,6 +1036,7 @@ fun! netrw#Explore(indx,dosplit,style,...) if w:netrw_explore_listlen == 0 || (w:netrw_explore_listlen == 1 && w:netrw_explore_list[0] =~ '\*\*\/') keepalt NetrwKeepj call netrw#ErrorMsg(s:WARNING,"no files matched",42) if has("clipboard") +" call Decho("(netrw#Explore) restore @* and @+",'~'.expand("")) sil! let @* = keepregstar sil! let @+ = keepregplus endif @@ -1080,6 +1085,7 @@ fun! netrw#Explore(indx,dosplit,style,...) keepalt NetrwKeepj call netrw#ErrorMsg(s:WARNING,"your vim needs the +path_extra feature for Exploring with **!",44) endif if has("clipboard") +" call Decho("(netrw#Explore) restore @* and @+",'~'.expand("")) sil! let @* = keepregstar sil! let @+ = keepregplus endif @@ -1153,6 +1159,7 @@ fun! netrw#Explore(indx,dosplit,style,...) " Consequently, set s:netrw_events to 2. let s:netrw_events= 2 if has("clipboard") +" call Decho("(netrw#Explore) restore @* and @+",'~'.expand("")) sil! let @* = keepregstar sil! let @+ = keepregplus endif @@ -1642,7 +1649,6 @@ fun! s:NetrwOptionsSave(vt) let {a:vt}netrw_cpokeep = &l:cpo let {a:vt}netrw_diffkeep = &l:diff let {a:vt}netrw_fenkeep = &l:fen -" call Decho("saving current settings: got here#1",'~'.expand("")) if !exists("g:netrw_ffkeep") || g:netrw_ffkeep let {a:vt}netrw_ffkeep = &l:ff endif @@ -1661,7 +1667,6 @@ fun! s:NetrwOptionsSave(vt) let {a:vt}netrw_rokeep = &l:ro let {a:vt}netrw_selkeep = &l:sel let {a:vt}netrw_spellkeep = &l:spell -" call Decho("saving current settings: got here#2",'~'.expand("")) if !g:netrw_use_noswf let {a:vt}netrw_swfkeep = &l:swf endif @@ -1675,6 +1680,7 @@ fun! s:NetrwOptionsSave(vt) " call Decho("saving a few selected netrw-related variables",'~'.expand("")) if g:netrw_keepdir let {a:vt}netrw_dirkeep = getcwd() +" call Decho("saving to ".a:vt."netrw_dirkeep<".{a:vt}netrw_dirkeep.">",'~'.expand("")) endif if has("clipboard") sil! let {a:vt}netrw_starkeep = @* @@ -1745,6 +1751,7 @@ fun! s:NetrwOptionsRestore(vt) " call Dfunc("s:NetrwOptionsRestore(vt<".a:vt.">) win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> winnr($)=".winnr("$")) " call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("")) if !exists("{a:vt}netrw_optionsave") +" call Decho("case ".a:vt."netrw_optionsave : doesn't exist",'~'.expand("")) " call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("")) " call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("")) " call Dret("s:NetrwOptionsRestore : ".a:vt."netrw_optionsave doesn't exist") @@ -1829,6 +1836,7 @@ fun! s:NetrwOptionsRestore(vt) endif endif if has("clipboard") +" call Decho("has clipboard",'~'.expand("")) call s:NetrwRestoreSetting(a:vt."netrw_starkeep","@*") call s:NetrwRestoreSetting(a:vt."netrw_pluskeep","@+") endif @@ -1890,7 +1898,7 @@ endfun " Used by s:NetrwOptionsRestore() to restore each netrw-senstive setting " keepvars are set up by s:NetrwOptionsSave fun! s:NetrwRestoreSetting(keepvar,setting) -"" call Dfunc("s:NetrwRestoreSetting(a:keepvar<".a:keepvar."> a:setting<".a:setting.">)") +""" call Dfunc("s:NetrwRestoreSetting(a:keepvar<".a:keepvar."> a:setting<".a:setting.">)") " typically called from s:NetrwOptionsRestore " call s:NetrwRestoreSettings(keep-option-variable-name,'associated-option') @@ -1905,7 +1913,7 @@ fun! s:NetrwRestoreSetting(keepvar,setting) "" call Decho("fyi: a:setting<".a:setting."> setting<".setting.">") if setting != keepvarval -"" call Decho("restore setting<".a:setting."=".setting."> to keepvarval<".keepvarval.">") +"" call Decho("restore setting<".a:setting."> (currently=".setting.") to keepvarval<".keepvarval.">") if type(a:setting) == 0 exe "let ".a:setting."= ".keepvarval elseif type(a:setting) == 1 @@ -2863,7 +2871,7 @@ fun! s:NetrwGetFile(readcmd, tfile, method) " readcmd=='t': simply do nothing if a:readcmd == 't' " call Decho(" ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("")) -" call Dret("NetrwGetFile : skip read of <".a:tfile.">") +" call Dret("NetrwGetFile : skip read of tfile<".a:tfile.">") return endif @@ -5194,10 +5202,11 @@ fun! s:NetrwBrowseUpDir(islocal) endfun " --------------------------------------------------------------------- -" netrw#BrowseX: (implements "x") executes a special "viewer" script or program for the {{{2 +" netrw#BrowseX: (implements "x" and "gx") executes a special "viewer" script or program for the {{{2 " given filename; typically this means given their extension. " 0=local, 1=remote fun! netrw#BrowseX(fname,remote) + let use_ctrlo= 1 " call Dfunc("netrw#BrowseX(fname<".a:fname."> remote=".a:remote.")") " if its really just a local directory, then do a "gf" instead @@ -5302,10 +5311,9 @@ fun! netrw#BrowseX(fname,remote) endif " call Decho("set up redirection: redir{".redir."} srr{".&srr."}",'~'.expand("")) - " extract any viewing options. Assumes that they're set apart by quotes. -" call Decho("extract any viewing options",'~'.expand("")) + " extract any viewing options. Assumes that they're set apart by spaces. if exists("g:netrw_browsex_viewer") -" call Decho("g:netrw_browsex_viewer<".g:netrw_browsex_viewer.">",'~'.expand("")) +" call Decho("extract any viewing options from g:netrw_browsex_viewer<".g:netrw_browsex_viewer.">",'~'.expand("")) if g:netrw_browsex_viewer =~ '\s' let viewer = substitute(g:netrw_browsex_viewer,'\s.*$','','') let viewopt = substitute(g:netrw_browsex_viewer,'^\S\+\s*','','')." " @@ -5328,16 +5336,16 @@ fun! netrw#BrowseX(fname,remote) " execute the file handler " call Decho("execute the file handler (if any)",'~'.expand("")) if exists("g:netrw_browsex_viewer") && g:netrw_browsex_viewer == '-' -" call Decho("g:netrw_browsex_viewer<".g:netrw_browsex_viewer.">",'~'.expand("")) +" call Decho("(netrw#BrowseX) g:netrw_browsex_viewer<".g:netrw_browsex_viewer.">",'~'.expand("")) let ret= netrwFileHandlers#Invoke(exten,fname) elseif exists("g:netrw_browsex_viewer") && executable(viewer) -" call Decho("g:netrw_browsex_viewer<".g:netrw_browsex_viewer.">",'~'.expand("")) +" call Decho("(netrw#BrowseX) g:netrw_browsex_viewer<".g:netrw_browsex_viewer.">",'~'.expand("")) call s:NetrwExe("sil !".viewer." ".viewopt.s:ShellEscape(fname,1).redir) let ret= v:shell_error elseif has("win32") || has("win64") -" call Decho("win".(has("win32")? "32" : "64")",'~'.expand("")) +" call Decho("(netrw#BrowseX) win".(has("win32")? "32" : "64"),'~'.expand("")) if executable("start") call s:NetrwExe('sil! !start rundll32 url.dll,FileProtocolHandler '.s:ShellEscape(fname,1)) elseif executable("rundll32") @@ -5345,56 +5353,68 @@ fun! netrw#BrowseX(fname,remote) else call netrw#ErrorMsg(s:WARNING,"rundll32 not on path",74) endif - " call inputsave()|call input("Press to continue")|call inputrestore() let ret= v:shell_error elseif has("win32unix") let winfname= 'c:\cygwin'.substitute(fname,'/','\\','g') -" call Decho("cygwin: winfname<".s:ShellEscape(winfname,1).">",'~'.expand("")) +" call Decho("(netrw#BrowseX) cygwin: winfname<".s:ShellEscape(winfname,1).">",'~'.expand("")) if executable("start") +" call Decho("(netrw#BrowseX) win32unix+start",'~'.expand("")) call s:NetrwExe('sil !start rundll32 url.dll,FileProtocolHandler '.s:ShellEscape(winfname,1)) elseif executable("rundll32") +" call Decho("(netrw#BrowseX) win32unix+rundll32",'~'.expand("")) call s:NetrwExe('sil !rundll32 url.dll,FileProtocolHandler '.s:ShellEscape(winfname,1)) elseif executable("cygstart") +" call Decho("(netrw#BrowseX) win32unix+cygstart",'~'.expand("")) call s:NetrwExe('sil !cygstart '.s:ShellEscape(fname,1)) else call netrw#ErrorMsg(s:WARNING,"rundll32 not on path",74) endif - " call inputsave()|call input("Press to continue")|call inputrestore() let ret= v:shell_error elseif has("unix") && executable("kfmclient") && s:CheckIfKde() -" call Decho("unix and kfmclient",'~'.expand("")) +" call Decho("(netrw#BrowseX) unix and kfmclient",'~'.expand("")) call s:NetrwExe("sil !kfmclient exec ".s:ShellEscape(fname,1)." ".redir) let ret= v:shell_error elseif has("unix") && executable("exo-open") && executable("xdg-open") && executable("setsid") -" call Decho("unix, exo-open, xdg-open",'~'.expand("")) +" call Decho("(netrw#BrowseX) unix, exo-open, xdg-open",'~'.expand("")) call s:NetrwExe("sil !setsid xdg-open ".s:ShellEscape(fname,1).redir) let ret= v:shell_error elseif has("unix") && $DESKTOP_SESSION == "mate" && executable("atril") -" call Decho("unix and atril",'~'.expand("")) - call s:NetrwExe("sil !atril ".s:ShellEscape(fname,1).redir) +" call Decho("(netrw#BrowseX) unix and atril",'~'.expand("")) + if a:fname =~ '^https\=://' + " atril does not appear to understand how to handle html -- so use gvim to edit the document + let use_ctrlo= 0 +" call Decho("(COMBAK) fname<".fname.">") +" call Decho("(COMBAK) a:fname<".a:fname.">") + call s:NetrwExe("sil! !gvim ".fname.' -c "keepj keepalt file '.fnameescape(a:fname).'"') + + else + call s:NetrwExe("sil !atril ".s:ShellEscape(fname,1).redir) + endif let ret= v:shell_error elseif has("unix") && executable("xdg-open") -" call Decho("unix and xdg-open",'~'.expand("")) +" call Decho("(netrw#BrowseX) unix and xdg-open",'~'.expand("")) call s:NetrwExe("sil !xdg-open ".s:ShellEscape(fname,1).redir) let ret= v:shell_error elseif has("macunix") && executable("open") -" call Decho("macunix and open",'~'.expand("")) +" call Decho("(netrw#BrowseX) macunix and open",'~'.expand("")) call s:NetrwExe("sil !open ".s:ShellEscape(fname,1)." ".redir) let ret= v:shell_error else " netrwFileHandlers#Invoke() always returns 0 +" call Decho("(netrw#BrowseX) use netrwFileHandlers",'~'.expand("")) let ret= netrwFileHandlers#Invoke(exten,fname) endif " if unsuccessful, attempt netrwFileHandlers#Invoke() if ret +" call Decho("(netrw#BrowseX) ret=".ret," indicates unsuccessful thus far",'~'.expand("")) let ret= netrwFileHandlers#Invoke(exten,fname) endif @@ -5416,8 +5436,9 @@ fun! netrw#BrowseX(fname,remote) if g:netrw_use_noswf setl noswf endif - exe "sil! NetrwKeepj norm! \" -" redraw! + if use_ctrlo + exe "sil! NetrwKeepj norm! \" + endif endif " call Decho("restoring posn to screenposn<".string(screenposn).">",'~'.expand("")) call winrestview(screenposn) @@ -6076,7 +6097,6 @@ fun! s:NetrwListHide() " call Dfunc("s:NetrwListHide() g:netrw_hide=".g:netrw_hide." g:netrw_list_hide<".g:netrw_list_hide.">") " call Decho("initial: ".string(getline(w:netrw_bannercnt,'$'))) let ykeep= @@ -" call DechoBuf(bufnr("%"),"COMBAK#3") " find a character not in the "hide" string to use as a separator for :g and :v commands " How-it-works: take the hiding command, convert it into a range. @@ -6120,7 +6140,6 @@ fun! s:NetrwListHide() " remove any blank lines that have somehow remained. " This seems to happen under Windows. exe 'sil! NetrwKeepj 1,$g@^\s*$@d' -" call DechoBuf(bufnr("%"),"COMBAK#4") let @@= ykeep " call Dret("s:NetrwListHide") @@ -6328,7 +6347,7 @@ fun! s:NetrwMaps(islocal) " generate default maps {{{3 if !hasmapto('NetrwHide') |nmap a NetrwHide_a|endif - if !hasmapto('NetrwBrowseUpDir') |nmap - NetrwBrowseUpDir |endif + if !hasmapto('NetrwBrowseUpDir') |nmap - NetrwBrowseUpDir|endif if !hasmapto('NetrwOpenFile') |nmap % NetrwOpenFile|endif if !hasmapto('NetrwBadd_cb') |nmap cb NetrwBadd_cb|endif if !hasmapto('NetrwBadd_cB') |nmap cB NetrwBadd_cB|endif @@ -6788,13 +6807,15 @@ fun! s:NetrwMarkFile(islocal,fname) if index(s:netrwmarkfilelist,dname) == -1 " append new filename to global markfilelist call add(s:netrwmarkfilelist,s:ComposePath(b:netrw_curdir,a:fname)) -" call Decho("append filename<".a:fname."> to global markfilelist<".string(s:netrwmarkfilelist).">",'~'.expand("")) +" call Decho("append filename<".a:fname."> to global s:markfilelist<".string(s:netrwmarkfilelist).">",'~'.expand("")) else " remove new filename from global markfilelist -" call Decho("filter(".string(s:netrwmarkfilelist).",'v:val != '.".dname.")",'~'.expand("")) +" call Decho("remove new filename from global s:markfilelist",'~'.expand("")) +" call Decho("..filter(".string(s:netrwmarkfilelist).",'v:val != '.".dname.")",'~'.expand("")) call filter(s:netrwmarkfilelist,'v:val != "'.dname.'"') -" call Decho("ending s:netrwmarkfilelist <".string(s:netrwmarkfilelist).">",'~'.expand("")) +" call Decho("..ending s:netrwmarkfilelist <".string(s:netrwmarkfilelist).">",'~'.expand("")) if s:netrwmarkfilelist == [] +" call Decho("s:netrwmarkfilelist is empty; unlet it",'~'.expand("")) unlet s:netrwmarkfilelist endif endif @@ -6818,7 +6839,8 @@ fun! s:NetrwMarkFile(islocal,fname) endif endif let @@= ykeep -" call Dret("s:NetrwMarkFile : s:netrwmarkfilelist_".curbufnr."<".(exists("s:netrwmarkfilelist_{curbufnr}")? string(s:netrwmarkfilelist_{curbufnr}) : " doesn't exist").">") +" call Decho("s:netrwmarkfilelist[".(exists("s:netrwmarkfilelist")? string(s:netrwmarkfilelist) : "")."] (avail in all buffers)",'~'.expand("")) +" call Dret("s:NetrwMarkFile : s:netrwmarkfilelist_".curbufnr."<".(exists("s:netrwmarkfilelist_{curbufnr}")? string(s:netrwmarkfilelist_{curbufnr}) : " doesn't exist")."> (buf#".curbufnr."list)") endfun " --------------------------------------------------------------------- @@ -7573,8 +7595,9 @@ fun! s:NetrwMarkFileGrep(islocal) let curdir = s:NetrwGetCurdir(a:islocal) if exists("s:netrwmarkfilelist") -" call Decho("s:netrwmarkfilelist".string(s:netrwmarkfilelist).">",'~'.expand("")) +" call Decho("using s:netrwmarkfilelist".string(s:netrwmarkfilelist).">",'~'.expand("")) let netrwmarkfilelist= join(map(deepcopy(s:netrwmarkfilelist), "fnameescape(v:val)")) +" call Decho("keeping copy of s:netrwmarkfilelist in function-local variable,'~'.expand(""))" call s:NetrwUnmarkAll() else " call Decho('no marked files, using "*"','~'.expand("")) @@ -7582,6 +7605,7 @@ fun! s:NetrwMarkFileGrep(islocal) endif " ask user for pattern +" call Decho("ask user for search pattern",'~'.expand("")) call inputsave() let pat= input("Enter pattern: ","") call inputrestore() @@ -9560,6 +9584,7 @@ fun! s:NetrwWideListing() let newcolend = newcolstart + fpc - 1 " call Decho("bannercnt=".w:netrw_bannercnt." fpl=".w:netrw_fpl." fpc=".fpc." newcol[".newcolstart.",".newcolend."]",'~'.expand("")) if has("clipboard") +" call Decho("(s:NetrwWideListing) save @* and @+",'~'.expand("")) sil! let keepregstar = @* sil! let keepregplus = @+ endif @@ -9576,6 +9601,7 @@ fun! s:NetrwWideListing() exe 'sil! NetrwKeepj '.w:netrw_bannercnt endwhile if has("clipboard") +" call Decho("(s:NetrwWideListing) restore @* and @+",'~'.expand("")) sil! let @*= keepregstar sil! let @+= keepregplus endif @@ -10849,7 +10875,6 @@ fun! s:LocalListing() for filename in filelist " call Decho(" ",'~'.expand("")) " call Decho("for filename in filelist: filename<".filename.">",'~'.expand("")) -" call DechoBuf(bufnr("%"),"COMBAK#1") if getftype(filename) == "link" " indicate a symbolic link @@ -10907,10 +10932,10 @@ fun! s:LocalListing() if w:netrw_liststyle == s:LONGLIST let sz = getfsize(filename) + let fsz = strpart(" ",1,15-strlen(sz)).sz if g:netrw_sizestyle =~# "[hH]" let sz= s:NetrwHumanReadable(sz) endif - let fsz = strpart(" ",1,15-strlen(sz)).sz let longfile= printf("%-".(g:netrw_maxfilenamelen+1)."s",pfile) let pfile = longfile.fsz." ".strftime(g:netrw_timefmt,getftime(filename)) " call Decho("longlist support: sz=".sz." fsz=".fsz,'~'.expand("")) @@ -10942,7 +10967,7 @@ fun! s:LocalListing() " call Decho("exe NetrwKeepj put ='".pfile."'",'~'.expand("")) sil! NetrwKeepj put=pfile endif -" call DechoBuf(bufnr("%"),"COMBAK#2") +" call DechoBuf(bufnr("%"),"bufnr(%)") endfor " cleanup any windows mess at end-of-line @@ -11259,7 +11284,9 @@ fun! netrw#Expose(varname) " call Dfunc("netrw#Expose(varname<".a:varname.">)") if exists("s:".a:varname) exe "let retval= s:".a:varname +" call Decho("retval=".retval,'~'.expand("")) if exists("g:netrw_pchk") +" call Decho("type(g:netrw_pchk=".g:netrw_pchk.")=".type(retval),'~'.expand("")) if type(retval) == 3 let retval = copy(retval) let i = 0 @@ -11268,10 +11295,13 @@ fun! netrw#Expose(varname) let i = i + 1 endwhile endif -" call Dret("netrw#Expose ".string(retval)) +" call Dret("netrw#Expose ".string(retval)),'~'.expand("")) return string(retval) + else +" call Decho("g:netrw_pchk doesn't exist",'~'.expand("")) endif else +" call Decho("s:".a:varname." doesn't exist",'~'.expand("")) let retval= "n/a" endif diff --git a/runtime/autoload/netrw_gitignore.vim b/runtime/autoload/netrw_gitignore.vim index da3f50bca0..1b55e2488a 100644 --- a/runtime/autoload/netrw_gitignore.vim +++ b/runtime/autoload/netrw_gitignore.vim @@ -18,61 +18,5 @@ " holder be liable for any damages resulting from the use " of this software. function! netrw_gitignore#Hide(...) - let additional_files = a:000 - - let default_files = ['.gitignore', '.git/info/exclude'] - - " get existing global/system gitignore files - let global_gitignore = expand(substitute(system("git config --global core.excludesfile"), '\n', '', 'g')) - if global_gitignore !=# '' - let default_files = add(default_files, global_gitignore) - endif - let system_gitignore = expand(substitute(system("git config --system core.excludesfile"), '\n', '', 'g')) - if system_gitignore !=# '' - let default_files = add(default_files, system_gitignore) - endif - - " append additional files if given as function arguments - if additional_files !=# [] - let files = extend(default_files, additional_files) - else - let files = default_files - endif - - " keep only existing/readable files - let gitignore_files = [] - for file in files - if filereadable(file) - let gitignore_files = add(gitignore_files, file) - endif - endfor - - " get contents of gitignore patterns from those files - let gitignore_lines = [] - for file in gitignore_files - for line in readfile(file) - " filter empty lines and comments - if line !~# '^#' && line !~# '^$' - let gitignore_lines = add(gitignore_lines, line) - endif - endfor - endfor - - " convert gitignore patterns to Netrw/Vim regex patterns - let escaped_lines = [] - for line in gitignore_lines - let escaped = line - let escaped = substitute(escaped, '\*\*', '*', 'g') - let escaped = substitute(escaped, '\.', '\\.', 'g') - let escaped = substitute(escaped, '\$', '\\$', 'g') - let escaped = substitute(escaped, '*', '.*', 'g') - " correction: dot, dollar and asterisks chars shouldn't be escaped when - " within regex matching groups. - let escaped = substitute(escaped, '\(\[[^]]*\)\zs\\\.', '\.', 'g') - let escaped = substitute(escaped, '\(\[[^]]*\)\zs\\\$', '\$', 'g') - let escaped = substitute(escaped, '\(\[[^]]*\)\zs\.\*', '*', 'g') - let escaped_lines = add(escaped_lines, escaped) - endfor - - return join(escaped_lines, ',') + return substitute(substitute(system('git ls-files --other --ignored --exclude-standard --directory'), '\n', ',', 'g'), ',$', '', '') endfunction diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 8c1f03aa60..6de4bfa62c 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 8.1. Last change: 2019 Jul 27 +*diff.txt* For Vim version 8.1. Last change: 2019 Nov 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -68,11 +68,12 @@ reset to the global value. The options can still be overruled from a modeline when re-editing the file. However, 'foldmethod' and 'wrap' won't be set from a modeline when 'diff' is set. +See `:diffoff` for an easy way to revert the options. The differences shown are actually the differences in the buffer. Thus if you make changes after loading a file, these will be included in the displayed diffs. You might have to do ":diffupdate" now and then, not all changes are -immediately taken into account. +immediately taken into account, especially when using an external diff command. In your .vimrc file you could do something special when Vim was started in diff mode. You could use a construct like this: > diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 30ec02d3c4..9ba53887be 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 8.1. Last change: 2019 Oct 29 +*eval.txt* For Vim version 8.1. Last change: 2019 Nov 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1956,11 +1956,15 @@ v:mouse_winid Window ID for a mouse click obtained with |getchar()|. *v:mouse_lnum* *mouse_lnum-variable* v:mouse_lnum Line number for a mouse click obtained with |getchar()|. + Also used for a click in a popup window when the filter is + invoked. This is the text line number, not the screen line number. The value is zero when there was no mouse button click. *v:mouse_col* *mouse_col-variable* v:mouse_col Column number for a mouse click obtained with |getchar()|. + Also used for a click in a popup window when the filter is + invoked. This is the screen column number, like with |virtcol()|. The value is zero when there was no mouse button click. diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index e8ee3f3522..362e838c09 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1,4 +1,4 @@ -*gui.txt* For Vim version 8.1. Last change: 2019 Aug 21 +*gui.txt* For Vim version 8.1. Last change: 2019 Nov 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -560,8 +560,9 @@ floating menus that do not appear on the main menu bar. *E330* *E327* *E331* *E336* *E333* *E328* *E329* *E337* *E792* To create a new menu item, use the ":menu" commands. They are mostly like -the ":map" set of commands but the first argument is a menu item name, given -as a path of menus and submenus with a '.' between them, e.g.: > +the ":map" set of commands (see |map-modes|), but the first argument is a menu +item name, given as a path of menus and submenus with a '.' between them, +e.g.: > :menu File.Save :w :inoremenu File.Save :w diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index d1202a7565..f27c2c16dd 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1,4 +1,4 @@ -*map.txt* For Vim version 8.1. Last change: 2019 Oct 20 +*map.txt* For Vim version 8.1. Last change: 2019 Nov 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -358,6 +358,8 @@ Some commands work both in Insert mode and Command-line mode, some not: :cmap :cnoremap :cunmap :cmapclear - yes - :lmap :lnoremap :lunmap :lmapclear yes* yes* yes* +* If 'iminsert' is 1, see |language-mapping| below. + The original Vi did not have separate mappings for Normal/Visual/Operator-pending mode and for Insert/Command-line mode. Therefore the ":map" and ":map!" commands enter and display mappings for @@ -834,13 +836,21 @@ In case the modifyOtherKeys mode causes problems you can disable it: > let &t_TI = "" let &t_TE = "" It does not take effect immediately. To have this work without restarting Vim -execute a shell command, e.g.: `!ls` +execute a shell command, e.g.: `!ls` Or put the lines in your |vimrc|. + +When modifyOtherKeys is enabled you can map and : > + imap [[[ + imap {{{ +Without modifyOtherKeys and are indistinguishable from Esc. A known side effect effect is that in Insert mode the raw escape sequence is inserted after the CTRL-V key. This can be used to check whether modifyOtherKeys is enabled: In Insert mode type CTRL-V CTRL-V, if you get one byte then modifyOtherKeys is off, if you get <1b>27;5;118~ then it is on. +When the 'esckeys' option is off, then modifyOtherKeys will be disabled in +Insert mode to avoid every key with a modifier causing Insert mode to end. + 1.12 MAPPING AN OPERATOR *:map-operator* diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index de6b288e4c..8e17ac9cdd 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 8.1. Last change: 2019 Nov 01 +*motion.txt* For Vim version 8.1. Last change: 2019 Nov 04 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 42c7510cc3..ba96e8380e 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 8.1. Last change: 2019 Nov 01 +*options.txt* For Vim version 8.1. Last change: 2019 Nov 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5247,6 +5247,8 @@ A jump table for the options with a short description can be found at |Q_op|. mouse pointer is moved to the window with keyboard focus. Off is the default because it makes using the pull down menus a little goofy, as a pointer transit may activate a window unintentionally. + MS-Windows: Also see 'scrollfocus' for what window is scrolled when + using the mouse scroll whel. *'mousehide'* *'mh'* *'nomousehide'* *'nomh'* 'mousehide' 'mh' boolean (default on) @@ -6298,7 +6300,7 @@ A jump table for the options with a short description can be found at |Q_op|. When using the scroll wheel and this option is set, the window under the mouse pointer is scrolled. With this option off the current window is scrolled. - Systems other than MS-Windows behave like this option is on. + Systems other than MS-Windows always behave like this option is on. *'scrolljump'* *'sj'* 'scrolljump' 'sj' number (default 1) @@ -6472,7 +6474,7 @@ A jump table for the options with a short description can be found at |Q_op|. Environment variables are expanded |:set_env|. If the name of the shell contains a space, you need to enclose it in - quotes and escape the space. Example: > + quotes and escape the space. Example with quotes: > :set shell=\"c:\program\ files\unix\sh.exe\"\ -f < Note the backslash before each quote (to avoid starting a comment) and each space (to avoid ending the option value). Also note that the diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index 9c8db6bd05..2189b0014d 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -1,4 +1,4 @@ -*pi_netrw.txt* For Vim version 8.1. Last change: 2019 Oct 10 +*pi_netrw.txt* For Vim version 8.1. Last change: 2019 Nov 07 ------------------------------------------------ NETRW REFERENCE MANUAL by Charles E. Campbell @@ -1184,7 +1184,7 @@ One may easily "bookmark" the currently browsed directory by using > *.netrwbook* Bookmarks are retained in between sessions of vim in a file called .netrwbook as a |List|, which is typically stored in the first directory on the user's -'runtimepath'; entries are kept in sorted order. +|'runtimepath'|; entries are kept in sorted order. If there are marked files and/or directories, mb will add them to the bookmark list. @@ -3512,7 +3512,7 @@ Example: Clear netrw's marked file list via a mapping on gu > - Click "Add..." - Set External Editor (adjust path as needed, include the quotes and !.! at the end): - "c:\Program Files\Vim\vim81\gvim.exe" !.! + "c:\Program Files\Vim\vim70\gvim.exe" !.! - Check that the filetype in the box below is {asterisk}.{asterisk} (all files), or whatever types you want (cec: change {asterisk} to * ; I had to @@ -3762,8 +3762,8 @@ by obtaining a copy of the latest (often developmental) netrw at: The script is typically installed on systems as something like: > - /usr/local/share/vim/vim8x/plugin/netrwPlugin.vim - /usr/local/share/vim/vim8x/autoload/netrw.vim + /usr/local/share/vim/vim7x/plugin/netrwPlugin.vim + /usr/local/share/vim/vim7x/autoload/netrw.vim (see output of :echo &rtp) < which is loaded automatically at startup (assuming :set nocp). If you @@ -3842,6 +3842,8 @@ netrw: ============================================================================== 12. History *netrw-history* {{{1 + v166: Nov 06, 2019 * Removed a space from a nmap for "-" + * Numerous debugging statement changes v163: Dec 05, 2017 * (Cristi Balan) reported that a setting ('sel') was left changed * (Holger Mitschke) reported a problem with @@ -3852,6 +3854,8 @@ netrw: * (Holger Mitschke) amended this help file with additional |g:netrw_special_syntax| items + * Prioritized wget over curl for + g:netrw_http_cmd v162: Sep 19, 2016 * (haya14busa) pointed out two syntax errors with a patch; these are now fixed. Oct 26, 2016 * I started using mate-terminal and found that @@ -4285,4 +4289,4 @@ netrw: ============================================================================== Modelines: {{{1 - vim:tw=78:ts=8:noet:ft=help:norl:fdm=marker + vim:tw=78:ts=8:ft=help:norl:fdm=marker diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 76067f5934..3b5575fdd0 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 8.1. Last change: 2019 Sep 27 +*quickref.txt* For Vim version 8.1. Last change: 2019 Nov 07 VIM REFERENCE MANUAL by Bram Moolenaar @@ -869,6 +869,7 @@ Short explanation of each option: *option-list* 'runtimepath' 'rtp' list of directories used for runtime files 'scroll' 'scr' lines to scroll with CTRL-U and CTRL-D 'scrollbind' 'scb' scroll in window as other windows scroll +'scrollfocus' 'scf' scroll wheel applies to window under pointer 'scrolljump' 'sj' minimum number of lines to scroll 'scrolloff' 'so' minimum nr. of lines above and below cursor 'scrollopt' 'sbo' how 'scrollbind' should behave diff --git a/runtime/doc/tags b/runtime/doc/tags index f8f5a7575b..7127692e01 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -663,7 +663,9 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* 'nosb' options.txt /*'nosb'* 'nosc' options.txt /*'nosc'* 'noscb' options.txt /*'noscb'* +'noscf' options.txt /*'noscf'* 'noscrollbind' options.txt /*'noscrollbind'* +'noscrollfocus' options.txt /*'noscrollfocus'* 'noscs' options.txt /*'noscs'* 'nosecure' options.txt /*'nosecure'* 'nosft' options.txt /*'nosft'* @@ -843,10 +845,12 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* 'sbr' options.txt /*'sbr'* 'sc' options.txt /*'sc'* 'scb' options.txt /*'scb'* +'scf' options.txt /*'scf'* 'scl' options.txt /*'scl'* 'scr' options.txt /*'scr'* 'scroll' options.txt /*'scroll'* 'scrollbind' options.txt /*'scrollbind'* +'scrollfocus' options.txt /*'scrollfocus'* 'scrolljump' options.txt /*'scrolljump'* 'scrolloff' options.txt /*'scrolloff'* 'scrollopt' options.txt /*'scrollopt'* @@ -4044,6 +4048,7 @@ E275 textprop.txt /*E275* E276 eval.txt /*E276* E277 remote.txt /*E277* E278 popup.txt /*E278* +E279 terminal.txt /*E279* E28 syntax.txt /*E28* E280 if_tcl.txt /*E280* E282 starting.txt /*E282* diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index 9c4108f582..f0a0097d5d 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -1,4 +1,4 @@ -*tagsrch.txt* For Vim version 8.1. Last change: 2019 Jun 10 +*tagsrch.txt* For Vim version 8.1. Last change: 2019 Nov 07 VIM REFERENCE MANUAL by Bram Moolenaar @@ -436,7 +436,7 @@ files here, it is only supported for backwards compatibility :-). Lines in Emacs tags files can be very long. Vim only deals with lines of up to about 510 bytes. To see whether lines are ignored set 'verbose' to 5 or -higher. +higher. Non-Emacs tags file lines can be any length. *tags-option* The 'tags' option is a list of file names. Each of these files is searched diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt index 7b40bf2322..d83035cc77 100644 --- a/runtime/doc/terminal.txt +++ b/runtime/doc/terminal.txt @@ -1,4 +1,4 @@ -*terminal.txt* For Vim version 8.1. Last change: 2019 Nov 01 +*terminal.txt* For Vim version 8.1. Last change: 2019 Nov 03 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/textprop.txt b/runtime/doc/textprop.txt index 9cf8227b8a..a323d68422 100644 --- a/runtime/doc/textprop.txt +++ b/runtime/doc/textprop.txt @@ -1,4 +1,4 @@ -*textprop.txt* For Vim version 8.1. Last change: 2019 Oct 23 +*textprop.txt* For Vim version 8.1. Last change: 2019 Nov 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -49,7 +49,7 @@ A text property normally has the name of a property type, which defines how to highlight the text. The property type can have these entries: "highlight" name of the highlight group to use "combine" when TRUE the text property highlighting is combined - with any syntax highlighting, when omitted or FALSE the + with any syntax highlighting; when omitted or FALSE the text property highlighting replaces the syntax highlighting "priority" when properties overlap, the one with the highest diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 7147c5ce6d..e36c560436 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.1. Last change: 2019 Nov 02 +*todo.txt* For Vim version 8.1. Last change: 2019 Nov 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -38,29 +38,13 @@ browser use: https://github.com/vim/vim/issues/1234 *known-bugs* -------------------- Known bugs and current work ----------------------- -Termdebug: Ctrl-W . doesn't work with modifyOtherKeys set. - -Cannot scroll popup window with mouse in GUI? (#5138) - -Add a way to make ":term cmd" run "cmd" in a shell, instead of executing it -directly. Perhaps ":term ++shell cmd". (issue #3340) - -Include netrw 166a? - -In a function these two lines are different: - let [a, b, c] =<< trim END fails - let [a,b,c] =<< trim END works -issue #5051 - -Make 'showbreak' global-local. +Don't use javascriptreact but javascript.jsx? #4830 +Although there is a good argument against using ".jsx". Update libvterm on github, rename termscreen.c back to screen.c. -Graduate FEAT_TAG_BINS and make LSIZE for tags bigger. Popup windows: -- When using "botleft" for "pos" and there is not enough space, positioning - goes below, but this must not happen if there is less space there. #5151 - Use popup (or popup menu) for command line completion - Implement flip option - Make redrawing more efficient and avoid flicker: @@ -143,7 +127,7 @@ Terminal emulator window: conversions. Error numbers available: -E279, E290, E292, E362, E366, E450, E451, E452, +E290, E292, E362, E366, E450, E451, E452, E453, E454, E460, E489, E491, E565, E578, E610, E611, E653, E654, E856, E857, E860, E861, E863, E889, E900 @@ -189,6 +173,13 @@ Adding "10" to 'spellsuggest' causes spell suggestions to become very slow. goes to any buffer, and then :bnext skips help buffers, since they are unlisted. (#4478) +When 'selection' is "exclusive" then using vi' on the second ' does not select +anything. (#5183) +Patch from Christian: +https://github.com/chrisbra/vim/commit/7482d1d389e7db97e247f8b509003e5ec27427a9 +When using exclusive selection and vi" that fails, cursor moves to the left. +Cursor should not move. (#4024) + Enable 'termbidi' if $VTE_VERSION >= 5703 ? Universal solution to detect if t_RS is working, using cursor position. @@ -253,6 +244,16 @@ We could add the enable/disable sequences to t_ti/t_te or t_ks/t_ke. Check_external_diff() is used too often. (Daniel Hahler, #4800) +Win32: after "[I" showing matches, scroll wheel messes up screen. (Tsakiridis, +2007 Feb 18) +Patch by Alex Dobrynin, 2007 Jun 3. Also fixes other scroll wheel problems. + +Add a WindowScrolled event. Trigger around the same time as CursorMoved. +Can be used to update highlighting. #3127 #5181 + +Patch for Template string: #4491. New pull: #4634 +Have another look at the implementation: Is the code worth it? + Incorrect formatting with autoindent. (Sebastian Gniazdowski, #4909) Patch to add the :bvimgrep command. (Christian Brabandt, 2014 Nov 12) @@ -311,6 +312,9 @@ Problem with :tlmenu: Detach item added with all modes? Issue #3563. Add an argument to expandcmd() to expand like ":next" does. +When both "a" and "l" is in 'formatoptions' then auto-formatting also happens +in a long line. #5189 + The quoting of the [command] argument of :terminal is not clearly documented. Give a few examples. (#4288) @@ -450,9 +454,6 @@ Redo only remembers the last change. Could use "{count}g." to redo an older change. How does the user know which change? At least have a way to list them: ":repeats". Add to history, like search history and command line history. -When using exclusive selection and vi" that fails, cursor moves to the left. -Cursor should not move. (#4024) - Incsearch test fails when locale is "C". (Dominique Pelle, #3986) Also run all tests with C locale? @@ -726,9 +727,6 @@ Jan 15, #2555) ":bufdo e" disabled syntax HL in windows other than the current. (BPJ) -Patch for Template string: #4491. New pull: #4634 -It's an awful lot of code for something that is just a bit nicer syntax. - Check argument of systemlist(). (Pavlov) No maintainer for Vietnamese translations. @@ -2731,10 +2729,6 @@ patches by Mathias, see mail Feb 22) Win32: compiling with normal features and OLE fails. Patch by Mathias Michaelis, 2006 Jun 4. -Win32: after "[I" showing matches, scroll wheel messes up screen. (Tsakiridis, -2007 Feb 18) -Patch by Alex Dobrynin, 2007 Jun 3. Also fixes other scroll wheel problems. - Win32: using CTRL-S in Insert mode doesn't remove the "+" from the tab pages label. (Tsakiridis, 2007 Feb 18) Patch from Ian Kelling, 2008 Aug 6. diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt index b953dcbf15..4bf2598046 100644 --- a/runtime/doc/visual.txt +++ b/runtime/doc/visual.txt @@ -1,4 +1,4 @@ -*visual.txt* For Vim version 8.1. Last change: 2019 May 05 +*visual.txt* For Vim version 8.1. Last change: 2019 Nov 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -116,6 +116,7 @@ gn Search forward for the last used search pattern, like E.g., "dgn" deletes the text of the next match. If Visual mode is active, extends the selection until the end of the next match. + 'wrapscan' applies Note: Unlike `n` the search direction does not depend on the previous search command. diff --git a/runtime/lang/menu_tr.iso_8859-9.vim b/runtime/lang/menu_tr.iso_8859-9.vim new file mode 100644 index 0000000000..2c5158da55 --- /dev/null +++ b/runtime/lang/menu_tr.iso_8859-9.vim @@ -0,0 +1,3 @@ +" Menu Translations: Turkish + +source :p:h/menu_tr_tr.iso_8859-9.vim diff --git a/runtime/lang/menu_tr.latin1.vim b/runtime/lang/menu_tr.latin1.vim deleted file mode 100644 index fb759469f7..0000000000 --- a/runtime/lang/menu_tr.latin1.vim +++ /dev/null @@ -1,3 +0,0 @@ -" Menu Translations: Turkish - -source :p:h/menu_tr_tr.latin1.vim diff --git a/runtime/lang/menu_tr_tr.iso_8859-9.vim b/runtime/lang/menu_tr_tr.iso_8859-9.vim new file mode 100644 index 0000000000..9f59258da0 --- /dev/null +++ b/runtime/lang/menu_tr_tr.iso_8859-9.vim @@ -0,0 +1,331 @@ +" Menu Translations: Turkish +" Maintainer: Emir SARI + +if exists("did_menu_trans") + finish +endif +let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim + +scriptencoding iso-8859-9 + +" Top +menutrans &File &Dosya +menutrans &Edit Dü&zen +menutrans &Tools &Araçlar +menutrans &Syntax &Sözdizim +menutrans &Buffers A&rabellekler +menutrans &Window &Pencere +menutrans &Help &Yardım + + +" Help menu +menutrans &Overview &Genel\ Bakış +menutrans &User\ Manual &Kullanım\ Kılavuzu +menutrans &How-To\ Links &Nasıl\ Yapılır? +menutrans &Find\.\.\. &Bul\.\.\. +"-------------------- +menutrans &Credits &Teşekkürler +menutrans Co&pying &Dağıtım +menutrans &Sponsor/Register &Sponsorluk/Kayıt +menutrans O&rphans &Yetimler +"-------------------- +menutrans &Version Sürüm\ &Bilgisi +menutrans &About &Hakkında + + +" File menu +menutrans &Open\.\.\.:e &Aç\.\.\.:e +menutrans Sp&lit-Open\.\.\.:sp &Yeni\ Bölümde\ Aç\.\.\.:sp +menutrans Open\ Tab\.\.\.:tabnew S&ekme\ Aç\.\.\.:tabnew +menutrans &New:enew Yeni\ &Sekme:enew +menutrans &Close:close Ka&pat:close +"-------------------- +menutrans &Save:w Ka&ydet:w +menutrans Save\ &As\.\.\.:sav &Farklı Kaydet\.\.\.:sav +"-------------------- +menutrans Split\ &Diff\ With\.\.\. Ka&rşılaştır\.\.\. +menutrans Split\ Patched\ &By\.\.\. Ya&malar\ Dahil\ Karşılaştır\.\.\. +"-------------------- +menutrans &Print Ya&zdır +menutrans Sa&ve-Exit:wqa Kaydet\ &ve Çık:wqa +menutrans E&xit:qa Çı&k:qa + + +" Edit menu +menutrans &Undou &Geri\ Alu +menutrans &Redo^R &Yinele^R +menutrans Rep&eat\. Son\ Komutu\ Y&inele\. +"-------------------- +menutrans Cu&t"+x &Kes"+x +menutrans &Copy"+y K&opyala"+y +menutrans &Paste"+gP Ya&pıştır"+gP +menutrans Put\ &Before[p Ö&nüne Koy[p +menutrans Put\ &After]p A&rkasına Koy]p +menutrans &Deletex Si&lx +menutrans &Select\ AllggVG Tü&münü\ SeçggVG +"-------------------- +" Athena GUI only +menutrans &Find/ &Bul/ +menutrans Find\ and\ Rep&lace:%s Bul\ &ve\ Değiştir:%s +" End Athena GUI only +menutrans &Find\.\.\./ &Bul\.\.\./ +menutrans Find\ and\ Rep&lace\.\.\. Bul\ ve\ &Değiştir\.\.\. +menutrans Find\ and\ Rep&lace\.\.\.:%s Bul\ ve\ &Değiştir\.\.\.:%s +menutrans Find\ and\ Rep&lace\.\.\.:s Bul\ ve\ &Değiştir\.\.\.:s +"-------------------- +menutrans Settings\ &Window &Ayarlar\ Penceresi +menutrans Startup\ &Settings Başlan&gıç\ Ayarları +menutrans &Global\ Settings Ge&nel\ Ayarlar +menutrans F&ile\ Settings &Dosya\ Ayarları +menutrans C&olor\ Scheme &Renk\ Düzeni +menutrans &Keymap Düğme\ &Eşlem +menutrans Select\ Fo&nt\.\.\. Ya&zıtipi Seç\.\.\. +">>>----------------- Edit/Global settings +menutrans Toggle\ Pattern\ &Highlight:set\ hls! Dizgi\ &Vurgulamasını\ Aç/Kapat:set\ hls! +menutrans Toggle\ &Ignoring\ Case:set\ ic! BÜYÜK/küçük\ Harf\ &Duyarsız\ Aç/Kapat:set\ ic! +menutrans Toggle\ &Showing\ Matched\ Pairs:set\ sm! Eş&leşen\ İkilileri\ Aç/Kapat:set\ sm! +menutrans &Context\ Lines İ&mleçle\ Oynayan\ Satırlar +menutrans &Virtual\ Edit &Sanal\ Düzenleme +menutrans Toggle\ Insert\ &Mode:set\ im! Ekleme\ &Kipini\ Aç/Kapat:set\ im! +menutrans Toggle\ Vi\ C&ompatibility:set\ cp! &Vi\ Uyumlu\ Kipi\ Aç/Kapat:set\ cp! +menutrans Search\ &Path\.\.\. &Arama\ Yolu\.\.\. +menutrans Ta&g\ Files\.\.\. &Etiket\ Dosyaları\.\.\. +" +menutrans Toggle\ &Toolbar &Araç\ Çubuğunu\ Aç/Kapat +menutrans Toggle\ &Bottom\ Scrollbar A<\ Kaydırma\ Çubuğunu\ Aç/Kapat +menutrans Toggle\ &Left\ Scrollbar &Sol\ Kaydırma\ Çubuğunu\ Aç/Kapat +menutrans Toggle\ &Right\ Scrollbar S&ağ\ Kaydırma\ Çubuğunu\ Aç/Kapat +">>>->>>------------- Edit/Global settings/Virtual edit +menutrans Never Kapalı +menutrans Block\ Selection Blok\ Seçimi +menutrans Insert\ Mode Ekleme\ Kipi +menutrans Block\ and\ Insert Blok\ Seçiminde\ ve\ Ekleme\ Kipinde +menutrans Always Her\ Zaman\ Açık +">>>----------------- Edit/File settings +menutrans Toggle\ Line\ &Numbering:set\ nu! &Satır\ Numaralandırmayı\ Aç/Kapat:set\ nu! +menutrans Toggle\ Relati&ve\ Line\ Numbering:set\ rnu! &Göreceli\ Satır\ Numaralandırmayı\ Aç/Kapat:set\ nru! +menutrans Toggle\ &List\ Mode:set\ list! Gö&rünmeyen\ Karakterleri\ Aç/Kapat:set\ list! +menutrans Toggle\ Line\ &Wrapping:set\ wrap! Sa&tır\ Kaydırmayı\ Aç/Kapat:set\ wrap! +menutrans Toggle\ W&rapping\ at\ Word:set\ lbr! Sö&zcük\ Kaydırmayı\ Aç/Kapat:set\ lbr! +menutrans Toggle\ Tab\ &Expanding-tab:set\ et! S&ekmeleri\ Boşluklara\ Dönüştürmeyi\ Aç/Kapat:set\ et! +menutrans Toggle\ &Auto\ Indenting:set\ ai! &Otomatik\ Girintilemeyi\ Aç/Kapat:set\ ai! +menutrans Toggle\ &C-Style\ Indenting:set\ cin! &C\ Tarzı\ Girintilemeyi\ Aç/Kapat:set\ cin! +">>>--- +menutrans &Shiftwidth &Girinti\ Düzeyi +menutrans Soft\ &Tabstop &Sekme\ Genişliği +menutrans Te&xt\ Width\.\.\. &Metin\ Genişliği\.\.\. +menutrans &File\ Format\.\.\. &Dosya\ Biçimi\.\.\. +" +" +" +" Tools menu +menutrans &Jump\ to\ This\ Tagg^] Ş&u\ Etikete\ Atlag^] +menutrans Jump\ &Back^T &Geri\ Dön^T +menutrans Build\ &Tags\ File &Etiket\ Dosyası\ Oluştur +"------------------- +menutrans &Folding &Kıvırmalar +menutrans &Spelling &Yazım\ Denetimi +menutrans &Diff &Ayrımlar\ (diff) +"------------------- +menutrans &Make:make &Derle:make +menutrans &List\ Errors:cl &Hataları\ Listele:cl +menutrans L&ist\ Messages:cl! İ&letileri\ Listele:cl! +menutrans &Next\ Error:cn Bir\ &Sonraki\ Hata:cn +menutrans &Previous\ Error:cp Bir\ Ö&nceki\ Hata:cp +menutrans &Older\ List:cold Daha\ &Eski\ Hatalar:cold +menutrans N&ewer\ List:cnew Daha\ &Yeni\ Hatalar:cnew +menutrans Error\ &Window Hatalar\ &Penceresi +menutrans Se&t\ Compiler De&rleyici\ Seç +menutrans Show\ Compiler\ Se&ttings\ in\ Menu Derleyici\ Ayarlarını\ Menüde\ &Göster +"------------------- +menutrans &Convert\ to\ HEX:%!xxd HEX'e\ Dö&nüştür:%!xxd +menutrans Conve&rt\ Back:%!xxd\ -r HEX'&ten\ Dönüştür:%!xxd\ -r +">>>---------------- Tools/Spelling +menutrans &Spell\ Check\ On Yazım\ Denetimini\ &Aç +menutrans Spell\ Check\ &Off Yazım\ Denetimini\ &Kapat +menutrans To\ &Next\ Error]s Bir\ &Sonraki\ Hata]s +menutrans To\ &Previous\ Error[s Bir\ Ö&nceki\ Hata[s +menutrans Suggest\ &Correctionsz= Dü&zeltme\ Önerz= +menutrans &Repeat\ Correction:spellrepall Düzeltmeyi\ &Yinelespellrepall +"------------------- +menutrans Set\ Language\ to\ "en" Dili\ "en"\ yap +menutrans Set\ Language\ to\ "en_au" Dili\ "en_au"\ yap +menutrans Set\ Language\ to\ "en_ca" Dili\ "en_ca"\ yap +menutrans Set\ Language\ to\ "en_gb" Dili\ "en_gb"\ yap +menutrans Set\ Language\ to\ "en_nz" Dili\ "en_nz"\ yap +menutrans Set\ Language\ to\ "en_us" Dili\ "en_us"\ yap +menutrans &Find\ More\ Languages &Başka\ Diller\ Bul +let g:menutrans_set_lang_to = 'Dil Yükle' +" +" +" The Spelling popup menu +" +" +let g:menutrans_spell_change_ARG_to = 'Düzeltilecek:\ "%s"\ ->' +let g:menutrans_spell_add_ARG_to_word_list = '"%s"\ sözcüğünü\ sözlüğe\ ekle' +let g:menutrans_spell_ignore_ARG = '"%s"\ sözcüğünü\ yoksay' +">>>---------------- Folds +menutrans &Enable/Disable\ Foldszi &Kıvırmaları\ Aç/Kapatzi +menutrans &View\ Cursor\ Linezv İ&mlecin\ Olduğu\ Satırı\ Görüntülezv +menutrans Vie&w\ Cursor\ Line\ OnlyzMzx Ya&lnızca\ İmlecin\ Olduğu\ Satırı\ GörüntülezMzx +menutrans C&lose\ More\ Foldszm &Daha\ Fazla\ Kıvırma\ Kapatzm +menutrans &Close\ All\ FoldszM Bütün\ Kı&vırmaları\ KapatzM +menutrans &Open\ All\ FoldszR Bü&tün\ Kıvırmaları\ AçzR +menutrans O&pen\ More\ Foldszr D&aha\ Fazla\ Kıvırma\ Açzr +menutrans Fold\ Met&hod Kıvı&rma\ Yöntemi +menutrans Create\ &Foldzf Kıvırma\ &Oluşturzf +menutrans &Delete\ Foldzd Kıvırma\ &Silzd +menutrans Delete\ &All\ FoldszD Tü&m\ Kıvırmaları\ SilzD +menutrans Fold\ col&umn\ Width Kıvırma\ Sütunu\ &Genişliği +">>>->>>----------- Tools/Folds/Fold Method +menutrans M&anual &El\ İle +menutrans I&ndent &Girinti +menutrans E&xpression İ&fade +menutrans S&yntax &Sözdizim +menutrans Ma&rker İ&mleyici +">>>--------------- Tools/Diff +menutrans &Update &Güncelle +menutrans &Get\ Block Bloğu\ &Al +menutrans &Put\ Block Bloğu\ &Koy +">>>--------------- Tools/Diff/Error window +menutrans &Update:cwin &Güncelle:cwin +menutrans &Close:cclose &Kapat:cclose +menutrans &Open:copen &Aç:copen +" +" +" Syntax menu +" +menutrans &Show\ File\ Types\ in\ Menu Dosya\ Türlerini\ Menüde\ &Göster +menutrans Set\ '&syntax'\ only Yalnızca\ 'syntax'\ &Ayarla +menutrans Set\ '&filetype'\ too 'filetype'\ İçin\ &de\ Ayarla +menutrans &Off &Kapat +menutrans &Manual &El\ İle +menutrans A&utomatic &Otomatik +menutrans On/Off\ for\ &This\ File &Bu\ Dosya\ İçin\ Aç/Kapat +menutrans Co&lor\ Test &Renk\ Testi +menutrans &Highlight\ Test &Vurgulama\ Testi +menutrans &Convert\ to\ HTML &HTML'ye\ Dönüştür +" +" +" Buffers menu +" +menutrans &Refresh\ menu &Menüyü\ Güncelle +menutrans Delete &Sil +menutrans &Alternate Ö&teki +menutrans &Next So&nraki +menutrans &Previous Ön&ceki +menutrans [No\ File] [Dosya\ Yok] +" +" +" Window menu +" +menutrans &New^Wn Yeni\ &Pencere^Wn +menutrans S&plit^Ws Pencereyi\ &Böl^Ws +menutrans Sp&lit\ To\ #^W^^ Pencereyi\ Başkasına\ Bö&l^W^^ +menutrans Split\ &Vertically^Wv Pencereyi\ &Dikey\ Olarak\ Böl^Wv +menutrans Split\ File\ E&xplorer Yeni\ Bölü&mde\ Dosya\ Gezginini\ Aç +" +menutrans &Close^Wc Pen&cereyi\ Kapat^Wc +menutrans Close\ &Other(s)^Wo Diğer\ Pencerele&ri\ Kapat^Wo +" +menutrans Move\ &To &Taşı +menutrans Rotate\ &Up^WR &Yukarı\ Taşı^WR +menutrans Rotate\ &Down^Wr &Aşağı\ Taşı^Wr +" +menutrans &Equal\ Size^W= &Eşit\ Boyut^W= +menutrans &Max\ Height^W_ E&n\ Büyük\ Yükseklik^W_ +menutrans M&in\ Height^W1_ En\ Küçük\ Yüksekl&ik^W1_ +menutrans Max\ &Width^W\| En\ Büyük\ Gen&işlik^W\| +menutrans Min\ Widt&h^W1\| En\ Küçük\ Geniş&lik^W1\| +">>>----------------- Window/Move To +menutrans &Top^WK &Yukarı^WK +menutrans &Bottom^WJ &Aşağı^WJ +menutrans &Left\ Side^WH So&la^WH +menutrans &Right\ Side^WL &Sağa^WL +" +" +" The popup menu +" +" +menutrans &Undo &Geri\ Al +menutrans Cu&t &Kes +menutrans &Copy K&opyala +menutrans &Paste &Yapıştır +menutrans &Delete &Sil +menutrans Select\ Blockwise &Blok\ Biçiminde\ Seç +menutrans Select\ &Word Sö&zcük\ Seç +menutrans Select\ &Sentence &Tümce\ Seç +menutrans Select\ Pa&ragraph &Paragraf\ Seç +menutrans Select\ &Line S&atır\ Seç +menutrans Select\ &Block Bl&ok\ Seç +menutrans Select\ &All Tümü&nü\ Seç +" +" The GUI toolbar +" +if has("toolbar") + if exists("*Do_toolbar_tmenu") + delfun Do_toolbar_tmenu + endif + fun Do_toolbar_tmenu() + tmenu ToolBar.Open Dosya Aç + tmenu ToolBar.Save Dosya Kaydet + tmenu ToolBar.SaveAll Tüm Dosyaları Kaydet + tmenu ToolBar.Print Yazdır + tmenu ToolBar.Undo Geri Al + tmenu ToolBar.Redo Yinele + tmenu ToolBar.Cut Kes + tmenu ToolBar.Copy Kopyala + tmenu ToolBar.Paste Yapıştır + tmenu ToolBar.Find Bul... + tmenu ToolBar.FindNext Sonrakini Bul + tmenu ToolBar.FindPrev Öncekini Bul + tmenu ToolBar.Replace Bul ve Değiştir... + if 0 " disabled; These are in the Windows menu + tmenu ToolBar.New Yeni Pencere + tmenu ToolBar.WinSplit Pencereyi Böl + tmenu ToolBar.WinMax En Büyük Pencere Yüksekliği + tmenu ToolBar.WinMin En Küçük Pencere Yüksekliği + tmenu ToolBar.WinClose Pencereyi Kapat + endif + tmenu ToolBar.LoadSesn Oturum Yükle + tmenu ToolBar.SaveSesn Oturum Kaydet + tmenu ToolBar.RunScript Betik Çalıştır + tmenu ToolBar.Make Derle + tmenu ToolBar.Shell Kabuk + tmenu ToolBar.RunCtags Etiket Dosyası Oluştur + tmenu ToolBar.TagJump Etikete Atla + tmenu ToolBar.Help Yardım + tmenu ToolBar.FindHelp Yardım Bul + endfun +endif +" +" +" Dialog texts +" +" Find in help dialog +" +let g:menutrans_help_dialog = "Yardım için komut veya sözcük girin:\n\nEkleme Kipi komutlarını aramak için i_ ekleyin (örneğin i_CTRL-X)\nNormal Kip komutlarını aramak için _c ekleyin (örneğin с_)\nSeçenekler hakkında yardım almak için ' ekleyin (örneğin 'shiftwidth')" +" +" Searh path dialog +" +let g:menutrans_path_dialog = "Dosya araması için yol belirtin.\nDizin adları virgüllerle ayrılır." +" +" Tag files dialog +" +let g:menutrans_tags_dialog = "Etiket dosyası adları belirtin (virgülle ayırarak).\n" +" +" Text width dialog +" +let g:menutrans_textwidth_dialog = "Biçimlendirme için metin genişliğini belirtin.\nBiçimlendirme iptali için 0 girin." +" +" File format dialog +" +let g:menutrans_fileformat_dialog = "Dosya biçimi seçin" +let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\nİ&ptal" +" +let menutrans_no_file = "[Dosya Yok]" + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/lang/menu_tr_tr.latin1.vim b/runtime/lang/menu_tr_tr.latin1.vim deleted file mode 100644 index ba8d930a1d..0000000000 --- a/runtime/lang/menu_tr_tr.latin1.vim +++ /dev/null @@ -1,332 +0,0 @@ -" Menu Translations: Turkish -" Maintainer: Emir SARI - -if exists("did_menu_trans") - finish -endif -let did_menu_trans = 1 -let s:keepcpo= &cpo -set cpo&vim - -scriptencoding latin1 - -" Top -menutrans &File &Dosya -menutrans &Edit D&zen -menutrans &Tools &Aralar -menutrans &Syntax &Szdizim -menutrans &Buffers A&rabellekler -menutrans &Window &Pencere -menutrans &Help &Yardim - - -" Help menu -menutrans &Overview &Genel\ Bakis -menutrans &User\ Manual &Kullanim\ Kilavuzu -menutrans &How-To\ Links &Nasil\ Yapilir? -menutrans &Find\.\.\. &Bul\.\.\. -"-------------------- -menutrans &Credits &Tesekkrler -menutrans Co&pying &Dagitim -menutrans &Sponsor/Register &Sponsorluk/Kayit -menutrans O&rphans &Yetimler -"-------------------- -menutrans &Version Srm\ &Bilgisi -menutrans &About &Hakkinda - - -" File menu -menutrans &Open\.\.\.:e &A\.\.\.:e -menutrans Sp&lit-Open\.\.\.:sp &Yeni\ Blmde\ A\.\.\.:sp -menutrans Open\ Tab\.\.\.:tabnew S&ekme\ A\.\.\.:tabnew -menutrans &New:enew Yeni\ &Sekme:enew -menutrans &Close:close Ka&pat:close -"-------------------- -menutrans &Save:w Ka&ydet:w -menutrans Save\ &As\.\.\.:sav &Farkli Kaydet\.\.\.:sav -"-------------------- -menutrans Split\ &Diff\ With\.\.\. Ka&rsilastir\.\.\. -menutrans Split\ Patched\ &By\.\.\. Ya&malar\ Dahil\ Karsilastir\.\.\. -"-------------------- -menutrans &Print Ya&zdir -menutrans Sa&ve-Exit:wqa Kaydet\ &ve ik:wqa -menutrans E&xit:qa i&k:qa - - -" Edit menu -menutrans &Undou &Geri\ Alu -menutrans &Redo^R &Yinele^R -menutrans Rep&eat\. Son\ Komutu\ Y&inele\. -"-------------------- -menutrans Cu&t"+x &Kes"+x -menutrans &Copy"+y K&opyala"+y -menutrans &Paste"+gP Ya&pistir"+gP -menutrans Put\ &Before[p &nne Koy[p -menutrans Put\ &After]p A&rkasina Koy]p -menutrans &Deletex Si&lx -menutrans &Select\ AllggVG T&mn\ SeggVG -"-------------------- -" Athena GUI only -menutrans &Find/ &Bul/ -menutrans Find\ and\ Rep&lace:%s Bul\ &ve\ Degistir:%s -" End Athena GUI only -menutrans &Find\.\.\./ &Bul\.\.\./ -menutrans Find\ and\ Rep&lace\.\.\. Bul\ ve\ &Degistir\.\.\. -menutrans Find\ and\ Rep&lace\.\.\.:%s Bul\ ve\ &Degistir\.\.\.:%s -menutrans Find\ and\ Rep&lace\.\.\.:s Bul\ ve\ &Degistir\.\.\.:s -"-------------------- -menutrans Settings\ &Window &Ayarlar\ Penceresi -menutrans Startup\ &Settings Baslan&gi\ Ayarlari -menutrans &Global\ Settings Ge&nel\ Ayarlar -menutrans F&ile\ Settings &Dosya\ Ayarlari -menutrans C&olor\ Scheme &Renk\ Dzeni -menutrans &Keymap Dgme\ &Eslem -menutrans Select\ Fo&nt\.\.\. Ya&zitipi Se\.\.\. -">>>----------------- Edit/Global settings -menutrans Toggle\ Pattern\ &Highlight:set\ hls! Dizgi\ &Vurgulamasini\ A/Kapat:set\ hls! -menutrans Toggle\ &Ignoring\ Case:set\ ic! BYK/kk\ Harf\ &Duyarsiz\ A/Kapat:set\ ic! -menutrans Toggle\ &Showing\ Matched\ Pairs:set\ sm! Es&lesen\ I