# HG changeset patch # User vimboss # Date 1132948727 0 # Node ID 8b84fe17e147219e6ff181f6bd7e809e5116588c # Parent 8ec588470508bc34822d0276b8619c1cda21ebb8 updated for version 7.0159 diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0aa. Last change: 2005 Nov 23 +*todo.txt* For Vim version 7.0aa. Last change: 2005 Nov 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -44,12 +44,19 @@ differences. Use Amiga code? "make unixall": remove split in floppy-size archives. +Using pipes for filter commands: provide some way to type a password, keep +stderr in/out open for this? + To support mapping to be used as {motion}: Add operator that executes a user defined function. '[ and '] marks are at start and end of text. ":map :set opfunc=MyOpgy". Patch from Yasuhiro Matsumoto: ":e ++enc=xxx" keeps encoding for conversion -errors and illegal bytes. How about replacing bytes with '?' or not? +errors and illegal bytes. Make default to replace bad bytes/characters with +'?' and allow for two alternatives: + :e ++enc=xxx ++bad=keep foo.txt + :e ++enc=xxx ++bad=drop foo.txt + :e ++enc=xxx ++bad=? foo.txt ccomplete: - When an option is set: In completion mode and the user types (identifier) @@ -100,6 +107,9 @@ Mac unicode patch (Da Woon Jung): - With 'nopaste' pasting is wrong, with 'paste' Command-V doesn't work. (Alan Schmitt) +Mac: drop support for OS 9? Most people are now using OS/X and Vim 6.4 can be +used for others. + Patch to add a few flags to search(). (Benji Fisher, Nov 22) Win32: Use the free downloadable compiler 7.1. Figure out how to do debugging diff --git a/runtime/keymap/tamil_tscii.vim b/runtime/keymap/tamil_tscii.vim --- a/runtime/keymap/tamil_tscii.vim +++ b/runtime/keymap/tamil_tscii.vim @@ -1,572 +1,572 @@ -" Keymap file for the editing Tamil language files in TSCII encoding. -" -" Maintainer: Yegappan Lakshmanan (yegappan AT yahoo DOT com) -" Last updated: August 4, 2005 -" -" You will need a fixed width TSCII font to use this encoding. The -" Avarangal TSCII fixed width font (TSC_AvarangalFxd) is used to test -" this keymap. -" -" Visit http://www.tscii.org for more information about the TSCII -" encoding. -" -let b:keymap_name = "tamil_tscii" - -loadkeymap - -" Uyir (Vowels) letters -a -aa -A -i -ii -I -u -uu -U -e -ee -E -ai -o -oo -O -au -q - -" mey (Consonants) letters -k -ka -kaa -kA -ki -kii -kI -ku -kuu -kU -ke -kee -kE -kai -ko -koo -kO -kau - -g -ga -gaa -gA -gi -gii -gI -gu -guu -gU -ge -gee -gE -gai -go -goo -gO -gau - -ng -nga -ngaa -ngA -ngi -ngii -ngI -ngu -nguu -ngU -nge -ngee -ngE -ngai -ngo -ngoo -ngO -ngau - -ch -cha -chaa -chA -chi -chii -chI -chu -chuu -chU -che -chee -chE -chai -cho -choo -chO -chau - -s -sa -saa -sA -si -sii -sI -su -suu -sU -se -see -sE -sai -so -soo -sO -sau - -nj -nja -njaa -njA -nji -njii -njI -nju -njuu -njU -nje -njee -njE -njai -njo -njoo -njO -njau - -t -ta -taa -tA -ti -tii -tI -tu -tuu -tU -te -tee -tE -tai -to -too -tO -tau - -d -da -daa -dA -di -dii -dI -du -duu -dU -de -dee -dE -dai -do -doo -dO -dau - -N -Na -Naa -NA -Ni -Nii -NI -Nu -Nuu -NU -Ne -Nee -NE -Nai -No -Noo -NO -Nau - -th -tha -thaa -thA -thi -thii -thI -thu -thuu -thU -the -thee -thE -thai -tho -thoo -thO -thau - -w -wa -waa -wA -wi -wii -wI -wu -wuu -wU -we -wee -wE -wai -wo -woo -wO -wau - -n- -n-a -n-aa -n-A -n-i -n-ii -n-I -n-u -n-uu -n-U -n-e -n-ee -n-E -n-ai -n-o -n-oo -n-O -n-au - -p -pa -paa -pA -pi -pii -pI -pu -puu -pU -pe -pee -pE -pai -po -poo -pO -pau - -b -ba -baa -bA -bi -bii -bI -bu -buu -bU -be -bee -bE -bai -bo -boo -bO -bau - -m -ma -maa -mA -mi -mii -mI -mu -muu -mU -me -mee -mE -mai -mo -moo -mO -mau - -y -ya -yaa -yA -yi -yii -yI -yu -yuu -yU -ye -yee -yE -yai -yo -yoo -yO -yau - -r -ra -raa -rA -ri -rii -rI -ru -ruu -rU -re -ree -rE -rai -ro -roo -rO -rau - -l -la -laa -lA -li -lii -lI -lu -luu -lU -le -lee -lE -lai -lo -loo -lO -lau - -v -va -vaa -vA -vi -vii -vI -vu -vuu -vU -ve -vee -vE -vai -vo -voo -vO -vau - -z -za -zaa -zA -zi -zii -zI -zu -zuu -zU -ze -zee -zE -zai -zo -zoo -zO -zau - -L -La -Laa -LA -Li -Lii -LI -Lu -Luu -LU -Le -Lee -LE -Lai -Lo -Loo -LO -Lau - -R -Ra -Raa -RA -Ri -Rii -RI -Ru -Ruu -RU -Re -Ree -RE -Rai -Ro -Roo -RO -Rau - -n -na -naa -nA -ni -nii -nI -nu -nuu -nU -ne -nee -nE -nai -no -noo -nO -nau - -" Grantha letters -j -ja -jaa -jA -ji -jii -jI -ju -juu -jU -je -jee -jE -jai -jo -joo -jO -jau - -sh -sha -shaa -shA -shi -shii -shI -shu -shuu -shU -she -shee -shE -shai -sho -shoo -shO -shau - -S -Sa -Saa -SA -Si -Sii -SI -Su -Suu -SU -Se -See -SE -Sai -So -Soo -SO -Sau - -h -ha -haa -hA -hi -hii -hI -hu -huu -hU -he -hee -hE -hai -ho -hoo -hO -hau - -x -xa -xaa -xA -xi -xii -xI -xu -xuu -xU -xe -xee -xE -xai -xo -xoo -xO -xau - -sri - +" Keymap file for the editing Tamil language files in TSCII encoding. +" +" Maintainer: Yegappan Lakshmanan (yegappan AT yahoo DOT com) +" Last updated: August 4, 2005 +" +" You will need a fixed width TSCII font to use this encoding. The +" Avarangal TSCII fixed width font (TSC_AvarangalFxd) is used to test +" this keymap. +" +" Visit http://www.tscii.org for more information about the TSCII +" encoding. +" +let b:keymap_name = "tamil_tscii" + +loadkeymap + +" Uyir (Vowels) letters +a +aa +A +i +ii +I +u +uu +U +e +ee +E +ai +o +oo +O +au +q + +" mey (Consonants) letters +k +ka +kaa +kA +ki +kii +kI +ku +kuu +kU +ke +kee +kE +kai +ko +koo +kO +kau + +g +ga +gaa +gA +gi +gii +gI +gu +guu +gU +ge +gee +gE +gai +go +goo +gO +gau + +ng +nga +ngaa +ngA +ngi +ngii +ngI +ngu +nguu +ngU +nge +ngee +ngE +ngai +ngo +ngoo +ngO +ngau + +ch +cha +chaa +chA +chi +chii +chI +chu +chuu +chU +che +chee +chE +chai +cho +choo +chO +chau + +s +sa +saa +sA +si +sii +sI +su +suu +sU +se +see +sE +sai +so +soo +sO +sau + +nj +nja +njaa +njA +nji +njii +njI +nju +njuu +njU +nje +njee +njE +njai +njo +njoo +njO +njau + +t +ta +taa +tA +ti +tii +tI +tu +tuu +tU +te +tee +tE +tai +to +too +tO +tau + +d +da +daa +dA +di +dii +dI +du +duu +dU +de +dee +dE +dai +do +doo +dO +dau + +N +Na +Naa +NA +Ni +Nii +NI +Nu +Nuu +NU +Ne +Nee +NE +Nai +No +Noo +NO +Nau + +th +tha +thaa +thA +thi +thii +thI +thu +thuu +thU +the +thee +thE +thai +tho +thoo +thO +thau + +w +wa +waa +wA +wi +wii +wI +wu +wuu +wU +we +wee +wE +wai +wo +woo +wO +wau + +n- +n-a +n-aa +n-A +n-i +n-ii +n-I +n-u +n-uu +n-U +n-e +n-ee +n-E +n-ai +n-o +n-oo +n-O +n-au + +p +pa +paa +pA +pi +pii +pI +pu +puu +pU +pe +pee +pE +pai +po +poo +pO +pau + +b +ba +baa +bA +bi +bii +bI +bu +buu +bU +be +bee +bE +bai +bo +boo +bO +bau + +m +ma +maa +mA +mi +mii +mI +mu +muu +mU +me +mee +mE +mai +mo +moo +mO +mau + +y +ya +yaa +yA +yi +yii +yI +yu +yuu +yU +ye +yee +yE +yai +yo +yoo +yO +yau + +r +ra +raa +rA +ri +rii +rI +ru +ruu +rU +re +ree +rE +rai +ro +roo +rO +rau + +l +la +laa +lA +li +lii +lI +lu +luu +lU +le +lee +lE +lai +lo +loo +lO +lau + +v +va +vaa +vA +vi +vii +vI +vu +vuu +vU +ve +vee +vE +vai +vo +voo +vO +vau + +z +za +zaa +zA +zi +zii +zI +zu +zuu +zU +ze +zee +zE +zai +zo +zoo +zO +zau + +L +La +Laa +LA +Li +Lii +LI +Lu +Luu +LU +Le +Lee +LE +Lai +Lo +Loo +LO +Lau + +R +Ra +Raa +RA +Ri +Rii +RI +Ru +Ruu +RU +Re +Ree +RE +Rai +Ro +Roo +RO +Rau + +n +na +naa +nA +ni +nii +nI +nu +nuu +nU +ne +nee +nE +nai +no +noo +nO +nau + +" Grantha letters +j +ja +jaa +jA +ji +jii +jI +ju +juu +jU +je +jee +jE +jai +jo +joo +jO +jau + +sh +sha +shaa +shA +shi +shii +shI +shu +shuu +shU +she +shee +shE +shai +sho +shoo +shO +shau + +S +Sa +Saa +SA +Si +Sii +SI +Su +Suu +SU +Se +See +SE +Sai +So +Soo +SO +Sau + +h +ha +haa +hA +hi +hii +hI +hu +huu +hU +he +hee +hE +hai +ho +hoo +hO +hau + +x +xa +xaa +xA +xi +xii +xI +xu +xuu +xU +xe +xee +xE +xai +xo +xoo +xO +xau + +sri + diff --git a/runtime/plugin/NetrwFileHandlers.vim b/runtime/plugin/NetrwFileHandlers.vim deleted file mode 100644 --- a/runtime/plugin/NetrwFileHandlers.vim +++ /dev/null @@ -1,312 +0,0 @@ -" NetrwFileHandlers: contains various extension-based file handlers for -" netrw's browsers' x command ("eXecute launcher") -" Author: Charles E. Campbell, Jr. -" Date: Aug 15, 2005 -" Version: 6 -" Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1 -" Permission is hereby granted to use and distribute this code, -" with or without modifications, provided that this copyright -" notice is copied with it. Like anything else that's free, -" NetrwFileHandlers.vim is provided *as is* and comes with no -" warranty of any kind, either expressed or implied. In no -" event will the copyright holder be liable for any damages -" resulting from the use of this software. -" -" Rom 6:23 (WEB) For the wages of sin is death, but the free gift of God {{{1 -" is eternal life in Christ Jesus our Lord. - -" --------------------------------------------------------------------- -" Load Once: {{{1 -if exists("g:loaded_NetrwFileHandlers") || &cp - finish -endif -let s:keepcpo= &cpo -set cpo&vim -let g:loaded_NetrwFileHandlers= "v6" - -" --------------------------------------------------------------------- -" NetrwFileHandler_html: handles html when the user hits "x" when the {{{1 -" cursor is atop a *.html file -fun! NetrwFileHandler_html(pagefile) -" call Dfunc("NetrwFileHandler_html(".a:pagefile.")") - - let page= substitute(a:pagefile,'^','file://','') - - if executable("mozilla") -" call Decho("executing !mozilla ".page) - exe "!mozilla \"".page.'"' - elseif executable("netscape") -" call Decho("executing !netscape ".page) - exe "!netscape \"".page.'"' - else -" call Dret("NetrwFileHandler_html 0") - return 0 - endif - -" call Dret("NetrwFileHandler_html 1") - return 1 -endfun - -" --------------------------------------------------------------------- -" NetrwFileHandler_htm: handles html when the user hits "x" when the {{{1 -" cursor is atop a *.htm file -fun! NetrwFileHandler_htm(pagefile) -" call Dfunc("NetrwFileHandler_htm(".a:pagefile.")") - - let page= substitute(a:pagefile,'^','file://','') - - if executable("mozilla") -" call Decho("executing !mozilla ".page) - exe "!mozilla \"".page.'"' - elseif executable("netscape") -" call Decho("executing !netscape ".page) - exe "!netscape \"".page.'"' - else -" call Dret("NetrwFileHandler_htm 0") - return 0 - endif - -" call Dret("NetrwFileHandler_htm 1") - return 1 -endfun - -" --------------------------------------------------------------------- -" NetrwFileHandler_jpg: {{{1 -fun! NetrwFileHandler_jpg(jpgfile) -" call Dfunc("NetrwFileHandler_jpg(jpgfile<".a:jpgfile.">)") - - if executable("gimp") - exe "silent! !gimp -s ".a:jpgfile - elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE") -" call Decho("silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".escape(a:jpgfile," []|'")) - exe "!".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:jpgfile.'"' - else -" call Dret("NetrwFileHandler_jpg 0") - return 0 - endif - -" call Dret("NetrwFileHandler_jpg 1") - return 1 -endfun - -" --------------------------------------------------------------------- -" NetrwFileHandler_gif: {{{1 -fun! NetrwFileHandler_gif(giffile) -" call Dfunc("NetrwFileHandler_gif(giffile<".a:giffile.">)") - - if executable("gimp") - exe "silent! !gimp -s ".a:giffile - elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE") - exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:giffile.'"' - else -" call Dret("NetrwFileHandler_gif 0") - return 0 - endif - -" call Dret("NetrwFileHandler_gif 1") - return 1 -endfun - -" --------------------------------------------------------------------- -" NetrwFileHandler_png: {{{1 -fun! NetrwFileHandler_png(pngfile) -" call Dfunc("NetrwFileHandler_png(pngfile<".a:pngfile.">)") - - if executable("gimp") - exe "silent! !gimp -s ".a:pngfile - elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE") - exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:pngfile.'"' - else -" call Dret("NetrwFileHandler_png 0") - return 0 - endif - -" call Dret("NetrwFileHandler_png 1") - return 1 -endfun - -" --------------------------------------------------------------------- -" NetrwFileHandler_pnm: {{{1 -fun! NetrwFileHandler_pnm(pnmfile) -" call Dfunc("NetrwFileHandler_pnm(pnmfile<".a:pnmfile.">)") - - if executable("gimp") - exe "silent! !gimp -s ".a:pnmfile - elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE") - exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:pnmfile.'"' - else -" call Dret("NetrwFileHandler_pnm 0") - return 0 - endif - -" call Dret("NetrwFileHandler_pnm 1") - return 1 -endfun - -" --------------------------------------------------------------------- -" NetrwFileHandler_bmp: visualize bmp files {{{1 -fun! NetrwFileHandler_bmp(bmpfile) -" call Dfunc("NetrwFileHandler_bmp(bmpfile<".a:bmpfile.">)") - - if executable("gimp") - exe "silent! !gimp -s ".a:bmpfile - elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE") - exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:bmpfile.'"' - else -" call Dret("NetrwFileHandler_bmp 0") - return 0 - endif - -" call Dret("NetrwFileHandler_bmp 1") - return 1 -endfun - -" --------------------------------------------------------------------- -" NetrwFileHandler_pdf: visualize pdf files {{{1 -fun! NetrwFileHandler_pdf(pdf) -" " call Dfunc("NetrwFileHandler_pdf(pdf<".a:pdf.">)") - if executable("gs") - exe 'silent! !gs "'.a:pdf.'"' - else -" " call Dret("NetrwFileHandler_pdf 0") - return 0 - endif - -" " call Dret("NetrwFileHandler_pdf 1") - return 1 -endfun - -" --------------------------------------------------------------------- -" NetrwFileHandler_doc: visualize doc files {{{1 -fun! NetrwFileHandler_doc(doc) -" " call Dfunc("NetrwFileHandler_doc(doc<".a:doc.">)") - - if executable("oowriter") - exe 'silent! !oowriter "'.a:doc.'"' - redraw! - else -" " call Dret("NetrwFileHandler_doc 0") - return 0 - endif - -" " call Dret("NetrwFileHandler_doc 1") - return 1 -endfun - -" --------------------------------------------------------------------- -" NetrwFileHandler_sxw: visualize sxw files {{{1 -fun! NetrwFileHandler_sxw(sxw) -" " call Dfunc("NetrwFileHandler_sxw(sxw<".a:sxw.">)") - - if executable("oowriter") - exe 'silent! !oowriter "'.a:sxw.'"' - redraw! - else -" " call Dret("NetrwFileHandler_sxw 0") - return 0 - endif - -" " call Dret("NetrwFileHandler_sxw 1") - return 1 -endfun - -" --------------------------------------------------------------------- -" NetrwFileHandler_xls: visualize xls files {{{1 -fun! NetrwFileHandler_xls(xls) -" " call Dfunc("NetrwFileHandler_xls(xls<".a:xls.">)") - - if executable("oocalc") - exe 'silent! !oocalc "'.a:xls.'"' - redraw! - else -" " call Dret("NetrwFileHandler_xls 0") - return 0 - endif - -" " call Dret("NetrwFileHandler_xls 1") - return 1 -endfun - -" --------------------------------------------------------------------- -" NetrwFileHandler_ps: handles PostScript files {{{1 -fun! NetrwFileHandler_ps(ps) -" call Dfunc("NetrwFileHandler_ps()") - if executable("gs") - exe "silent! !gs ".a:ps - redraw! - elseif executable("ghostscript") - exe "silent! !ghostscript ".a:ps - redraw! - elseif executable("ghostscript") - exe "silent! !ghostscript ".a:ps - redraw! - elseif executable("gswin32") - exe "silent! !gswin32 \"".a:ps.'"' - redraw! - else -" call Dret("NetrwFileHandler_ps 0") - return 0 - endif - -" call Dret("NetrwFileHandler_ps 1") - return 1 -endfun - -" --------------------------------------------------------------------- -" NetrwFileHandler_eps: handles encapsulated PostScript files {{{1 -fun! NetrwFileHandler_eps(eps) -" call Dfunc("NetrwFileHandler_ps()") - if executable("gs") - exe "silent! !gs ".a:eps - redraw! - elseif executable("ghostscript") - exe "silent! !ghostscript ".a:eps - redraw! - elseif executable("ghostscript") - exe "silent! !ghostscript ".a:eps - redraw! - elseif executable("gswin32") - exe "silent! !gswin32 \"".a:eps.'"' - redraw! - else -" call Dret("NetrwFileHandler_ps 0") - return 0 - endif -endfun - -" --------------------------------------------------------------------- -" NetrwFileHandler_fig: handles xfig files {{{1 -fun! NetrwFileHandler_fig(fig) -" call Dfunc("NetrwFileHandler_fig()") - if executable("xfig") - exe "silent! !xfig ".a:fig - redraw! - else -" call Dret("NetrwFileHandler_fig 0") - return 0 - endif - -" call Dret("NetrwFileHandler_fig 1") - return 1 -endfun - -" --------------------------------------------------------------------- -" NetrwFileHandler_obj: handles tgif's obj files {{{1 -fun! NetrwFileHandler_obj(obj) -" call Dfunc("NetrwFileHandler_obj()") - if has("unix") && executable("tgif") - exe "silent! !tgif ".a:obj - redraw! - else -" call Dret("NetrwFileHandler_obj 0") - return 0 - endif - -" call Dret("NetrwFileHandler_obj 1") - return 1 -endfun - -let &cpo= s:keepcpo -" --------------------------------------------------------------------- -" Modelines: {{{1 -" vim: ts=4 fdm=marker diff --git a/runtime/plugin/NetrwPlugin.vim b/runtime/plugin/NetrwPlugin.vim deleted file mode 100644 --- a/runtime/plugin/NetrwPlugin.vim +++ /dev/null @@ -1,156 +0,0 @@ -" netrw.vim: Handles file transfer and remote directory listing across a network -" PLUGIN PORTION -" Last Change: Aug 31, 2005 -" Maintainer: Charles E Campbell, Jr -" Version: 67 -" License: Vim License (see vim's :help license) -" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim -" Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1 -" Permission is hereby granted to use and distribute this code, -" with or without modifications, provided that this copyright -" notice is copied with it. Like anything else that's free, -" netrw.vim is provided *as is* and comes with no warranty -" of any kind, either expressed or implied. By using this -" plugin, you agree that in no event will the copyright -" holder be liable for any damages resulting from the use -" of this software. -" -" But be doers of the Word, and not only hearers, deluding your own selves {{{1 -" (James 1:22 RSV) -" =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - -" --------------------------------------------------------------------- -" Load Once: {{{1 -if exists("g:loaded_netrw") || &cp - finish -endif -if v:version < 600 - echoerr "***netrw*** doesn't support Vim version ".v:version - finish -endif -let g:loaded_netrw = "v67" -if v:version < 700 - let loaded_explorer = 1 -endif -let s:keepcpo= &cpo -set cpo&vim - -" --------------------------------------------------------------------- -" Public Interface: {{{1 - -" Local Browsing: {{{2 -augroup FileExplorer - au! - au BufEnter * call s:LocalBrowse(expand("")) -augroup END - -" Network Browsing Reading Writing: {{{2 -augroup Network - au! - if has("win32") || has("win95") || has("win64") || has("win16") - au BufReadCmd file://* exe "silent doau BufReadPre ".expand("")|exe 'e '.substitute(expand(""),"file:/*","","")|exe "silent doau BufReadPost ".expand("") - else - au BufReadCmd file:///* exe "silent doau BufReadPre ".expand("")|exe 'e /'.substitute(expand(""),"file:/*","","")|exe "silent doau BufReadPost ".expand("") - au BufReadCmd file://localhost/* exe "silent doau BufReadPre ".expand("")|exe 'e /'.substitute(expand(""),"file:/*","","")|exe "silent doau BufReadPost ".expand("") - endif - au BufReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "silent doau BufReadPre ".expand("")|exe "Nread 0r ".expand("")|exe "silent doau BufReadPost ".expand("") - au FileReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "silent doau BufReadPre ".expand("")|exe "Nread " .expand("")|exe "silent doau FileReadPost ".expand("") - au BufWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "silent doau BufWritePre ".expand("")|exe "Nwrite " .expand("")|exe "silent doau BufWritePost ".expand("") - au FileWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "silent doau BufWritePre ".expand("")|exe "'[,']Nwrite " .expand("")|exe "silent doau FileWritePost ".expand("") -augroup END - -" Commands: :Nread, :Nwrite, :NetUserPass {{{2 -com! -nargs=* Nread call netrw#NetSavePosn()call netrw#NetRead()call netrw#NetRestorePosn() -com! -range=% -nargs=* Nwrite call netrw#NetSavePosn(),call netrw#NetWrite()call netrw#NetRestorePosn() -com! -nargs=* NetUserPass call NetUserPass() - -" Commands: :Explore, :Sexplore, Hexplore, Vexplore {{{2 -com! -nargs=? -bar -bang -count=0 Explore call netrw#Explore(,0,0+0,) -com! -nargs=? -bar -bang -count=0 Sexplore call netrw#Explore(,1,0+0,) -com! -nargs=? -bar -bang -count=0 Hexplore call netrw#Explore(,1,2+0,) -com! -nargs=? -bar -bang -count=0 Vexplore call netrw#Explore(,1,4+0,) -com! -nargs=? -bar -bang Nexplore call netrw#Explore(-1,0,0,) -com! -nargs=? -bar -bang Pexplore call netrw#Explore(-2,0,0,) - -" Commands: NetrwSettings {{{2 -com! -nargs=0 NetrwSettings :call NetrwSettings#NetrwSettings() - -" --------------------------------------------------------------------- -" LocalBrowse: {{{2 -fun! s:LocalBrowse(dirname) - " unfortunate interaction -- debugging calls can't be used here; - " the BufEnter event causes triggering when attempts to write to - " the DBG buffer are made. - if isdirectory(a:dirname) - call netrw#DirBrowse(a:dirname) - endif - " not a directory, ignore it -endfun - -" --------------------------------------------------------------------- -" NetrwStatusLine: {{{1 -fun! NetrwStatusLine() -" let g:stlmsg= "Xbufnr=".w:netrw_explore_bufnr." bufnr=".bufnr(".")." Xline#".w:netrw_explore_line." line#".line(".") - 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") - let &stl= s:netrw_explore_stl - if exists("w:netrw_explore_bufnr")|unlet w:netrw_explore_bufnr|endif - if exists("w:netrw_explore_line")|unlet w:netrw_explore_line|endif - return "" - else - return "Match ".w:netrw_explore_mtchcnt." of ".w:netrw_explore_listlen - endif -endfun - -" ------------------------------------------------------------------------ -" NetUserPass: set username and password for subsequent ftp transfer {{{1 -" Usage: :call NetUserPass() -- will prompt for userid and password -" :call NetUserPass("uid") -- will prompt for password -" :call NetUserPass("uid","password") -- sets global userid and password -fun! NetUserPass(...) - - " get/set userid - if a:0 == 0 -" call Dfunc("NetUserPass(a:0<".a:0.">)") - if !exists("g:netrw_uid") || g:netrw_uid == "" - " via prompt - let g:netrw_uid= input('Enter username: ') - endif - else " from command line -" call Dfunc("NetUserPass(a:1<".a:1.">) {") - let g:netrw_uid= a:1 - endif - - " get password - if a:0 <= 1 " via prompt -" call Decho("a:0=".a:0." case <=1:") - let g:netrw_passwd= inputsecret("Enter Password: ") - else " from command line -" call Decho("a:0=".a:0." case >1: a:2<".a:2.">") - let g:netrw_passwd=a:2 - endif -" call Dret("NetUserPass") -endfun - -" ------------------------------------------------------------------------ -" NetReadFixup: this sort of function is typically written by the user {{{1 -" to handle extra junk that their system's ftp dumps -" into the transfer. This function is provided as an -" example and as a fix for a Windows 95 problem: in my -" experience, win95's ftp always dumped four blank lines -" at the end of the transfer. -if has("win95") && g:netrw_win95ftp - fun! NetReadFixup(method, line1, line2) -" call Dfunc("NetReadFixup(method<".a:method."> line1=".a:line1." line2=".a:line2.")") - if method == 3 " ftp (no <.netrc>) - let fourblanklines= line2 - 3 - silent fourblanklines.",".line2."g/^\s*/d" - endif -" call Dret("NetReadFixup") - endfun -endif - -let &cpo= s:keepcpo -unlet s:keepcpo -" ------------------------------------------------------------------------ -" Modelines: {{{1 -" vim:ts=8 fdm=marker diff --git a/runtime/plugin/NetrwSettings.vim b/runtime/plugin/NetrwSettings.vim deleted file mode 100644 --- a/runtime/plugin/NetrwSettings.vim +++ /dev/null @@ -1,157 +0,0 @@ -" NetrwSettings.vim: makes netrw settings simpler -" Last Change: Aug 16, 2005 -" Maintainer: Charles E Campbell, Jr -" Version: 3 -" Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1 -" Permission is hereby granted to use and distribute this code, -" with or without modifications, provided that this copyright -" notice is copied with it. Like anything else that's free, -" NetrwSettings.vim is provided *as is* and comes with no -" warranty of any kind, either expressed or implied. By using -" this plugin, you agree that in no event will the copyright -" holder be liable for any damages resulting from the use -" of this software. -" -" Mat 4:23 (WEB) Jesus went about in all Galilee, teaching in their {{{1 -" synagogues, preaching the gospel of the kingdom, and healing -" every disease and every sickness among the people. -" Load Once: {{{1 -if exists("g:loaded_NetrwSettings") || &cp - finish -endif -let g:loaded_NetrwSettings = "v3" - -" --------------------------------------------------------------------- -" NetrwSettings: {{{1 -fun! NetrwSettings#NetrwSettings() - " this call is here largely just to insure that netrw has been loaded - call netrw#NetSavePosn() - - above wincmd s - enew - setlocal noswapfile bh=wipe - set ft=vim - file Netrw\ Settings - - " these variables have the following default effects when they don't - " exist (ie. have not been set by the user in his/her .vimrc) - if !exists("g:netrw_longlist") - let g:netrw_longlist= 0 - let g:netrw_list_cmd= "ssh HOSTNAME ls -FLa" - endif - if !exists("g:netrw_silent") - let g:netrw_silent= 0 - endif - if !exists("g:netrw_use_nt_rcp") - let g:netrw_use_nt_rcp= 0 - endif - if !exists("g:netrw_ftp") - let g:netrw_ftp= 0 - endif - if !exists("g:netrw_ignorenetrc") - let g:netrw_ignorenetrc= 0 - endif - - put ='+ ---------------------------------------------' - put ='+ NetrwSettings: (by Charles E. Campbell, Jr.)' - put ='+ Press ? with cursor atop any line for help ' - put ='+ ---------------------------------------------' - let s:netrw_settings_stop= line(".") - - put ='' - put ='+ Netrw Protocol Commands' - put = 'let g:netrw_dav_cmd = '.g:netrw_dav_cmd - put = 'let g:netrw_fetch_cmd = '.g:netrw_fetch_cmd - put = 'let g:netrw_ftp_cmd = '.g:netrw_ftp_cmd - put = 'let g:netrw_http_cmd = '.g:netrw_http_cmd - put = 'let g:netrw_rcp_cmd = '.g:netrw_rcp_cmd - put = 'let g:netrw_rsync_cmd = '.g:netrw_rsync_cmd - put = 'let g:netrw_scp_cmd = '.g:netrw_scp_cmd - put = 'let g:netrw_sftp_cmd = '.g:netrw_sftp_cmd - let s:netrw_protocol_stop= line(".") - put = '' - - put ='+Netrw Transfer Control' - put = 'let g:netrw_cygwin = '.g:netrw_cygwin - put = 'let g:netrw_ftp = '.g:netrw_ftp - put = 'let g:netrw_ftpmode = '.g:netrw_ftpmode - put = 'let g:netrw_ignorenetrc = '.g:netrw_ignorenetrc - put = 'let g:netrw_use_nt_rcp = '.g:netrw_use_nt_rcp - put = 'let g:netrw_win95ftp = '.g:netrw_win95ftp - let s:netrw_xfer_stop= line(".") - - put = '' - put ='+ Netrw Browser Control' - put = 'let g:netrw_alto = '.g:netrw_alto - put = 'let g:netrw_altv = '.g:netrw_altv - put = 'let g:netrw_dirhistmax = '.g:netrw_dirhistmax - put = 'let g:netrw_ftp_browse_reject = '.g:netrw_ftp_browse_reject - put = 'let g:netrw_ftp_list_cmd = '.g:netrw_ftp_list_cmd - put = 'let g:netrw_hide = '.g:netrw_hide - put = 'let g:netrw_keepdir = '.g:netrw_keepdir - put = 'let g:netrw_list_cmd = '.g:netrw_list_cmd - put = 'let g:netrw_list_cmd = '.g:netrw_list_cmd - put = 'let g:netrw_list_hide = '.g:netrw_list_hide - put = 'let g:netrw_local_mkdir = '.g:netrw_local_mkdir - put = 'let g:netrw_local_rmdir = '.g:netrw_local_rmdir - put = 'let g:netrw_longlist = '.g:netrw_longlist - put = 'let g:netrw_maxfilenamelen = '.g:netrw_maxfilenamelen - put = 'let g:netrw_mkdir_cmd = '.g:netrw_mkdir_cmd - put = 'let g:netrw_rename_cmd = '.g:netrw_rename_cmd - put = 'let g:netrw_rm_cmd = '.g:netrw_rm_cmd - put = 'let g:netrw_rmdir_cmd = '.g:netrw_rmdir_cmd - put = 'let g:netrw_rmf_cmd = '.g:netrw_rmf_cmd - put = 'let g:netrw_silent = '.g:netrw_silent - put = 'let g:netrw_sort_by = '.g:netrw_sort_by - put = 'let g:netrw_sort_direction = '.g:netrw_sort_direction - put = 'let g:netrw_sort_sequence = '.g:netrw_sort_sequence - put = 'let g:netrw_ssh_browse_reject = '.g:netrw_ssh_browse_reject - put = 'let g:netrw_timefmt = '.g:netrw_timefmt - put = 'let g:netrw_winsize = '.g:netrw_winsize - - put ='' - put ='+ For help, place cursor on line and press ?' - - 1d - silent %s/^+/"/e - res 99 - silent %s/= \([^0-9].*\)$/= '\1'/e - silent %s/= $/= ''/e - 1 - - set nomod - - map ? :call NetrwSettingHelp() - let tmpfile= tempname() - exe 'au BufWriteCmd Netrw\ Settings silent w! '.tmpfile.'|so '.tmpfile.'|call delete("'.tmpfile.'")|set nomod' -endfun - -" --------------------------------------------------------------------- -" NetrwSettingHelp: {{{2 -fun! NetrwSettingHelp() -" call Dfunc("NetrwSettingHelp()") - let curline = getline(".") - if curline =~ '=' - let varhelp = substitute(curline,'^\s*let ','','e') - let varhelp = substitute(varhelp,'\s*=.*$','','e') -" call Decho("trying help ".varhelp) - try - exe "he ".varhelp - catch /^Vim\%((\a\+)\)\=:E149/ - echo "***sorry*** no help available for <".varhelp.">" - endtry - elseif line(".") < s:netrw_settings_stop - he netrw-settings - elseif line(".") < s:netrw_protocol_stop - he netrw-externapp - elseif line(".") < s:netrw_xfer_stop - he netrw-variables - else - he netrw-browse-var - endif -" call Dret("NetrwSettingHelp") -endfun - -" --------------------------------------------------------------------- -" Modelines: {{{1 -" vim:ts=8 fdm=marker diff --git a/src/ex_cmds.c b/src/ex_cmds.c --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -1697,8 +1697,8 @@ write_viminfo(file, forceit) */ st_old.st_dev = st_old.st_ino = 0; st_old.st_mode = 0600; - if (mch_stat((char *)fname, &st_old) == 0 && getuid() && - !(st_old.st_uid == getuid() + if (mch_stat((char *)fname, &st_old) == 0 && getuid() + && !(st_old.st_uid == getuid() ? (st_old.st_mode & 0200) : (st_old.st_gid == getgid() ? (st_old.st_mode & 0020) @@ -1762,8 +1762,8 @@ write_viminfo(file, forceit) * link, or file name-length reached. Try again with * shortname set. */ - if (!shortname && st_new.st_dev == st_old.st_dev && - st_new.st_ino == st_old.st_ino) + if (!shortname && st_new.st_dev == st_old.st_dev + && st_new.st_ino == st_old.st_ino) { vim_free(tempname); tempname = NULL; @@ -1806,7 +1806,12 @@ write_viminfo(file, forceit) * protection same as original file, but strip s-bit. */ fd = mch_open((char *)tempname, O_CREAT|O_EXTRA|O_EXCL|O_WRONLY|O_NOFOLLOW, - (int)((st_old.st_mode & 0777) | 0600)); +#ifdef UNIX + (int)((st_old.st_mode & 0777) | 0600) +#else + 0600 /* r&w for user only */ +#endif + ); if (fd < 0) fp_out = NULL; else