From 8df0536f444108182586180a9b655c62ab1b1fcc Mon Sep 17 00:00:00 2001 From: Bjorn Winckler Date: Fri, 7 Nov 2008 23:15:39 +0100 Subject: [PATCH] Update runtime files --- runtime/autoload/netrw.vim | 572 +++++++++++++++++++++------------ runtime/autoload/netrwFileHandlers.vim | 66 ++-- runtime/autoload/netrwSettings.vim | 8 +- runtime/doc/cmdline.txt | 6 +- runtime/doc/eval.txt | 6 +- runtime/doc/gui.txt | 4 +- runtime/doc/message.txt | 4 +- runtime/doc/motion.txt | 8 +- runtime/doc/options.txt | 17 +- runtime/doc/pi_netrw.txt | 199 ++++++++---- runtime/doc/starting.txt | 15 +- runtime/doc/syntax.txt | 5 +- runtime/doc/tags | 6 +- runtime/doc/todo.txt | 68 +++- runtime/doc/various.txt | 6 +- runtime/filetype.vim | 18 +- runtime/ftplugin/abaqus.vim | 52 +-- runtime/getdos.aap | 50 +-- runtime/getunix.aap | 66 ++-- runtime/plugin/netrwPlugin.vim | 11 +- runtime/syntax/fortran.vim | 4 +- runtime/syntax/java.vim | 6 +- runtime/syntax/logtalk.vim | 8 +- runtime/syntax/netrw.vim | 2 +- runtime/tutor/tutor.hu | 89 ++--- runtime/tutor/tutor.hu.cp1250 | 89 ++--- runtime/tutor/tutor.hu.utf-8 | 89 ++--- 27 files changed, 921 insertions(+), 553 deletions(-) diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim index 1f7ef389..0bd0283c 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: Sep 02, 2008 -" Version: 133 +" Date: Oct 23, 2008 +" Version: 134 " Maintainer: Charles E Campbell, Jr " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim " Copyright: Copyright (C) 1999-2008 Charles E. Campbell, Jr. {{{1 @@ -22,12 +22,18 @@ if &cp || exists("g:loaded_netrw") finish endif +let g:loaded_netrw = "v134" +if v:version < 702 + echohl WarningMsg + echo "***warning*** this version of netrw needs vim 7.2" + echohl Normal + finish +endif if !exists("s:NOTE") let s:NOTE = 0 let s:WARNING = 1 let s:ERROR = 2 endif -let g:loaded_netrw = "v133" " sanity checks if v:version < 700 @@ -46,11 +52,8 @@ setlocal cpo&vim " --------------------------------------------------------------------- " Netrw Constants: {{{2 -if !exists("g:NETRW_BOOKMARKMAX") - let g:NETRW_BOOKMARKMAX= 0 -endif -if !exists("g:NETRW_DIRHIST_CNT") - let g:NETRW_DIRHIST_CNT= 0 +if !exists("g:netrw_dirhist_cnt") + let g:netrw_dirhist_cnt= 0 endif if !exists("s:LONGLIST") let s:THINLIST = 0 @@ -63,7 +66,13 @@ endif " --------------------------------------------------------------------- " Default values for netrw's global protocol variables {{{2 if !exists("g:netrw_dav_cmd") + if executable("cadaver") let g:netrw_dav_cmd = "cadaver" + elseif executable("curl") + let g:netrw_dav_cmd = "curl" + else + let g:netrw_dav_cmd = "" + endif endif if !exists("g:netrw_fetch_cmd") if executable("fetch") @@ -78,16 +87,29 @@ endif if !exists("g:netrw_http_cmd") if executable("elinks") let g:netrw_http_cmd = "elinks" - let g:netrw_http_xcmd= "-dump >" + if !exists("g:netrw_http_xcmd") + let g:netrw_http_xcmd= "-dump >" + endif elseif executable("links") let g:netrw_http_cmd = "links" - let g:netrw_http_xcmd= "-dump >" + if !exists("g:netrw_http_xcmd") + let g:netrw_http_xcmd= "-dump >" + endif elseif executable("curl") - let g:netrw_http_cmd = "curl -o" + let g:netrw_http_cmd = "curl" + if !exists("g:netrw_http_xcmd") + let g:netrw_http_xcmd= "-o" + endif elseif executable("wget") - let g:netrw_http_cmd = "wget -q -O" + let g:netrw_http_cmd = "wget" + if !exists("g:netrw_http_xcmd") + let g:netrw_http_xcmd= "-q -O" + endif elseif executable("fetch") - let g:netrw_http_cmd = "fetch -o" + let g:netrw_http_cmd = "fetch" + if !exists("g:netrw_http_xcmd") + let g:netrw_http_xcmd= "-o" + endif else let g:netrw_http_cmd = "" endif @@ -158,8 +180,8 @@ if !exists("g:netrw_cursorline") let s:netrw_usercuc = &cursorcolumn endif " Default values - d-g ---------- {{{3 -if !exists("g:NETRW_DIRHIST_CNT") - let g:NETRW_DIRHIST_CNT= 0 +if !exists("g:netrw_dirhist_cnt") + let g:netrw_dirhist_cnt= 0 endif if !exists("g:netrw_decompress") let g:netrw_decompress= { ".gz" : "gunzip" , ".bz2" : "bunzip2" , ".zip" : "unzip" , ".tar" : "tar -xf"} @@ -518,6 +540,7 @@ fun! s:NetrwSafeOptions() setlocal fo=nroql2 setlocal tw=0 setlocal report=10000 + setlocal isk+=@ isk+=* isk+=/ if g:netrw_use_noswf && has("win32") && !has("win95") setlocal noswf endif @@ -873,28 +896,38 @@ fun! netrw#NetRead(mode,...) setlocal ro "......................................... - " cadaver: NetRead Method #6 {{{3 + " dav: NetRead Method #6 {{{3 elseif b:netrw_method == 6 " call Decho("read via cadaver (method #6)") - " Construct execution string (four lines) which will be passed through filter - let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape) - new - setlocal ff=unix - if exists("g:netrw_port") && g:netrw_port != "" - put ='open '.g:netrw_machine.' '.g:netrw_port - else - put ='open '.g:netrw_machine + if !executable(g:netrw_dav_cmd) + call netrw#ErrorMsg(s:ERROR,g:netrw_dav_cmd." is not executable",73) +" call Dret("netrw#NetRead : ".g:netrw_dav_cmd." not executable") + return endif - put ='user '.g:netrw_uid.' '.s:netrw_passwd - put ='get '.netrw_fname.' '.tmpfile - put ='quit' + if g:netrw_dav_cmd =~ "curl" +" call Decho("exe ".s:netrw_silentxfer."!".g:netrw_dav_cmd." ".shellescape("dav://".g:netrw_machine.b:netrw_fname,1)." ".shellescape(tmpfile,1)) + exe s:netrw_silentxfer."!".g:netrw_dav_cmd." ".shellescape("dav://".g:netrw_machine.b:netrw_fname,1)." ".shellescape(tmpfile,1) + else + " Construct execution string (four lines) which will be passed through filter + let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape) + new + setlocal ff=unix + if exists("g:netrw_port") && g:netrw_port != "" + put ='open '.g:netrw_machine.' '.g:netrw_port + else + put ='open '.g:netrw_machine + endif + put ='user '.g:netrw_uid.' '.s:netrw_passwd + put ='get '.netrw_fname.' '.tmpfile + put ='quit' - " perform cadaver operation: - norm! 1Gdd + " perform cadaver operation: + norm! 1Gdd " call Decho("executing: %!".g:netrw_dav_cmd) - exe s:netrw_silentxfer."%!".g:netrw_dav_cmd - bd! + exe s:netrw_silentxfer."%!".g:netrw_dav_cmd + bd! + endif let result = s:NetrwGetFile(readcmd, tmpfile, b:netrw_method) let b:netrw_lastfile = choice @@ -1444,7 +1477,7 @@ endfun " 3: ftp + machine, id, password, and [path]filename " 4: scp " 5: http (wget) -" 6: cadaver +" 6: dav " 7: rsync " 8: fetch " 9: sftp @@ -1479,7 +1512,7 @@ fun! s:NetrwMethod(choice) " rcphf : [user@]host:filename Use rcp " scpurm : scp://[user@]host[[#:]port]/filename Use scp " httpurm : http://[user@]host/filename Use wget - " davurm : dav[s]://host[:port]/path Use cadaver + " davurm : dav[s]://host[:port]/path Use cadaver/curl " rsyncurm : rsync://host[:port]/path Use rsync " fetchurm : fetch://[user@]host[:http]/filename Use fetch (defaults to ftp, override for http) " sftpurm : sftp://[user@]host/filename Use scp @@ -1726,7 +1759,7 @@ fun! s:BrowserMaps(islocal) nnoremap :call netrw#LocalBrowseCheck(NetrwBrowseChgDir(1,NetrwGetWord())) nnoremap - :exe "norm! 0"call netrw#LocalBrowseCheck(NetrwBrowseChgDir(1,'../')) nnoremap a :call NetrwHide(1) - nnoremap mb :call NetrwBookmarkDir(0,b:netrw_curdir) + nnoremap mb :call NetrwBookHistHandler(0,b:netrw_curdir) nnoremap mc :call NetrwMarkFileCopy(1) nnoremap md :call NetrwMarkFileDiff(1) nnoremap me :call NetrwMarkFileEdit(1) @@ -1742,7 +1775,7 @@ fun! s:BrowserMaps(islocal) nnoremap mu :call NetrwUnMarkFile(1) nnoremap mx :call NetrwMarkFileExe(1) nnoremap mz :call NetrwMarkFileCompress(1) - nnoremap gb :call NetrwBookmarkDir(1,b:netrw_curdir) + nnoremap gb :call NetrwBookHistHandler(1,b:netrw_curdir) nnoremap gh :call NetrwHidden(1) nnoremap c :exe "keepjumps lcd ".fnameescape(b:netrw_curdir) nnoremap C :let g:netrw_chgwin= winnr() @@ -1752,15 +1785,15 @@ fun! s:BrowserMaps(islocal) nnoremap O :call NetrwObtain(1) nnoremap p :call NetrwPreview(NetrwBrowseChgDir(1,NetrwGetWord(),1)) nnoremap P :call NetrwPrevWinOpen(1) - nnoremap qb :call NetrwBookmarkDir(2,b:netrw_curdir) - nnoremap mB :call NetrwBookmarkDir(6,b:netrw_curdir) + nnoremap qb :call NetrwBookHistHandler(2,b:netrw_curdir) + nnoremap mB :call NetrwBookHistHandler(6,b:netrw_curdir) nnoremap qf :call NetrwFileInfo(1,NetrwGetWord()) nnoremap r :let g:netrw_sort_direction= (g:netrw_sort_direction =~ 'n')? 'r' : 'n'exe "norm! 0"call NetrwRefresh(1,NetrwBrowseChgDir(1,'./')) nnoremap s :call NetrwSortStyle(1) nnoremap S :call NetSortSequence(1) nnoremap t :call NetrwSplit(4) - nnoremap u :call NetrwBookmarkDir(4,expand("%")) - nnoremap U :call NetrwBookmarkDir(5,expand("%")) + nnoremap u :call NetrwBookHistHandler(4,expand("%")) + nnoremap U :call NetrwBookHistHandler(5,expand("%")) nnoremap v :call NetrwSplit(5) nnoremap x :call netrw#NetrwBrowseX(NetrwBrowseChgDir(1,NetrwGetWord(),0),0)" nnoremap % :call NetrwOpenFile(1) @@ -1802,7 +1835,7 @@ fun! s:BrowserMaps(islocal) nnoremap :call NetrwRefresh(0,NetrwBrowseChgDir(0,'./')) nnoremap - :exe "norm! 0"call NetrwBrowse(0,NetrwBrowseChgDir(0,'../')) nnoremap a :call NetrwHide(0) - nnoremap mb :call NetrwBookmarkDir(0,b:netrw_curdir) + nnoremap mb :call NetrwBookHistHandler(0,b:netrw_curdir) nnoremap mc :call NetrwMarkFileCopy(0) nnoremap md :call NetrwMarkFileDiff(0) nnoremap me :call NetrwMarkFileEdit(0) @@ -1818,7 +1851,7 @@ fun! s:BrowserMaps(islocal) nnoremap mu :call NetrwUnMarkFile(0) nnoremap mx :call NetrwMarkFileExe(0) nnoremap mz :call NetrwMarkFileCompress(0) - nnoremap gb :call NetrwBookmarkDir(1,b:netrw_cur) + nnoremap gb :call NetrwBookHistHandler(1,b:netrw_cur) nnoremap gh :call NetrwHidden(0) nnoremap C :let g:netrw_chgwin= winnr() nnoremap i :call NetrwListStyle(0) @@ -1826,15 +1859,15 @@ fun! s:BrowserMaps(islocal) nnoremap O :call NetrwObtain(0) nnoremap p :call NetrwPreview(NetrwBrowseChgDir(1,NetrwGetWord(),1)) nnoremap P :call NetrwPrevWinOpen(0) - nnoremap qb :call NetrwBookmarkDir(2,b:netrw_curdir) - nnoremap mB :call NetrwBookmarkDir(6,b:netrw_curdir) + nnoremap qb :call NetrwBookHistHandler(2,b:netrw_curdir) + nnoremap mB :call NetrwBookHistHandler(6,b:netrw_curdir) nnoremap qf :call NetrwFileInfo(0,NetrwGetWord()) nnoremap r :let g:netrw_sort_direction= (g:netrw_sort_direction =~ 'n')? 'r' : 'n'exe "norm! 0"call NetrwBrowse(0,NetrwBrowseChgDir(0,'./')) nnoremap s :call NetrwSortStyle(0) nnoremap S :call NetSortSequence(0) nnoremap t :call NetrwSplit(1) - nnoremap u :call NetrwBookmarkDir(4,b:netrw_curdir) - nnoremap U :call NetrwBookmarkDir(5,b:netrw_curdir) + nnoremap u :call NetrwBookHistHandler(4,b:netrw_curdir) + nnoremap U :call NetrwBookHistHandler(5,b:netrw_curdir) nnoremap v :call NetrwSplit(2) nnoremap x :call netrw#NetrwBrowseX(NetrwBrowseChgDir(0,NetrwGetWord()),1) nnoremap % :call NetrwOpenFile(0) @@ -1884,7 +1917,7 @@ fun! s:ExplorePatHls(pattern) endfun " --------------------------------------------------------------------- -" s:NetrwBookmarkDir: {{{2 +" s:NetrwBookHistHandler: {{{2 " 0: (user: ) bookmark current directory " 1: (user: ) change to the bookmarked directory " 2: (user: ) list bookmarks @@ -1892,32 +1925,27 @@ endfun " 4: (user: ) go up (previous) bookmark " 5: (user: ) go down (next) bookmark " 6: (user: ) delete bookmark -fun! s:NetrwBookmarkDir(chg,curdir) -" call Dfunc("NetrwBookmarkDir(chg=".a:chg." curdir<".a:curdir.">) cnt=".v:count." bookmarkcnt=".g:NETRW_BOOKMARKMAX." histcnt=".g:NETRW_DIRHIST_CNT." bookmax=".g:NETRW_BOOKMARKMAX." histmax=".g:netrw_dirhistmax) +fun! s:NetrwBookHistHandler(chg,curdir) +" call Dfunc("NetrwBookHistHandler(chg=".a:chg." curdir<".a:curdir.">) cnt=".v:count." histcnt=".g:netrw_dirhist_cnt." histmax=".g:netrw_dirhistmax) if a:chg == 0 " bookmark the current directory " call Decho("(user: ) bookmark the current directory") - if v:count > 0 - " handle bookmark# specified via the count - let g:NETRW_BOOKMARKDIR_{v:count}= a:curdir - if !exists("g:NETRW_BOOKMARKMAX") - let g:NETRW_BOOKMARKMAX= v:count - elseif v:count > g:NETRW_BOOKMARKMAX - let g:NETRW_BOOKMARKMAX= v:count - endif - else - " handle no count specified - let g:NETRW_BOOKMARKMAX = g:NETRW_BOOKMARKMAX + 1 - let g:NETRW_BOOKMARKDIR_{g:NETRW_BOOKMARKMAX} = a:curdir + if !exists("g:netrw_bookmarklist") + let g:netrw_bookmarklist= [] + endif + if index(g:netrw_bookmarklist,a:curdir) == -1 + " curdir not currently in g:netrw_bookmarklist, so include it + call add(g:netrw_bookmarklist,a:curdir) + call sort(g:netrw_bookmarklist) endif echo "bookmarked the current directory" elseif a:chg == 1 " change to the bookmarked directory -" call Decho("(user: ) change to the bookmarked directory") - if exists("g:NETRW_BOOKMARKDIR_{v:count}") - exe "e ".fnameescape(g:NETRW_BOOKMARKDIR_{v:count}) +" call Decho("(user: <".v:count."mb>) change to the bookmarked directory") + if exists("g:netrw_bookmarklist[v:count-1]") + exe "e ".fnameescape(g:netrw_bookmarklist[v:count-1]) else echomsg "Sorry, bookmark#".v:count." doesn't exist!" endif @@ -1927,29 +1955,27 @@ fun! s:NetrwBookmarkDir(chg,curdir) let didwork= 0 " list user's bookmarks " call Decho("(user: ) list user's bookmarks") - if exists("g:NETRW_BOOKMARKMAX") -" call Decho("list bookmarks [0,".g:NETRW_BOOKMARKMAX."]") - let cnt= 0 - while cnt <= g:NETRW_BOOKMARKMAX - if exists("g:NETRW_BOOKMARKDIR_{cnt}") -" call Decho("Netrw Bookmark#".cnt.": ".g:NETRW_BOOKMARKDIR_{cnt}) - echo "Netrw Bookmark#".cnt.": ".g:NETRW_BOOKMARKDIR_{cnt} - let didwork= 1 - endif - let cnt= cnt + 1 - endwhile + if exists("g:netrw_bookmarklist") +" call Decho('list '.len(g:netrw_bookmarklist).' bookmarks') + let cnt= 1 + for bmd in g:netrw_bookmarklist +" call Decho("Netrw Bookmark#".cnt.": ".g:netrw_bookmarklist[cnt-1]) + echo "Netrw Bookmark#".cnt.": ".g:netrw_bookmarklist[cnt-1] + let didwork = 1 + let cnt = cnt + 1 + endfor endif " list directory history - let cnt = g:NETRW_DIRHIST_CNT + let cnt = g:netrw_dirhist_cnt let first = 1 let histcnt = 0 - while ( first || cnt != g:NETRW_DIRHIST_CNT ) -" call Decho("first=".first." cnt=".cnt." dirhist_cnt=".g:NETRW_DIRHIST_CNT) + while ( first || cnt != g:netrw_dirhist_cnt ) +" call Decho("first=".first." cnt=".cnt." dirhist_cnt=".g:netrw_dirhist_cnt) let histcnt= histcnt + 1 - if exists("g:NETRW_DIRHIST_{cnt}") -" call Decho("Netrw History#".histcnt.": ".g:NETRW_DIRHIST_{cnt}) - echo "Netrw History#".histcnt.": ".g:NETRW_DIRHIST_{cnt} + if exists("g:netrw_dirhist_{cnt}") +" call Decho("Netrw History#".histcnt.": ".g:netrw_dirhist_{cnt}) + echo "Netrw History#".histcnt.": ".g:netrw_dirhist_{cnt} let didwork= 1 endif let first = 0 @@ -1965,22 +1991,21 @@ fun! s:NetrwBookmarkDir(chg,curdir) elseif a:chg == 3 " saves most recently visited directories (when they differ) " call Decho("(browsing) record curdir history") - if !exists("g:NETRW_DIRHIST_0") || g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT} != a:curdir - let g:NETRW_DIRHIST_CNT= ( g:NETRW_DIRHIST_CNT + 1 ) % g:netrw_dirhistmax -" let g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}= substitute(a:curdir,'[/\\]$','','e') - let g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}= a:curdir -" call Decho("save dirhist#".g:NETRW_DIRHIST_CNT."<".g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}.">") + if !exists("g:netrw_dirhist_cnt") || !exists("g:netrw_dirhist_{g:netrw_dirhist_cnt}") || g:netrw_dirhist_{g:netrw_dirhist_cnt} != a:curdir + let g:netrw_dirhist_cnt = ( g:netrw_dirhist_cnt + 1 ) % g:netrw_dirhistmax + let g:netrw_dirhist_{g:netrw_dirhist_cnt} = a:curdir +" call Decho("save dirhist#".g:netrw_dirhist_cnt."<".g:netrw_dirhist_{g:netrw_dirhist_cnt}.">") endif elseif a:chg == 4 " u: change to the previous directory stored on the history list " call Decho("(user: ) chg to prev dir from history") - let g:NETRW_DIRHIST_CNT= ( g:NETRW_DIRHIST_CNT - 1 ) % g:netrw_dirhistmax - if g:NETRW_DIRHIST_CNT < 0 - let g:NETRW_DIRHIST_CNT= g:NETRW_DIRHIST_CNT + g:netrw_dirhistmax + let g:netrw_dirhist_cnt= ( g:netrw_dirhist_cnt - 1 ) % g:netrw_dirhistmax + if g:netrw_dirhist_cnt < 0 + let g:netrw_dirhist_cnt= g:netrw_dirhist_cnt + g:netrw_dirhistmax endif - if exists("g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}") -" call Decho("changedir u#".g:NETRW_DIRHIST_CNT."<".g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}.">") + if exists("g:netrw_dirhist_{g:netrw_dirhist_cnt}") +" call Decho("changedir u#".g:netrw_dirhist_cnt."<".g:netrw_dirhist_{g:netrw_dirhist_cnt}.">") if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && exists("b:netrw_curdir") setlocal ma noro " call Decho("setlocal ma noro") @@ -1988,19 +2013,19 @@ fun! s:NetrwBookmarkDir(chg,curdir) setlocal nomod " call Decho("setlocal nomod") endif -" " call Decho("exe e! ".fnameescape(g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT})) - exe "e! ".fnameescape(g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}) +" " call Decho("exe e! ".fnameescape(g:netrw_dirhist_{g:netrw_dirhist_cnt})) + exe "e! ".fnameescape(g:netrw_dirhist_{g:netrw_dirhist_cnt}) else - let g:NETRW_DIRHIST_CNT= ( g:NETRW_DIRHIST_CNT + 1 ) % g:netrw_dirhistmax + let g:netrw_dirhist_cnt= ( g:netrw_dirhist_cnt + 1 ) % g:netrw_dirhistmax echo "Sorry, no predecessor directory exists yet" endif elseif a:chg == 5 " U: change to the subsequent directory stored on the history list " call Decho("(user: ) chg to next dir from history") - let g:NETRW_DIRHIST_CNT= ( g:NETRW_DIRHIST_CNT + 1 ) % g:netrw_dirhistmax - if exists("g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}") -" call Decho("changedir U#".g:NETRW_DIRHIST_CNT."<".g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}.">") + let g:netrw_dirhist_cnt= ( g:netrw_dirhist_cnt + 1 ) % g:netrw_dirhistmax + if exists("g:netrw_dirhist_{g:netrw_dirhist_cnt}") +" call Decho("changedir U#".g:netrw_dirhist_cnt."<".g:netrw_dirhist_{g:netrw_dirhist_cnt}.">") if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && exists("b:netrw_curdir") setlocal ma noro " call Decho("setlocal ma noro") @@ -2009,57 +2034,103 @@ fun! s:NetrwBookmarkDir(chg,curdir) setlocal nomod " call Decho("setlocal nomod") endif -" call Decho("exe e! ".fnameescape(g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT})) - exe "e! ".fnameescape(g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}) +" call Decho("exe e! ".fnameescape(g:netrw_dirhist_{g:netrw_dirhist_cnt})) + exe "e! ".fnameescape(g:netrw_dirhist_{g:netrw_dirhist_cnt}) else - let g:NETRW_DIRHIST_CNT= ( g:NETRW_DIRHIST_CNT - 1 ) % g:netrw_dirhistmax - if g:NETRW_DIRHIST_CNT < 0 - let g:NETRW_DIRHIST_CNT= g:NETRW_DIRHIST_CNT + g:netrw_dirhistmax + let g:netrw_dirhist_cnt= ( g:netrw_dirhist_cnt - 1 ) % g:netrw_dirhistmax + if g:netrw_dirhist_cnt < 0 + let g:netrw_dirhist_cnt= g:netrw_dirhist_cnt + g:netrw_dirhistmax endif echo "Sorry, no successor directory exists yet" endif elseif a:chg == 6 - if v:count > 0 && v:count == g:NETRW_BOOKMARKMAX - " delete the v:count'th bookmark -" call Decho("delete bookmark#".v:count."<".g:NETRW_BOOKMARKDIR_{g:NETRW_BOOKMARKMAX}.">") - unlet g:NETRW_BOOKMARKDIR_{g:NETRW_BOOKMARKMAX} - let g:NETRW_BOOKMARKMAX= g:NETRW_BOOKMARKMAX - 1 - - elseif v:count > 0 -" call Decho("delete by shifting bookmark#".v:count."<".g:NETRW_BOOKMARKDIR_{v:count}.">") - let cnt= v:count - while cnt < g:NETRW_BOOKMARKMAX - let g:NETRW_BOOKMARKDIR_{cnt} = g:NETRW_BOOKMARKDIR_{(cnt+1)} - let cnt = cnt + 1 - endwhile - unlet g:NETRW_BOOKMARKDIR_{g:NETRW_BOOKMARKMAX} - let g:NETRW_BOOKMARKMAX= g:NETRW_BOOKMARKMAX - 1 + " delete the v:count'th bookmark +" call Decho("delete bookmark#".v:count."<".g:netrw_bookmarklist[v:count-1].">") + let savefile= s:NetrwHome()."/.netrwbook" + if filereadable(savefile) + call s:NetrwBookHistSave() " done here to merge bookmarks first + call delete(savefile) + endif + call remove(g:netrw_bookmarklist,v:count-1) + endif + call s:NetrwBookmarkMenu() +" call Dret("NetrwBookHistHandler") +endfun - elseif exists("b:netrw_curdir") - " look for current directory amongst the bookmarks and remove that bookmark -" call Decho("search for bookmark<".b:netrw_curdir.">") - let cnt= 1 - while cnt <= g:NETRW_BOOKMARKMAX -" call Decho("checking: g:NETRW_BOOKMARKDIR_".cnt."<".g:NETRW_BOOKMARKDIR_{cnt}.">") - if g:NETRW_BOOKMARKDIR_{cnt} == b:netrw_curdir - if cnt < g:NETRW_BOOKMARKMAX -" call Decho("delete bookmark#".cnt."<".b:netrw_curdir.">") - while cnt < g:NETRW_BOOKMARMAX - let g:NETRW_BOOKMARKDIR_{cnt} = g:NETRW_BOOKMARKDIR_{(cnt+1)} - let cnt = cnt + 1 - endwhile - endif - unlet g:NETRW_BOOKMARKDIR_{g:NETRW_BOOKMARKMAX} - let g:NETRW_BOOKMARKMAX= g:NETRW_BOOKMARKMAX - 1 +" --------------------------------------------------------------------- +" s:NetrwBookHistRead: this function reads bookmarks and history {{{2 +" Sister function: s:NetrwBookHistSave() +fun! s:NetrwBookHistRead() +" call Dfunc("s:NetrwBookHistRead()") + if !exists("s:netrw_initbookhist") + let savefile= s:NetrwHome()."/.netrwbook" + if filereadable(savefile) +" call Decho("sourcing .netrwbook") + exe "so ".savefile + endif + let savefile= s:NetrwHome()."/.netrwhist" + if filereadable(savefile) +" call Decho("sourcing .netrwhist") + exe "so ".savefile + endif + let s:netrw_initbookhist= 1 + au VimLeave * call s:NetrwBookHistSave() + endif +" call Dret("s:NetrwBookHistRead") +endfun + +" --------------------------------------------------------------------- +" s:NetrwBookHistSave: this function saves bookmarks and history {{{2 +" Sister function: s:NetrwBookHistRead() +" I used to do this via viminfo but that appears to +" be unreliable for long-term storage +" COMBAK: does $HOME work under windows??? +fun! s:NetrwBookHistSave() +" call Dfunc("s:NetrwBookHistSave() dirhistmax=".g:netrw_dirhistmax) + let savefile= s:NetrwHome()."/.netrwhist" + 1split + enew + setlocal noswf + + " save .netrwhist -- no attempt to merge + file .netrwhist + call setline(1,"let g:netrw_dirhistmax =".g:netrw_dirhistmax) + call setline(2,"let g:netrw_dirhist_cnt =".g:netrw_dirhist_cnt) + let lastline = line("$") + let cnt = 1 + while cnt <= g:netrw_dirhist_cnt + call setline((cnt+lastline),'let g:netrw_dirhist_'.cnt."='".g:netrw_dirhist_{cnt}."'") + let cnt= cnt + 1 + endwhile + exe "silent! w! ".savefile + %d + + if exists("g:netrw_bookmarklist") && g:netrw_bookmarklist != [] + " merge and write .netrwbook + let savefile= s:NetrwHome()."/.netrwbook" + + if filereadable(savefile) + let booklist= deepcopy(g:netrw_bookmarklist) + exe "silent so ".savefile + for bdm in booklist + if index(g:netrw_bookmarklist,bdm) == -1 + call add(g:netrw_bookmarklist,bdm) endif - let cnt= cnt + 1 - endwhile + endfor + call sort(g:netrw_bookmarklist) + exe "silent! w! ".savefile endif + " construct and save .netrwbook + call setline(1,"let g:netrw_bookmarklist= ".string(g:netrw_bookmarklist)) + exe "silent! w! ".savefile endif - call s:NetrwBookmarkMenu() -" call Dret("NetrwBookmarkDir") + let bgone= bufnr("%") + q! + exe bgone."bwipe!" + +" call Dret("s:NetrwBookHistSave") endfun " --------------------------------------------------------------------- @@ -2072,6 +2143,9 @@ fun! s:NetrwBrowse(islocal,dirname) " call Dfunc("s:NetrwBrowse(islocal=".a:islocal." dirname<".a:dirname.">) liststyle=".w:netrw_liststyle." ".g:loaded_netrw." buf#".bufnr("%")."<".bufname("%").">") " call Decho("tab#".tabpagenr()." win#".winnr()) " call Dredir("ls!") + if !exists("s:netrw_initbookhist") + call s:NetrwBookHistRead() + endif if exists("s:netrw_skipbrowse") unlet s:netrw_skipbrowse @@ -2269,6 +2343,14 @@ fun! s:NetrwBrowse(islocal,dirname) call s:BrowserMaps(a:islocal) call s:PerformListing(a:islocal) + " The s:LocalBrowseShellCmdRefresh() function is called by an autocmd + " installed by s:LocalFastBrowser() when g:netrw_fastbrowse <= 1 (ie. slow, medium speed). + " However, s:NetrwBrowse() causes the ShellCmdPost event itself to fire once; setting + " the variable below avoids that second refresh of the screen. The s:LocalBrowseShellCmdRefresh() + " function gets called due to that autocmd; it notices that the following variable is set + " and skips the refresh and sets s:locbrowseshellcmd to zero. Oct 13, 2008 + let s:locbrowseshellcmd= 1 + " call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap) " call Dret("s:NetrwBrowse : did PerformListing") return @@ -2328,7 +2410,7 @@ fun! s:NetrwGetBuffer(islocal,dirname) set ei=all exe "b ".w:netrw_treebufnr let &ei= eikeep -" call Dret("s:NetrwGetBuffer : bufnum#".bufnum."") +" call Dret("s:NetrwGetBuffer : bufnum#".w:netrw_treebufnr."") return endif let bufnum= -1 @@ -2706,37 +2788,47 @@ fun! s:NetrwBookmarkMenu() if !exists("s:netrw_menucnt") return endif -" call Dfunc("NetrwBookmarkMenu() bookmarkcnt=".g:NETRW_BOOKMARKMAX." histcnt=".g:NETRW_DIRHIST_CNT." menucnt=".s:netrw_menucnt) +" call Dfunc("NetrwBookmarkMenu() histcnt=".g:netrw_dirhist_cnt." menucnt=".s:netrw_menucnt) " the following test assures that gvim is running, has menus available, and has menus enabled. if has("gui") && has("menu") && has("gui_running") && &go =~ 'm' && g:netrw_menu if exists("g:NetrwTopLvlMenu") " call Decho("removing ".g:NetrwTopLvlMenu."Bookmarks menu item(s)") exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Bookmarks' + exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Bookmark\ Delete' + endif + if !exists("s:netrw_initbookhist") + call s:NetrwBookHistRead() endif " show bookmarked places - let cnt = 1 - while cnt <= g:NETRW_BOOKMARKMAX - if exists("g:NETRW_BOOKMARKDIR_{cnt}") - let bmdir= escape(g:NETRW_BOOKMARKDIR_{cnt},'. ') -" call Decho('silent! menu '.g:NetrwMenuPriority.".2.".cnt." ".g:NetrwTopLvlMenu.'Bookmark.'.bmdir.' :e '.bmdir) - exe 'silent! menu '.g:NetrwMenuPriority.".2.".cnt." ".g:NetrwTopLvlMenu.'Bookmarks.'.bmdir.' :e '.bmdir."\" - endif - let cnt= cnt + 1 - endwhile + if exists("g:netrw_bookmarklist") && g:netrw_bookmarklist != [] + let cnt= 1 + for bmd in g:netrw_bookmarklist +" call Decho('silent! menu '.g:NetrwMenuPriority.".2.".cnt." ".g:NetrwTopLvlMenu.'Bookmark.'.bmd.' :e '.bmd) + let bmd= escape(bmd,'. ') + + " show bookmarks for goto menu + exe 'silent! menu '.g:NetrwMenuPriority.".2.".cnt." ".g:NetrwTopLvlMenu.'Bookmarks.'.bmd.' :e '.bmd."\" + + " show bookmarks for deletion menu + exe 'silent! menu '.g:NetrwMenuPriority.".8.2.".cnt." ".g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Bookmark\ Delete.'.bmd.' '.cnt."mB" + let cnt= cnt + 1 + endfor + + endif " show directory browsing history - let cnt = g:NETRW_DIRHIST_CNT + let cnt = g:netrw_dirhist_cnt let first = 1 let histcnt = 0 - while ( first || cnt != g:NETRW_DIRHIST_CNT ) + while ( first || cnt != g:netrw_dirhist_cnt ) let histcnt = histcnt + 1 - let priority = g:NETRW_DIRHIST_CNT + histcnt - if exists("g:NETRW_DIRHIST_{cnt}") - let bmdir= escape(g:NETRW_DIRHIST_{cnt},'/&? ') -" call Decho('silent! menu '.g:NetrwMenuPriority.".3.".priority." ".g:NetrwTopLvlMenu.'History.'.bmdir.' :e '.bmdir) - exe 'silent! menu '.g:NetrwMenuPriority.".3.".priority." ".g:NetrwTopLvlMenu.'History.'.bmdir.' :e '.bmdir."\" + let priority = g:netrw_dirhist_cnt + histcnt + if exists("g:netrw_dirhist_{cnt}") + let histdir= escape(g:netrw_dirhist_{cnt},'./&? ') +" call Decho('silent! menu '.g:NetrwMenuPriority.".3.".priority." ".g:NetrwTopLvlMenu.'History.'.histdir.' :e '.histdir) + exe 'silent! menu '.g:NetrwMenuPriority.".3.".priority." ".g:NetrwTopLvlMenu.'History.'.histdir.' :e '.histdir."\" endif let first = 0 let cnt = ( cnt - 1 ) % g:netrw_dirhistmax @@ -2744,6 +2836,7 @@ fun! s:NetrwBookmarkMenu() let cnt= cnt + g:netrw_dirhistmax endif endwhile + endif " call Dret("NetrwBookmarkMenu") endfun @@ -2991,6 +3084,7 @@ fun! netrw#NetrwBrowseX(fname,remote) if has("win32") || has("win95") || has("win64") || has("win16") let exten= substitute(exten,'^.*$','\L&\E','') endif +" call Decho("exten<".exten.">") " seems kde systems often have gnome-open due to dependencies, even though " gnome-open's subsidiary display tools are largely absent. Kde systems @@ -3009,16 +3103,25 @@ fun! netrw#NetrwBrowseX(fname,remote) if a:remote == 1 " create a local copy - let fname= fnamemodify(tempname(),":r").".".exten -" call Decho("a:remote=".a:remote.": create a local copy of <".fname."> as <".fname.">") - exe "silent keepjumps bot 1new ".fnameescape(fname) +" call Decho("a:remote=".a:remote.": create a local copy of <".a:fname.">") setlocal bh=delete -" call Decho("read <".fnameescape(fname).">, now writing: exe w! ".fnameescape(fname)) - exe "silent! w! ".fnameescape(fname) - q + call netrw#NetRead(3,a:fname) + " attempt to rename tempfile + let basename= substitute(a:fname,'^\(.*\)/\(.*\)\.\([^.]*\)$','\2','') + let newname= substitute(s:netrw_tmpfile,'^\(.*\)/\(.*\)\.\([^.]*\)$','\1/'.basename.'.\3','') +" call Decho("basename<".basename.">") +" call Decho("newname <".newname.">") + if rename(s:netrw_tmpfile,newname) == 0 + " renaming succeeded + let fname= newname + else + " renaming failed + let fname= s:netrw_tmpfile + endif else let fname= a:fname endif +" call Decho("fname<".fname.">") " call Decho("exten<".exten."> "."netrwFileHandlers#NFH_".exten."():exists=".exists("*netrwFileHandlers#NFH_".exten)) " set up redirection @@ -3125,10 +3228,22 @@ endfun " --------------------------------------------------------------------- " netrw#Explore: launch the local browser in the directory of the current file {{{2 -" dosplit==0: the window will be split iff the current file has -" been modified -" dosplit==1: the window will be split before running the local -" browser +" indx: == -1: Nexplore +" == -2: Pexplore +" == +: this is overloaded: +" * If Nexplore/Pexplore is in use, then this refers to the +" indx'th item in the w:netrw_explore_list[] of items which +" matched the */pattern **/pattern *//pattern **//pattern +" * If Hexplore or Vexplore, then this will override +" g:netrw_winsize to specify the qty of rows or columns the +" newly split window should have. +" dosplit==0: the window will be split iff the current file has been modified +" dosplit==1: the window will be split before running the local browser +" style == 0: Explore style == 1: Explore! +" == 2: Hexplore style == 3: Hexplore! +" == 4: Vexplore style == 5: Vexplore! +" == 6: Texplore +"DechoTabOn fun! netrw#Explore(indx,dosplit,style,...) " call Dfunc("netrw#Explore(indx=".a:indx." dosplit=".a:dosplit." style=".a:style.",a:1<".a:1.">) &modified=".&modified." a:0=".a:0) if !exists("b:netrw_curdir") @@ -3147,30 +3262,34 @@ fun! netrw#Explore(indx,dosplit,style,...) if a:dosplit || &modified || a:style == 6 " call Decho("case: dosplit=".a:dosplit." modified=".&modified." a:style=".a:style) call s:SaveWinVars() + let winsize= g:netrw_winsize + if a:indx > 0 + let winsize= a:indx + endif if a:style == 0 " Explore, Sexplore " call Decho("style=0: Explore or Sexplore") - exe g:netrw_winsize."wincmd s" + exe winsize."wincmd s" elseif a:style == 1 "Explore!, Sexplore! " call Decho("style=1: Explore! or Sexplore!") - exe g:netrw_winsize."wincmd v" + exe winsize."wincmd v" elseif a:style == 2 " Hexplore " call Decho("style=2: Hexplore") - exe "bel ".g:netrw_winsize."wincmd s" + exe "bel ".winsize."wincmd s" elseif a:style == 3 " Hexplore! " call Decho("style=3: Hexplore!") - exe "abo ".g:netrw_winsize."wincmd s" + exe "abo ".winsize."wincmd s" elseif a:style == 4 " Vexplore " call Decho("style=4: Vexplore") - exe "lefta ".g:netrw_winsize."wincmd v" + exe "lefta ".winsize."wincmd v" elseif a:style == 5 " Vexplore! " call Decho("style=5: Vexplore!") - exe "rightb ".g:netrw_winsize."wincmd v" + exe "rightb ".winsize."wincmd v" elseif a:style == 6 " Texplore call s:SaveBufVars() @@ -3301,9 +3420,10 @@ fun! netrw#Explore(indx,dosplit,style,...) if !exists("w:netrw_explore_indx") let w:netrw_explore_indx= 0 endif + let indx = a:indx " call Decho("starpat=".starpat.": set indx= [a:indx=".indx."]") -" + if indx == -1 " Nexplore " call Decho("case Nexplore with starpat=".starpat.": (indx=".indx.")") @@ -3364,6 +3484,7 @@ fun! netrw#Explore(indx,dosplit,style,...) if starpat == 1 " starpat=1: Explore *//pattern (current directory only search for files containing pattern) " call Decho("starpat=".starpat.": build *//pattern list") +" call Decho("pattern<".pattern.">") exe "vimgrep /".pattern."/gj ".fnameescape(b:netrw_curdir)."/*" let w:netrw_explore_list = map(getqflist(),'bufname(v:val.bufnr)') if &hls | let keepregslash= s:ExplorePatHls(pattern) | endif @@ -3389,14 +3510,12 @@ fun! netrw#Explore(indx,dosplit,style,...) elseif starpat == 3 " starpat=3: Explore */filepat (search in current directory for filenames matching filepat) " call Decho("starpat=".starpat.": build */filepat list") - let dirname = substitute(dirname,'^\*/','','') - if dirname !~ '\$*?[' && (!filereadable(dirname) || !filewritable(dirname)) -" call Dret("netrw#Explore : no files matched pattern") - call netrw#ErrorMsg(s:NOTE,"no files matched Explore pattern",72) - return - endif - let w:netrw_explore_list= split(expand(b:netrw_curdir."/".dirname),'\n') - if &hls | let keepregslash= s:ExplorePatHls(dirname) | endif + let filepat= substitute(dirname,'^\*/','','') + let filepat= substitute(filepat,'^[%#<]','\\&','') +" call Decho("b:netrw_curdir<".b:netrw_curdir.">") +" call Decho("filepat<".filepat.">") + let w:netrw_explore_list= split(expand(b:netrw_curdir."/".filepat),'\n') + if &hls | let keepregslash= s:ExplorePatHls(filepat) | endif elseif starpat == 4 " starpat=4: Explore **/filepat (recursive descent search for filenames matching filepat) @@ -3491,17 +3610,18 @@ fun! netrw#Explore(indx,dosplit,style,...) let prvfname= "" for fname in w:netrw_explore_list " call Decho("fname<".fname.">") +"COMBAK -- g:netrw_markfileesc."'".g:netrw_markfileesc."'" ??? if fname =~ '^'.b:netrw_curdir if s:explore_match == "" - let s:explore_match= '\<'.escape(strpart(fname,dirlen),g:netrw_markfileesc."'".g:netrw_markfileesc."'").'\>' + let s:explore_match= '\<'.escape(strpart(fname,dirlen),g:netrw_markfileesc).'\>' else - let s:explore_match= s:explore_match.'\|\<'.escape(strpart(fname,dirlen),g:netrw_markfileesc."'".g:netrw_markfileesc."'").'\>' + let s:explore_match= s:explore_match.'\|\<'.escape(strpart(fname,dirlen),g:netrw_markfileesc).'\>' endif elseif fname !~ '^/' && fname != prvfname if s:explore_match == "" - let s:explore_match= '\<'.escape(fname,g:netrw_markfileesc."'".g:netrw_markfileesc."'").'\>' + let s:explore_match= '\<'.escape(fname,g:netrw_markfileesc).'\>' else - let s:explore_match= s:explore_match.'\|\<'.escape(fname,g:netrw_markfileesc."'".g:netrw_markfileesc."'").'\>' + let s:explore_match= s:explore_match.'\|\<'.escape(fname,g:netrw_markfileesc).'\>' endif endif let prvfname= fname @@ -3601,6 +3721,48 @@ fun! s:NetrwHidden(islocal) endfun " --------------------------------------------------------------------- +" s:NetrwHome: this function determines a "home" for saving bookmarks and history {{{2 +fun! s:NetrwHome() +" call Dfunc("s:NetrwHome()") + if exists("g:netrw_home") + let home= g:netrw_home + else + " go to vim plugin home + for home in split(&rtp,',') + [''] + if isdirectory(home) && filewritable(home) | break | endif + let basehome= substitute(home,'[/\\]\.vim$','','') + if isdirectory(basehome) && filewritable(basehome) + let home= basehome."/.vim" + break + endif + endfor + if home == "" + " just pick the first directory +" call Decho("just pick first directory in &rtp") + let home= substitute(&rtp,',.*$','','') + endif + if (has("win32") || has("win95") || has("win64") || has("win16")) + let home= substitute(home,'/','\\','g') + endif + endif + " insure that the home directory exists +" call Decho("picked home<".home.">") + if !isdirectory(home) + if exists("g:netrw_mkdir") +" call Decho("home<".home."> isn't a directory -- making it now with g:netrw_mkdir<".g:netrw_mkdir.">") +" call Decho("system(".g:netrw_mkdir." ".s:Escape(home).")") + call system(g:netrw_mkdir." ".s:Escape(home)) + else +" call Decho("home<".home."> isn't a directory -- making it now with mkdir()") + call mkdir(home) + endif + endif + let g:netrw_home= home +" call Dret("s:NetrwHome <".home.">") + return home +endfun + +" --------------------------------------------------------------------- " s:NetrwLeftmouse: handles the when in a netrw browsing window {{{2 fun! s:NetrwLeftmouse(islocal) " call Dfunc("s:NetrwLeftmouse(islocal=".a:islocal.")") @@ -4048,7 +4210,9 @@ fun! s:NetrwMarkFileCopy(islocal) if a:islocal call s:NetrwRefreshDir(a:islocal,b:netrw_curdir) endif - call s:LocalBrowseShellCmdRefresh() + if g:netrw_fastbrowse <= 1 + call s:LocalBrowseShellCmdRefresh() + endif " call Dret("s:NetrwMarkFileCopy 1") return 1 @@ -4356,7 +4520,9 @@ fun! s:NetrwMarkFileMove(islocal) if a:islocal call s:NetrwRefreshDir(a:islocal,b:netrw_curdir) endif - call s:LocalBrowseShellCmdRefresh() + if g:netrw_fastbrowse <= 1 + call s:LocalBrowseShellCmdRefresh() + endif " call Dret("s:NetrwMarkFileMove") endfun @@ -4584,7 +4750,7 @@ fun! s:NetrwMarkFileTgt(islocal) endif let s:netrwmftgt_islocal= a:islocal - if g:netrw_fastbrowse > 0 + if g:netrw_fastbrowse <= 1 call s:LocalBrowseShellCmdRefresh() endif call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./')) @@ -4719,20 +4885,17 @@ fun! s:NetrwMenu(domenu) " call Decho("initialize menu") let s:netrw_menu_enabled= 1 exe 'silent! menu '.g:NetrwMenuPriority.'.1 '.g:NetrwTopLvlMenu.'Help ' - call s:NetrwBookmarkMenu() " provide some history! uses priorities 2,3, reserves 4 exe 'silent! menu '.g:NetrwMenuPriority.'.5 '.g:NetrwTopLvlMenu.'-Sep1- :' exe 'silent! menu '.g:NetrwMenuPriority.'.6 '.g:NetrwTopLvlMenu.'Go\ Up\ Directory- -' exe 'silent! menu '.g:NetrwMenuPriority.'.7 '.g:NetrwTopLvlMenu.'Apply\ Special\ Viewerx x' exe 'silent! menu '.g:NetrwMenuPriority.'.8.1 '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Bookmark\ Current\ Directorymb mb' - exe 'silent! menu '.g:NetrwMenuPriority.'.8.2 '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Bookmark\ DeletemB mB' - exe 'silent! menu '.g:NetrwMenuPriority.'.8.3 '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Goto\ Bookmarkgb gb' exe 'silent! menu '.g:NetrwMenuPriority.'.8.4 '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Goto\ Prev\ Dir\ (History)u u' exe 'silent! menu '.g:NetrwMenuPriority.'.8.5 '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Goto\ Next\ Dir\ (History)U U' exe 'silent! menu '.g:NetrwMenuPriority.'.8.6 '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Listqb qb' - exe 'silent! menu '.g:NetrwMenuPriority.'.9.1 '.g:NetrwTopLvlMenu.'Browsing\ Control.Edit\ File\ Hiding\ List'." \NetrwHideEdit" + exe 'silent! menu '.g:NetrwMenuPriority.'.9.1 '.g:NetrwTopLvlMenu.'Browsing\ Control.Edit\ File\ Hiding\ List'." \'" exe 'silent! menu '.g:NetrwMenuPriority.'.9.2 '.g:NetrwTopLvlMenu.'Browsing\ Control.Edit\ Sorting\ SequenceS S' exe 'silent! menu '.g:NetrwMenuPriority.'.9.3 '.g:NetrwTopLvlMenu.'Browsing\ Control.Quick\ Hide/Unhide\ Dot\ Files'."gh gh" - exe 'silent! menu '.g:NetrwMenuPriority.'.9.4 '.g:NetrwTopLvlMenu.'Browsing\ Control.Refresh\ Listing'." \NetrwRefresh" + exe 'silent! menu '.g:NetrwMenuPriority.'.9.4 '.g:NetrwTopLvlMenu.'Browsing\ Control.Refresh\ Listing'." \" exe 'silent! menu '.g:NetrwMenuPriority.'.9.5 '.g:NetrwTopLvlMenu.'Browsing\ Control.Settings/Options:NetrwSettings '.":NetrwSettings\" exe 'silent! menu '.g:NetrwMenuPriority.'.10 '.g:NetrwTopLvlMenu.'Delete\ File/DirectoryD D' exe 'silent! menu '.g:NetrwMenuPriority.'.11.1 '.g:NetrwTopLvlMenu.'Edit\ File/Dir.In\ Current\ Window '."\" @@ -4770,6 +4933,7 @@ fun! s:NetrwMenu(domenu) exe 'silent! menu '.g:NetrwMenuPriority.'.16.4 '.g:NetrwTopLvlMenu.'Style.Sorting\ Method\ (name-time-size)s s' exe 'silent! menu '.g:NetrwMenuPriority.'.17 '.g:NetrwTopLvlMenu.'Rename\ File/DirectoryR R' exe 'silent! menu '.g:NetrwMenuPriority.'.18 '.g:NetrwTopLvlMenu.'Set\ Current\ Directoryc c' + call s:NetrwBookmarkMenu() " provide some history! uses priorities 2,3, reserves 4, 8.2.x let s:netrw_menucnt= 28 elseif !a:domenu @@ -5482,12 +5646,12 @@ fun! s:NetrwSplit(mode) elseif a:mode == 1 " remote and t - let cursorword = s:NetrwGetWord() + let newdir = s:NetrwBrowseChgDir(0,s:NetrwGetWord()) " call Decho("tabnew") tabnew let s:didsplit= 1 call s:RestoreWinVars() - call s:NetrwBrowse(0,s:NetrwBrowseChgDir(0,cursorword)) + call s:NetrwBrowse(0,newdir) unlet s:didsplit elseif a:mode == 2 @@ -5810,7 +5974,7 @@ fun! s:PerformListing(islocal) endif " save current directory on directory history list - call s:NetrwBookmarkDir(3,b:netrw_curdir) + call s:NetrwBookHistHandler(3,b:netrw_curdir) " Set up the banner {{{3 " call Decho("set up banner") @@ -6739,6 +6903,14 @@ fun! s:LocalBrowseShellCmdRefresh() " call Dret("LocalBrowseShellCmdRefresh : don't refresh when focus not on netrw windwo") return endif + if exists("s:locbrowseshellcmd") + if s:locbrowseshellcmd + let s:locbrowseshellcmd= 0 +" call Dret("LocalBrowseShellCmdRefresh : NetrwBrowse itself caused the refresh") + return + endif + let s:locbrowseshellcmd= 0 + endif let itab = 1 let buftablist = [] while itab <= tabpagenr("$") @@ -7030,9 +7202,11 @@ fun! s:LocalFastBrowser() augroup AuNetrwShellCmd au! if (has("win32") || has("win95") || has("win64") || has("win16")) +" call Decho("autocmd: ShellCmdPost * call s:LocalBrowseShellCmdRefresh()") au ShellCmdPost * call s:LocalBrowseShellCmdRefresh() else au ShellCmdPost,FocusGained * call s:LocalBrowseShellCmdRefresh() +" call Decho("autocmd: ShellCmdPost,FocusGained * call s:LocalBrowseShellCmdRefresh()") endif augroup END endif @@ -7059,7 +7233,7 @@ endfun " 0=note = s:NOTE " 1=warning = s:WARNING " 2=error = s:ERROR -" Aug 22, 2008 : max errnum currently is 72 +" Oct 12, 2008 : max errnum currently is 73 fun! netrw#ErrorMsg(level,msg,errnum) " call Dfunc("netrw#ErrorMsg(level=".a:level." msg<".a:msg."> errnum=".a:errnum.") g:netrw_use_errorwindow=".g:netrw_use_errorwindow) @@ -7287,7 +7461,7 @@ fun! s:GetTempfile(fname) endif " let netrw#NetSource() know about the tmpfile - let s:netrw_tmpfile= tmpfile " used by netrw#NetSource() + let s:netrw_tmpfile= tmpfile " used by netrw#NetSource() and netrw#NetrwBrowseX() " call Decho("tmpfile<".tmpfile."> s:netrw_tmpfile<".s:netrw_tmpfile.">") " o/s dependencies @@ -7659,8 +7833,7 @@ fun! s:SetRexDir(islocal,dirname) if a:islocal exe 'com! Rexplore call s:NetrwRexplore(1,"'.escape(a:dirname,'"\').'")' if g:netrw_retmap - silent! unmap <2-leftmouse> - if !hasmapto("NetrwReturn") + if !hasmapto("NetrwReturn") && maparg("<2-leftmouse>","n") == "" nmap <2-leftmouse> NetrwReturn endif let dir = escape(a:dirname, s:netrw_map_escape) @@ -7669,8 +7842,7 @@ fun! s:SetRexDir(islocal,dirname) else exe 'com! Rexplore call s:NetrwRexplore(0,"'.escape(a:dirname,'"\').'")' if g:netrw_retmap - silent! unmap <2-leftmouse> - if !hasmapto("NetrwReturn") + if !hasmapto("NetrwReturn") && maparg("<2-leftmouse>","n") == "" nmap <2-leftmouse> NetrwReturn endif let dir = escape(a:dirname, s:netrw_map_escape) diff --git a/runtime/autoload/netrwFileHandlers.vim b/runtime/autoload/netrwFileHandlers.vim index 5fb05bad..1515b009 100644 --- a/runtime/autoload/netrwFileHandlers.vim +++ b/runtime/autoload/netrwFileHandlers.vim @@ -1,9 +1,9 @@ " netrwFileHandlers: contains various extension-based file handlers for " netrw's browsers' x command ("eXecute launcher") " Author: Charles E. Campbell, Jr. -" Date: May 30, 2006 -" Version: 9 -" Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1 +" Date: Sep 30, 2008 +" Version: 10 +" Copyright: Copyright (C) 1999-2008 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, @@ -20,9 +20,15 @@ if exists("g:loaded_netrwFileHandlers") || &cp finish endif +let g:loaded_netrwFileHandlers= "v10" +if v:version < 702 + echohl WarningMsg + echo "***warning*** this version of netrwFileHandlers needs vim 7.2" + echohl Normal + finish +endif let s:keepcpo= &cpo set cpo&vim -let g:loaded_netrwFileHandlers= "v9" " --------------------------------------------------------------------- " netrwFileHandlers#Invoke: {{{1 @@ -73,10 +79,10 @@ fun! s:NFH_html(pagefile) if executable("mozilla") " call Decho("executing !mozilla ".page) - exe "!mozilla ".g:netrw_shq.page.g:netrw_shq + exe "!mozilla ".shellescape(page,1) elseif executable("netscape") " call Decho("executing !netscape ".page) - exe "!netscape ".g:netrw_shq..page.g:netrw_shq + exe "!netscape ".shellescape(page,1) else " call Dret("s:NFH_html 0") return 0 @@ -96,10 +102,10 @@ fun! s:NFH_htm(pagefile) if executable("mozilla") " call Decho("executing !mozilla ".page) - exe "!mozilla ".g:netrw_shq.page.g:netrw_shq + exe "!mozilla ".shellescape(page,1) elseif executable("netscape") " call Decho("executing !netscape ".page) - exe "!netscape ".g:netrw_shq.page.g:netrw_shq + exe "!netscape ".shellescape(page,1) else " call Dret("s:NFH_htm 0") return 0 @@ -115,10 +121,10 @@ fun! s:NFH_jpg(jpgfile) " call Dfunc("s:NFH_jpg(jpgfile<".a:jpgfile.">)") if executable("gimp") - exe "silent! !gimp -s ".g:netrw_shq.a:jpgfile.g:netrw_shq + exe "silent! !gimp -s ".shellescape(a:jpgfile,1) elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE") " call Decho("silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".escape(a:jpgfile," []|'")) - exe "!".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".g:netrw_shq.a:jpgfile.g:netrw_shq + exe "!".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".shellescape(a:jpgfile,1) else " call Dret("s:NFH_jpg 0") return 0 @@ -134,9 +140,9 @@ fun! s:NFH_gif(giffile) " call Dfunc("s:NFH_gif(giffile<".a:giffile.">)") if executable("gimp") - exe "silent! !gimp -s ".g:netrw_shq.a:giffile.g:netrw_shq + exe "silent! !gimp -s ".shellescape(a:giffile,1) elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE") - exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".g:netrw_shq.a:giffile.g:netrw_shq + exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".shellescape(a:giffile,1) else " call Dret("s:NFH_gif 0") return 0 @@ -152,9 +158,9 @@ fun! s:NFH_png(pngfile) " call Dfunc("s:NFH_png(pngfile<".a:pngfile.">)") if executable("gimp") - exe "silent! !gimp -s ".g:netrw_shq.a:pngfile.g:netrw_shq + exe "silent! !gimp -s ".shellescape(a:pngfile,1) elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE") - exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".g:netrw_shq.a:pngfile.g:netrw_shq + exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".shellescape(a:pngfile,1) else " call Dret("s:NFH_png 0") return 0 @@ -170,9 +176,9 @@ fun! s:NFH_pnm(pnmfile) " call Dfunc("s:NFH_pnm(pnmfile<".a:pnmfile.">)") if executable("gimp") - exe "silent! !gimp -s ".g:netrw_shq.a:pnmfile.g:netrw_shq + exe "silent! !gimp -s ".shellescape(a:pnmfile,1) elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE") - exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".g:netrw_shq.a:pnmfile.g:netrw_shq + exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".shellescape(a:pnmfile,1) else " call Dret("s:NFH_pnm 0") return 0 @@ -190,7 +196,7 @@ fun! s:NFH_bmp(bmpfile) if executable("gimp") exe "silent! !gimp -s ".a:bmpfile elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE") - exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".g:netrw_shq.a:bmpfile.g:netrw_shq + exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".shellescape(a:bmpfile,1) else " call Dret("s:NFH_bmp 0") return 0 @@ -205,9 +211,9 @@ endfun fun! s:NFH_pdf(pdf) " call Dfunc("s:NFH_pdf(pdf<".a:pdf.">)") if executable("gs") - exe 'silent! !gs '.g:netrw_shq.a:pdf.g:netrw_shq + exe 'silent! !gs '.shellescape(a:pdf,1) elseif executable("pdftotext") - exe 'silent! pdftotext -nopgbrk '.g:netrw_shq.a:pdf.g:netrw_shq + exe 'silent! pdftotext -nopgbrk '.shellescape(a:pdf,1) else " call Dret("s:NFH_pdf 0") return 0 @@ -223,7 +229,7 @@ fun! s:NFH_doc(doc) " call Dfunc("s:NFH_doc(doc<".a:doc.">)") if executable("oowriter") - exe 'silent! !oowriter '.g:netrw_shq.a:doc.g:netrw_shq + exe 'silent! !oowriter '.shellescape(a:doc,1) redraw! else " call Dret("s:NFH_doc 0") @@ -240,7 +246,7 @@ fun! s:NFH_sxw(sxw) " call Dfunc("s:NFH_sxw(sxw<".a:sxw.">)") if executable("oowriter") - exe 'silent! !oowriter '.g:netrw_shq.a:sxw.g:netrw_shq + exe 'silent! !oowriter '.shellescape(a:sxw,1) redraw! else " call Dret("s:NFH_sxw 0") @@ -257,7 +263,7 @@ fun! s:NFH_xls(xls) " call Dfunc("s:NFH_xls(xls<".a:xls.">)") if executable("oocalc") - exe 'silent! !oocalc '.g:netrw_shq.a:xls.g:netrw_shq + exe 'silent! !oocalc '.shellescape(a:xls,1) redraw! else " call Dret("s:NFH_xls 0") @@ -274,15 +280,15 @@ fun! s:NFH_ps(ps) " call Dfunc("s:NFH_ps(ps<".a:ps.">)") if executable("gs") " call Decho("exe silent! !gs ".a:ps) - exe "silent! !gs ".g:netrw_shq.a:ps.g:netrw_shq + exe "silent! !gs ".shellescape(a:ps,1) redraw! elseif executable("ghostscript") " call Decho("exe silent! !ghostscript ".a:ps) - exe "silent! !ghostscript ".g:netrw_shq.a:ps.g:netrw_shq + exe "silent! !ghostscript ".shellescape(a:ps,1) redraw! elseif executable("gswin32") -" call Decho("exe silent! !gswin32 ".g:netrw_shq.a:ps.g:netrw_shq) - exe "silent! !gswin32 ".g:netrw_shq.a:ps.g:netrw_shq +" call Decho("exe silent! !gswin32 ".shellescape(a:ps,1)) + exe "silent! !gswin32 ".shellescape(a:ps,1) redraw! else " call Dret("s:NFH_ps 0") @@ -298,16 +304,16 @@ endfun fun! s:NFH_eps(eps) " call Dfunc("s:NFH_eps()") if executable("gs") - exe "silent! !gs ".g:netrw_shq.a:eps.g:netrw_shq + exe "silent! !gs ".shellescape(a:eps,1) redraw! elseif executable("ghostscript") - exe "silent! !ghostscript ".g:netrw_shq.a:eps.g:netrw_shq + exe "silent! !ghostscript ".shellescape(a:eps,1) redraw! elseif executable("ghostscript") - exe "silent! !ghostscript ".g:netrw_shq.a:eps.g:netrw_shq + exe "silent! !ghostscript ".shellescape(a:eps,1) redraw! elseif executable("gswin32") - exe "silent! !gswin32 ".g:netrw_shq.a:eps.g:netrw_shq + exe "silent! !gswin32 ".shellescape(a:eps,1) redraw! else " call Dret("s:NFH_eps 0") diff --git a/runtime/autoload/netrwSettings.vim b/runtime/autoload/netrwSettings.vim index acbd1455..daf9e21a 100644 --- a/runtime/autoload/netrwSettings.vim +++ b/runtime/autoload/netrwSettings.vim @@ -19,7 +19,13 @@ if exists("g:loaded_netrwSettings") || &cp finish endif -let g:loaded_netrwSettings = "v13" +let g:loaded_netrwSettings = "v13" +if v:version < 700 + echohl WarningMsg + echo "***warning*** this version of netrwSettings needs vim 7.0" + echohl Normal + finish +endif " --------------------------------------------------------------------- " NetrwSettings: {{{1 diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 81067e4c..c19cc402 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 7.2. Last change: 2008 Sep 14 +*cmdline.txt* For Vim version 7.2. Last change: 2008 Sep 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -742,8 +742,8 @@ function expand() |expand()|. ## Is replaced with all names in the argument list *:_##* *c_##* concatenated, separated by spaces. Each space in a name is preceded with a backslash. - # 0) is replaced with old *:_#<* *c_#<* + file name n. See |:oldfiles| or |v:oldfiles| to get the number. *E809* {only when compiled with the +eval and +viminfo features} diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index df36ba8e..4e7d6295 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.2. Last change: 2008 Sep 14 +*eval.txt* For Vim version 7.2. Last change: 2008 Nov 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4493,9 +4493,9 @@ remote_send({server}, {string} [, {idvar}]) < remove({list}, {idx} [, {end}]) *remove()* Without {end}: Remove the item at {idx} from |List| {list} and - return it. + return the item. With {end}: Remove items from {idx} to {end} (inclusive) and - return a list with these items. When {idx} points to the same + return a List with these items. When {idx} points to the same item as {end} a list with one item is returned. When {end} points to an item before {idx} this is an error. See |list-index| for possible values of {idx} and {end}. diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index e1f69a3d..2f8725bf 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1,4 +1,4 @@ -*gui.txt* For Vim version 7.2. Last change: 2008 Aug 11 +*gui.txt* For Vim version 7.2. Last change: 2008 Sep 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -35,7 +35,7 @@ GUI version of Vim with: The X11 version of Vim can run both in GUI and in non-GUI mode. See |gui-x11-start|. - *gui-init* *gvimrc* *.gvimrc* *_gvimrc* + *gui-init* *gvimrc* *.gvimrc* *_gvimrc* *$MYGVIMRC* The gvimrc file is where GUI-specific startup commands should be placed. It is always sourced after the |vimrc| file. If you have one then the $MYGVIMRC environment variable has its name. diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index dc772c73..a4db0799 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 7.2. Last change: 2007 Aug 19 +*message.txt* For Vim version 7.2. Last change: 2008 Nov 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -567,7 +567,7 @@ allowed for the command that was used. Unable to open swap file for "{filename}", recovery impossible Vim was not able to create a swap file. You can still edit the file, but if -Vim unexpected exits the changes will be lost. And Vim may consume a lot of +Vim unexpectedly exits the changes will be lost. And Vim may consume a lot of memory when editing a big file. You may want to change the 'directory' option to avoid this error. See |swap-file|. diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index 8e9a6bc4..5f282745 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 7.2. Last change: 2008 Aug 19 +*motion.txt* For Vim version 7.2. Last change: 2008 Oct 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -325,9 +325,9 @@ gg Goto line [count], default first line, on the first non-blank character |linewise|. If 'startofline' not set, keep the same column. -:[range] Set the cursor on the specified line number. If - there are several numbers, the last one is used. - +:[range] Set the cursor on the last line number in [range]. + [range] can also be just one line number, e.g., ":1" + or ":'m". *N%* {count}% Go to {count} percentage in the file, on the first non-blank in the line |linewise|. To compute the new diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 3fbb5915..0ef06452 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.2. Last change: 2008 Sep 04 +*options.txt* For Vim version 7.2. Last change: 2008 Nov 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4325,10 +4325,17 @@ A jump table for the options with a short description can be found at |Q_op|. *'list'* *'nolist'* 'list' boolean (default off) local to window - List mode: Show tabs as CTRL-I, show end of line with $. Useful to - see the difference between tabs and spaces and for trailing blanks. - Note that this will also affect formatting (set with 'textwidth' or - 'wrapmargin') when 'cpoptions' includes 'L'. See 'listchars' for + List mode: Show tabs as CTRL-I is displayed, display $ after end of + line. Useful to see the difference between tabs and spaces and for + trailing blanks. Further changed by the 'listchars' option. + + The cursor is displayed at the start of the space a Tab character + occupies, not at the end as usual in Normal mode. To get this cursor + position while displaying Tabs with spaces, use: > + :set list lcs=tab\ \ +< + Note that list mode will also affect formatting (set with 'textwidth' + or 'wrapmargin') when 'cpoptions' includes 'L'. See 'listchars' for changing the way tabs are displayed. *'listchars'* *'lcs'* diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index bd83bcfd..24e6d1b3 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -1,4 +1,4 @@ -*pi_netrw.txt* For Vim version 7.2. Last change: 2008 Sep 02 +*pi_netrw.txt* For Vim version 7.2. Last change: 2008 Oct 23 ----------------------------------------------------- NETRW REFERENCE MANUAL by Charles E. Campbell, Jr. @@ -43,6 +43,7 @@ Changing To A Predecessor Directory................|netrw-u| Changing To A Successor Directory..................|netrw-U| Customizing Browsing With A User Function..........|netrw-x| + Deleting Bookmarks.................................|netrw-mB| Deleting Files Or Directories......................|netrw-D| Directory Exploring Commands.......................|netrw-explore| Exploring With Stars and Patterns..................|netrw-star| @@ -159,16 +160,33 @@ EXTERNAL APPLICATIONS AND PROTOCOLS *netrw-externapp* {{{2 Protocol Variable Default Value -------- ---------------- ------------- - dav: *g:netrw_dav_cmd* = "cadaver" - fetch: *g:netrw_fetch_cmd* = "fetch -o" if fetch is available - ftp: *g:netrw_ftp_cmd* = "ftp" - http: *g:netrw_http_cmd* = "curl -o" if curl is available - http: g:netrw_http_cmd = "wget -q -O" elseif wget is available - http: g:netrw_http_cmd = "fetch -o" elseif fetch is available - rcp: *g:netrw_rcp_cmd* = "rcp" - rsync: *g:netrw_rsync_cmd* = "rsync -a" - scp: *g:netrw_scp_cmd* = "scp -q" - sftp: *g:netrw_sftp_cmd* = "sftp" + dav: *g:netrw_dav_cmd* = "cadaver" if cadaver is executable + dav: g:netrw_dav_cmd = "curl -o" elseif curl is available + fetch: *g:netrw_fetch_cmd* = "fetch -o" if fetch is available + ftp: *g:netrw_ftp_cmd* = "ftp" + http: *g:netrw_http_cmd* = "elinks" if elinks is available + http: g:netrw_http_cmd = "links" elseif links is available + http: g:netrw_http_cmd = "curl" elseif curl is available + http: g:netrw_http_cmd = "wget" elseif wget is available + http: g:netrw_http_cmd = "fetch" elseif fetch is available + rcp: *g:netrw_rcp_cmd* = "rcp" + rsync: *g:netrw_rsync_cmd* = "rsync -a" + scp: *g:netrw_scp_cmd* = "scp -q" + sftp: *g:netrw_sftp_cmd* = "sftp" + + *g:netrw_http_xcmd* : the option string for http://... protocols are + specified via this variable and may be independently oveerridden. + + elinks : "-dump >" + links : "-dump >" + curl : "-o" + wget : "-q -O" + fetch : "-o" + + For example, if your system has elinks but you want to see the html + source in detail rather than a text rendering thereof, you may wish + to have let g:netrw_http_xcmd= "-source >" in your .vimrc. + READING *netrw-read* *netrw-nread* {{{2 @@ -678,7 +696,8 @@ variables listed below, and may be modified by the user. read via ftp automatically transformed however they wish by NetReadFixup() - g:netrw_dav_cmd variable ="cadaver" + g:netrw_dav_cmd variable ="cadaver" if cadaver is executable + g:netrw_dav_cmd variable ="curl -o" elseif curl is executable g:netrw_fetch_cmd variable ="fetch -o" if fetch is available g:netrw_ftp_cmd variable ="ftp" g:netrw_http_cmd variable ="fetch -o" if fetch is available @@ -929,7 +948,7 @@ QUICK REFERENCE: MAPS *netrw-browse-maps* {{{2 * the user doesn't already have a <2-leftmouse> mapping defined before netrw is autoloaded, then a double clicked leftmouse button will return - to the netrw browser window. + to the netrw browser window. See |g:netrw_retmap|. (gvim only) like mf, will mark files *netrw-quickcom* *netrw-quickcoms* @@ -946,13 +965,18 @@ QUICK REFERENCE: COMMANDS *netrw-explore-cmds* *netrw-browse-cmds* {{{2 :Vexplore[!] [dir] Vertical Split & Explore...............|netrw-explore| BOOKMARKING A DIRECTORY *netrw-mb* *netrw-bookmark* *netrw-bookmarks* {{{2 + One may easily "bookmark" a directory by using > - {cnt}mb + mb < -Any count may be used. One may use viminfo's "!" option (|'viminfo'|) to -retain bookmarks between vim sessions. See |netrw-gb| for how to return -to a bookmark and |netrw-qb| for how to list them. +Bookmarks are retained in between sesions in a $HOME/.netrwbook file, and are +kept in sorted order. + +Related Topics: + |netrw-gb| how to return (go) to a bookmark + |netrw-mB| how to delete bookmarks + |netrw-qb| how to list bookmarks BROWSING *netrw-cr* {{{2 @@ -960,7 +984,7 @@ BROWSING *netrw-cr* {{{2 Browsing is simple: move the cursor onto a file or directory of interest. Hitting the (the return key) will select the file or directory. Directories will themselves be listed, and files will be opened using the -protocol given in the original read request. +protocol given in the original read request. CAVEAT: There are four forms of listing (see |netrw-i|). Netrw assumes that two or more spaces delimit filenames and directory names for the long and @@ -1019,7 +1043,7 @@ new window and cursor at the bottom, have in your <.vimrc>. (also see |netrw-t| |netrw-v|) -There is only one tree listing buffer; using "o" on a displayed subdirectory +There is only one tree listing buffer; using "o" on a displayed subdirectory will split the screen, but the same buffer will be shown twice. Associated setting variables: |g:netrw_alto| |g:netrw_winsize| @@ -1046,7 +1070,7 @@ window and cursor at the right, have in your <.vimrc>. (also see: |netrw-o| |netrw-t|) -There is only one tree listing buffer; using "v" on a displayed subdirectory +There is only one tree listing buffer; using "v" on a displayed subdirectory will split the screen, but the same buffer will be shown twice. Associated setting variable: |g:netrw_altv| |g:netrw_winsize| @@ -1085,8 +1109,12 @@ To change directory back to a bookmarked directory, use {cnt}gb -Any count may be used to reference any of the bookmarks. See |netrw-mb| on -how to bookmark a directory and |netrw-qb| on how to list bookmarks. +Any count may be used to reference any of the bookmarks. + +Related Topics: + |netrw-mB| how to delete bookmarks + |netrw-mb| how to return to a bookmark + |netrw-qb| how to list bookmarks CHANGING TO A PREDECESSOR DIRECTORY *netrw-u* *netrw-updir* {{{2 @@ -1141,7 +1169,7 @@ Netrw determines which special handler by the following method: If g:netrw_browsex_viewer == '-', then netrwFileHandler() will be invoked first (see |netrw_filehandler|). - * for Windows 32 or 64, the url and FileProtocolHandler dlls are used. + * for Windows 32 or 64, the url and FileProtocolHandler dlls are used. * for Gnome (with gnome-open): gnome-open is used. * for KDE (with kfmclient) : kfmclient is used. * for Mac OS X : open is used. @@ -1175,11 +1203,11 @@ characters (except for the underscore) in them. To support suffices that contain such characters, netrw will first convert the suffix using the following table: > - @ -> AT ! -> EXCLAMATION % -> PERCENT - : -> COLON = -> EQUAL ? -> QUESTION + @ -> AT ! -> EXCLAMATION % -> PERCENT + : -> COLON = -> EQUAL ? -> QUESTION , -> COMMA - -> MINUS ; -> SEMICOLON - $ -> DOLLAR + -> PLUS ~ -> TILDE -< + $ -> DOLLAR + -> PLUS ~ -> TILDE +< So, for example: > file.rcs,v -> NFH_rcsCOMMAv() @@ -1191,6 +1219,18 @@ with a request. Associated setting variable: |g:netrw_browsex_viewer| *netrw-curdir* +DELETING BOOKMARKS *netrw-mB* {{{2 + +To delete a bookmark, use > + + {cnt}mB +< +Related Topics: + |netrw-gb| how to return (go) to a bookmark + |netrw-mb| how to make a bookmark + |netrw-qb| how to list bookmarks + + DELETING FILES OR DIRECTORIES *netrw-delete* *netrw-D* *netrw-del* {{{2 If files have not been marked with |netrw-mf|: (local marked file list) @@ -1232,12 +1272,12 @@ Associated setting variable: |g:netrw_local_rmdir| |g:netrw_rm_cmd| *netrw-rexplore* *netrw-sexplore* *netrw-texplore* *netrw-vexplore* DIRECTORY EXPLORATION COMMANDS {{{2 - :Explore[!] [dir]... Explore directory of current file *:Explore* - :Hexplore[!] [dir]... Horizontal Split & Explore *:Hexplore* - :Rexplore ... Return to Explorer *:Rexplore* - :Sexplore[!] [dir]... Split&Explore directory of current file *:Sexplore* - :Texplore [dir]... Tab & Explore *:Texplore* - :Vexplore[!] [dir]... Vertical Split & Explore *:Vexplore* + :[N]Explore[!] [dir]... Explore directory of current file *:Explore* + :[N]Hexplore[!] [dir]... Horizontal Split & Explore *:Hexplore* + :Rexplore ... Return to Explorer *:Rexplore* + :[N]Sexplore[!] [dir]... Split&Explore current file's directory*:Sexplore* + :Texplore [dir]... Tab & Explore *:Texplore* + :[N]Vexplore[!] [dir]... Vertical Split & Explore *:Vexplore* Used with :Explore **/pattern : (also see |netrw-starstar|) :Nexplore............. go to next matching file *:Nexplore* @@ -1259,11 +1299,15 @@ DIRECTORY EXPLORATION COMMANDS {{{2 :Vexplore! [dir] does an :Explore with |:rightbelow| vertical splitting. :Texplore [dir] does a tabnew before generating the browser window -By default, these commands use the current file's directory. However, one -may explicitly provide a directory (path) to use. +By default, these commands use the current file's directory. However, one may +explicitly provide a directory (path) to use. -The |g:netrw_winsize| variable also is used, if specified by the user, to -size Hexplore and Vexplore windows. +The [N] will override |g:netrw_winsize| to specify the quantity of rows and/or +columns the new explorer window should have. + +Otherwise, the |g:netrw_winsize| variable, if it has been specified by the +user, is used to control the quantity of rows and/or columns new explorer +windows should have. :Rexplore This command is a little different from the others. When one edits a file, for example by pressing when atop a file in @@ -1508,11 +1552,15 @@ passwords: LISTING BOOKMARKS AND HISTORY *netrw-qb* *netrw-listbookmark* {{{2 -Pressing "qb" (query bookmarks) will list the bookmarked directories and -directory traversal history (query). - -(see |netrw-mb|, |netrw-gb|, |netrw-u|, and |netrw-U|) +Pressing "qb" (query bookmarks) will list both the bookmarked directories and +directory traversal history. +Related Topics: + |netrw-gb| how to return (go) to a bookmark + |netrw-mb| how to make a bookmark + |netrw-mB| how to delete bookmarks + |netrw-u| change to a predecessor directory via the history stack + |netrw-U| change to a successor directory via the history stack MAKING A NEW DIRECTORY *netrw-d* {{{2 @@ -1762,8 +1810,8 @@ your browsing preferences. (see also: |netrw-settings|) *g:netrw_browse_split* when browsing, will open the file by: =0: re-using the same window - =1: horizontally splitting the window first - =2: vertically splitting the window first + =1: horizontally splitting the window first + =2: vertically splitting the window first =3: open file in new tab =4: act like "P" (ie. open previous window) @@ -1865,6 +1913,12 @@ your browsing preferences. (see also: |netrw-settings|) *g:netrw_hide* if true, the hiding list is used default: =0 + *g:netrw_home* The home directory for where bookmarks and + history are saved (as .netrwbook and + .netrwhist). + default: the first directory on the + |'runtimepath'| + *g:netrw_keepdir* =1 (default) keep current directory immune from the browsing directory. =0 keep the current directory the same as the @@ -1913,11 +1967,23 @@ your browsing preferences. (see also: |netrw-settings|) *g:netrw_mkdir_cmd* command for making a remote directory default: "ssh USEPORT HOSTNAME mkdir" - *g:netrw_retmap* if it exists and is set to one, then - <2-leftmouse> will be mapped for easy + *g:netrw_retmap* if it exists and is set to one, then: + * if in a netrw-selected file, AND + * no normal-mode <2-leftmouse> mapping exists, + then the <2-leftmouse> will be mapped for easy return to the netrw browser window. - (example: click once to select and open - a file, double-click to return) + example: click once to select and open a file, + double-click to return. + + Note that one may instead choose to: + * let g:netrw_retmap= 1, AND + * nmap YourChoice NetrwReturn + and have another mapping instead of + <2-leftmouse> to invoke the return. + + You may also use the |:Rexplore| command to do + the same thing. + default: =0 *g:netrw_rm_cmd* command for removing files @@ -2017,7 +2083,7 @@ your browsing preferences. (see also: |netrw-settings|) =1: number of codepoints (Latin + a combining circumflex is two codepoints) (DEFAULT) =2: number of spacing codepoints (Latin a + - combining circumflex is one spacing + combining circumflex is one spacing codepoint; a hard tab is one; wide and narrow CJK are one each; etc.) =3: virtual length (counting tabs as anything @@ -2276,7 +2342,7 @@ Associated setting variables: |g:netrw_sort_by| |g:netrw_sort_sequence| (Marlin Unruh) This program also works for me. It's a single executable, so he/she can copy it into the Windows\System32 - folder and create a shortcut to it. + folder and create a shortcut to it. (Dudley Fox) You might also wish to consider plink, as it sounds most similar to what you are looking for. plink is an @@ -2289,7 +2355,7 @@ Associated setting variables: |g:netrw_sort_by| |g:netrw_sort_sequence| http://sshwindows.sourceforge.net/ - It doesn't need the full Cygwin package. + It doesn't need the full Cygwin package. (Antoine Mechelynck) For individual Unix-like programs needed for work in a native-Windows environment, I recommend getting @@ -2300,7 +2366,7 @@ Associated setting variables: |g:netrw_sort_by| |g:netrw_sort_sequence| Unlike Cygwin, which sets up a Unix-like virtual machine on top of Windows, GnuWin32 is a rewrite of Unix utilities with Windows system calls, and its programs works quite well in the - cmd.exe "Dos box". + cmd.exe "Dos box". (dave) Download WinSCP and use that to connect to the server. In Preferences > Editors, set gvim as your editor: @@ -2327,7 +2393,7 @@ Associated setting variables: |g:netrw_sort_by| |g:netrw_sort_sequence| How to use a private key with 'pscp': > http://www.tartarus.org/~simon/puttydoc/Chapter5.html - 5.2.4 Using public key authentication with PSCP + 5.2.4 Using public key authentication with PSCP < (Ben Schmidt) I find the ssh included with cwRsync is brilliant, and install cwRsync or cwRsyncServer on most @@ -2439,10 +2505,33 @@ which is loaded automatically at startup (assuming :set nocp). ============================================================================== 12. History *netrw-history* {{{1 + v134: Sep 30, 2008 * (Sander Marechal) provided a bugfix involving + the use of the |netrw-t| command with a remote + directory. + Sep 30, 2008 * using "x" on a remote jpg was failing; fixed. + Oct 03, 2008 * bookmarks now go on a list and are stored to + the first directory on the |'runtimepath'| in + the hopes of making their retention reliable. + History now also goes to that directory. + Oct 07, 2008 * Included check that vim 7.0 or later is in use. + Oct 07, 2008 * Improved |g:netrw_retmap| handling. + Oct 12, 2008 * Based upon Sébastien Migniot's suggestion, if + cadaver isn't available then netrw will try to + use curl for the dav://... protocol. + Oct 13, 2008 * added @*/ to netrw buffers' |'iskeyword'|setting + This lets mf (|netrw-mf|) mark directories, links + and executables. + Oct 13, 2008 * avoids a second NetrwBrowse() refresh when + g:netrw_fastbrowse is <= 1 (slow, medium speed) + Oct 22, 2008 * |g:netrw_http_xcmd| may now be overridden + independently of |g:netrw_http_cmd|. + Oct 23, 2008 * [N] added to the various Explore commands to + let users specify the width/height of new + explorer windows, overriding |g:netrw_winsize|. v133: Aug 10, 2008 * NetReadFixup() for win95 was missing some "a:"s Aug 12, 2008 * (Jan Minář) an error condition in NetrwMethod() - wasn't being used, resulting in b:netrw_fname - undefined errors + wasn't being used, resulting in "b:netrw_fname + undefined" errors Aug 12, 2008 * (François Ingeirest) asked that "hi link" be changed to hi default link in the netrw syntax files. @@ -2692,7 +2781,7 @@ which is loaded automatically at startup (assuming :set nocp). decipher the name. May 07, 2007 * g:netrw_use_errorwindow now allows one to have error messages go to a reliable window - or to use a less reliable but recallable + or to use a less reliable but recallable echoerr method May 07, 2007 * g:netrw_scpport and g:netrw_sshport support use of -P and -p, respectively, to set port diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 214c57ca..db693817 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.2. Last change: 2008 Sep 14 +*starting.txt* For Vim version 7.2. Last change: 2008 Nov 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -360,6 +360,8 @@ a slash. Thus "-R" means recovery and "-/R" readonly. Can also be done with ":set updatecount=0". You can switch it on again by setting the 'updatecount' option to some value, e.g., ":set uc=100". + NOTE: Don't combine -n with -b, making -nb, because that has a + different meaning: |-nb|. 'updatecount' is set to 0 AFTER executing commands from a vimrc file, but before the GUI initializations. Thus it overrides a setting for 'updatecount' in a vimrc file, but not @@ -775,7 +777,7 @@ accordingly. Vim proceeds in this order: nocp" command if you like. For the Macintosh the $VIMRUNTIME/macmap.vim is read. - *VIMINIT* *.vimrc* *_vimrc* *EXINIT* *.exrc* *_exrc* + *VIMINIT* *.vimrc* *_vimrc* *EXINIT* *.exrc* *_exrc* *$MYVIMRC* c. Four places are searched for initializations. The first that exists is used, the others are ignored. The $MYVIMRC environment variable is set to the file that was first found, unless $MYVIMRC was already set. @@ -1491,8 +1493,15 @@ most of the information will be restored). *:ol* *:oldfiles* :ol[dfiles] List the files that have marks stored in the viminfo - file. This list is read on startup and only change + file. This list is read on startup and only changes afterwards with ":rviminfo!". Also see |v:oldfiles|. + The number can be used with |c_#<|. {not in Vi, only when compiled with the +eval feature} +:bro[wse] ol[dfiles][!] + Like |:oldfiles|, and prompt for a file number. When + the number is valid that file from the list is edited. + Use ! to abondon a modified buffer. |abandon| + {not when compiled with tiny or small features} + vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 6ab0741f..0091da7e 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.2. Last change: 2008 Jul 22 +*syntax.txt* For Vim version 7.2. Last change: 2008 Nov 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -113,6 +113,9 @@ this works, look in the file: :syntax off $VIMRUNTIME/syntax/nosyntax.vim Also see |syntax-loading|. +NOTE: If displaying long lines is slow and switching off syntax highlighting +makes it fast, consider setting the 'synmaxcol' option to a lower value. + ============================================================================== 2. Syntax files *:syn-files* diff --git a/runtime/doc/tags b/runtime/doc/tags index 8acd6bfe..84f57c23 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4,6 +4,8 @@ $ motion.txt /*$* $HOME options.txt /*$HOME* $HOME-use version5.txt /*$HOME-use* +$MYGVIMRC gui.txt /*$MYGVIMRC* +$MYVIMRC starting.txt /*$MYVIMRC* $VIM starting.txt /*$VIM* $VIM-use version5.txt /*$VIM-use* $VIMRUNTIME starting.txt /*$VIMRUNTIME* @@ -1768,7 +1770,6 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* :Print various.txt /*:Print* :Rexplore pi_netrw.txt /*:Rexplore* :RmVimball pi_vimball.txt /*:RmVimball* -:Sexplore pi_netrw.txt /*:Sexplore* :TOhtml syntax.txt /*:TOhtml* :Texplore pi_netrw.txt /*:Texplore* :UseVimball pi_vimball.txt /*:UseVimball* @@ -5616,7 +5617,9 @@ g:netrw_ftp_timelist_cmd pi_netrw.txt /*g:netrw_ftp_timelist_cmd* g:netrw_ftpmode pi_netrw.txt /*g:netrw_ftpmode* g:netrw_glob_escape pi_netrw.txt /*g:netrw_glob_escape* g:netrw_hide pi_netrw.txt /*g:netrw_hide* +g:netrw_home pi_netrw.txt /*g:netrw_home* g:netrw_http_cmd pi_netrw.txt /*g:netrw_http_cmd* +g:netrw_http_xcmd pi_netrw.txt /*g:netrw_http_xcmd* g:netrw_ignorenetrc pi_netrw.txt /*g:netrw_ignorenetrc* g:netrw_keepdir pi_netrw.txt /*g:netrw_keepdir* g:netrw_list_cmd pi_netrw.txt /*g:netrw_list_cmd* @@ -6554,6 +6557,7 @@ netrw-list pi_netrw.txt /*netrw-list* netrw-listbookmark pi_netrw.txt /*netrw-listbookmark* netrw-listhack pi_netrw.txt /*netrw-listhack* netrw-login pi_netrw.txt /*netrw-login* +netrw-mB pi_netrw.txt /*netrw-mB* netrw-mT pi_netrw.txt /*netrw-mT* netrw-mb pi_netrw.txt /*netrw-mb* netrw-mc pi_netrw.txt /*netrw-mc* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index a5a710a1..3be03140 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.2. Last change: 2008 Sep 16 +*todo.txt* For Vim version 7.2. Last change: 2008 Nov 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,25 +30,18 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -Patch 7.2.007 broke test30 on MS-Windows. (Daniel Shahaf, 2008 Sep 5) - -:cscope is listed as OK in the sandbox, but it probably isn't. -ex_cmds.h SBOXOK - -":pedit %" with a BufReadPre autocommand causes the cursor to move to the -first line. (Ingo Karkat, 2008 Jul 1) Ian Kelling is working on this. - -List of recently used files: Use viminfo marks list? -Read into list, to be used from Vim script: v:oldfiles -List file names: :oldfiles -Use a file name: :e #>>". (Matthew Winn, 2007 Oct try/catch not working for argument of return. (Matt Wozniski, 2008 Sep 15) +Tag stack not returning to right tag with ":tag". (Erik Falor, 2008 Nov 5) + Including NFA regexp code: Use "\%#= to set the engine: 0 = automatic, 1 = backtracking, 2 = new. Useful in tests. @@ -259,6 +270,9 @@ that may fail (e.g., sizeof(int)). (Blaine, 2007 Aug 21) When opening quickfix window, disable spell checking? +Problem with ".add" files when using two languages and restarting Vim. (Raul +Coronado, 2008 Oct 30) + Popup menu redraw: Instead of first redrawing the text and then drawing the popup menu over it, first draw the new popup menu, remember its position and size and then redraw the text, skipping the characters under the popup menu. @@ -274,6 +288,9 @@ Windows 98: pasting from the clipboard with text from another application has a trailing NUL. (Joachim Hofmann) Perhaps the length specified for CF_TEXT isn't right? +When a register contains illegal bytes, writing viminfo in utf-8 and reading +it back doesn't result in utf-8. (Devin Bayer) + Command line completion: Scanning for tags doesn't check for typed key now and then? Hangs for about 5 seconds. Appears to be caused by finding include files with "foo/**" in 'path'. (Kalisiak, 2006 July 15) @@ -319,6 +336,7 @@ Changes for Win32 makefile. (Mike Williams, 2007 Jan 22, Alexei Alexandrov, Patch for Win32 clipboard under Cygwin. (Frodak Baksik, Feb 15) Sutcliffe says it works well. Update 2007 May 22 for Vim 7.1 + Update 2008 Oct 2008 for Vim 7.2 (Sharonov) Win32: Patch for convert_filterW(). (Taro Muraoka, 2007 Mar 2) @@ -360,10 +378,18 @@ pointer in long and seek offset in 64 bit var. Win32: patch for fullscreen mode. (Liushaolin, 2008 April 17) +Win32: When 'shell' is cmd.exe this command fails: + echo system('"c:/path/echo.exe" "foo bar"') +Should we set the default for 'shellxquote' to a double quote, when 'shell' +contains "cmd" in the tail? (Benjamin Fritz, 2008 Oct 13) + Win32: When there is 4 Gbyte of memory mch_avail_mem() doesn't work properly. Unfished patch by Jelle Geerts, 2008 Aug 24. Let mch_avail_mem() return Kbyte instead? +Win32: With two monitors, gvim partly on both, and adding/removing a scrollbar +Vim resizes and moves to one of the monitors. (Chris Monkiewicz, 2008 Oct) + When 'bomb' is changed the window title is updated to show/hide a "+", but the tab page label isn't. (Patrick Texier, 2008 Jun 24) @@ -614,6 +640,9 @@ error and stop using the connection to the server. Problem with 'cdpath' on MS-Windows when a directory is equal to $HOME. (2006 Jul 26, Gary Johnson) +Using UTF-8 character with ":command" does not work properly. (Matt Wosniski, +2008 Sep 29) + In the Netbeans interface add a "vimeval" function, so that the other side can check the result of has("patch13"). @@ -742,6 +771,7 @@ Vim 7.3: You can already yank lines and use :@" to execute them. Most of do_source() would not be used, need a new function. It's easy when not doing breakpoints or profiling. +- Patch for Lisp support with ECL (Mikael Jansson, 2008 Oct 25) More patches: @@ -1343,6 +1373,13 @@ Macintosh: CTRL-Q. Add an option for it? - When using e_secure in do_one_cmd() mention the command being executed, otherwise it's not clear where it comes from. +- When the quickfix window is open and executing ":echo 'hello'" using the + Command-line window, the text is immediately removed by the redrawing. + (Michael Henry, 2008 Nov 1) + Generic solution: When redrawing while there is a message on the + cmdline, don't erase the display but draw over the existing text. + Other solution, redraw after closing the cmdline window, before executing + the command. 9 For Turkish vim_tolower() and vim_toupper() also need to use utf_ functions for characters below 0x80. (Sertacyildiz) 9 When the last edited file is a help file, using '0 in a new Vim doesn't @@ -3437,6 +3474,9 @@ Searching: 8 Show the progress every second. Could use the code that checks for CTRL-C to find out how much time has passed. Or use SIGALRM. Where to show the number? +8 When using an expression for ":s", set the match position in a v: + variable. So that you can do ":%s/^/\=v:lnum/" to put a line number + before each line. 7 Support for approximate-regexps to find similar words (agrep http://www.tgries.de/agrep/ tre: http://laurikari.net/tre/index.html). 8 Add an item for a big character range, so that one can search for a diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index cf4b0c6b..9f73c80e 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 7.2. Last change: 2008 Aug 06 +*various.txt* For Vim version 7.2. Last change: 2008 Oct 29 VIM REFERENCE MANUAL by Bram Moolenaar @@ -179,8 +179,8 @@ g8 Print the hex values of the bytes used in the (to start Insert mode, see |:startinsert|). A ":" command must be completed as well. And you can't use "Q" or "gQ" to start Ex mode. - {commands} cannot start with a space. Put a 1 (one) - before it, 1 space is one space. + {commands} cannot start with a space. Put a count of + 1 (one) before it, "1 " is one space. The 'insertmode' option is ignored for {commands}. This command cannot be followed by another command, since any '|' is considered part of the command. diff --git a/runtime/filetype.vim b/runtime/filetype.vim index f4483418..81d4db30 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar -" Last Change: 2008 Sep 05 +" Last Change: 2008 Nov 01 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -353,10 +353,9 @@ au BufNewFile,BufRead *.cpp \ if exists("cynlib_syntax_for_cpp")|setf cynlib|else|setf cpp|endif " C++ +au BufNewFile,BufRead *.cxx,*.c++,*.hh,*.hxx,*.hpp,*.ipp,*.moc,*.tcc,*.inl setf cpp if has("fname_case") - au BufNewFile,BufRead *.cxx,*.c++,*.C,*.H,*.hh,*.hxx,*.hpp,*.moc,*.tcc,*.inl setf cpp -else - au BufNewFile,BufRead *.cxx,*.c++,*.hh,*.hxx,*.hpp,*.moc,*.tcc,*.inl setf cpp + au BufNewFile,BufRead *.C,*.H setf cpp endif " .h files can be C, Ch C++, ObjC or ObjC++. @@ -1263,7 +1262,7 @@ if has("fname_case") else au BufNewFile,BufRead *.pl call s:FTpl() endif -au BufNewFile,BufRead *.plx setf perl +au BufNewFile,BufRead *.plx,*.al setf perl func! s:FTpl() if exists("g:filetype_pl") @@ -2082,8 +2081,13 @@ au BufNewFile,BufRead *.vim,*.vba,.exrc,_exrc setf vim " Viminfo file au BufNewFile,BufRead .viminfo,_viminfo setf viminfo -" Virata Config Script File -au BufRead,BufNewFile *.hw,*.module,*.pkg setf virata +" Virata Config Script File or Drupal module +au BufRead,BufNewFile *.hw,*.module,*.pkg + \ if getline(1) =~ ' -" Last Change: 2004 Jul 06 +" Last Change: 2008 Oct 5 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") | finish | endif @@ -13,13 +13,6 @@ let b:did_ftplugin = 1 let s:cpo_save = &cpoptions set cpoptions&vim -" Folding -if version >= 600 - " Fold all lines that do not begin with * - setlocal foldexpr=getline(v:lnum)[0]!=\"\*\" - setlocal foldmethod=expr -endif - " Set the format of the include file specification for Abaqus " Used in :check gf ^wf [i and other commands setlocal include=\\<\\cINPUT\\s*= @@ -42,29 +35,43 @@ setlocal define=^\\*\\a.*\\c\\(NAME\\\|NSET\\\|ELSET\\)\\s*= " Abaqus keywords and identifiers may include a - character setlocal iskeyword+=- +let b:undo_ftplugin = "setlocal include< includeexpr< isfname<" + \ . " comments< commentstring< define< iskeyword<" + +if has("folding") + " Fold all lines that do not begin with * + setlocal foldexpr=getline(v:lnum)[0]!=\"\*\" + setlocal foldmethod=expr + let b:undo_ftplugin .= " foldexpr< foldmethod<" +endif + " Set the file browse filter (currently only supported under Win32 gui) if has("gui_win32") && !exists("b:browsefilter") let b:browsefilter = "Abaqus Input Files (*.inp *.inc)\t*.inp;*.inc\n" . \ "Abaqus Results (*.dat)\t*.dat\n" . \ "Abaqus Messages (*.pre *.msg *.sta)\t*.pre;*.msg;*.sta\n" . \ "All Files (*.*)\t*.*\n" + let b:undo_ftplugin .= "|unlet b:browsefilter" endif -" Define keys used to move [count] sections backward or forward. -" TODO: Make this do something intelligent in visual mode. -nnoremap [[ :call Abaqus_Jump('?^\*\a?') -nnoremap ]] :call Abaqus_Jump('/^\*\a/') -function! Abaqus_Jump(motion) range - let s:count = v:count1 - mark ' - while s:count > 0 - silent! execute a:motion - let s:count = s:count - 1 - endwhile -endfunction +" Define patterns for the matchit plugin +if exists("loaded_matchit") && !exists("b:match_words") + let b:match_ignorecase = 1 + let b:match_words = + \ '\*part:\*end\s*part,' . + \ '\*assembly:\*end\s*assembly,' . + \ '\*instance:\*end\s*instance,' . + \ '\*step:\*end\s*step' + let b:undo_ftplugin .= "|unlet b:match_ignorecase b:match_words" +endif + +" Define keys used to move [count] keywords backward or forward. +noremap [[ ?^\*\a:nohlsearch +noremap ]] /^\*\a:nohlsearch " Define key to toggle commenting of the current line or range -noremap :call Abaqus_ToggleComment()j +noremap + \ :call Abaqus_ToggleComment()j function! Abaqus_ToggleComment() range if strpart(getline(a:firstline), 0, 2) == "**" " Un-comment all lines in range @@ -75,5 +82,8 @@ function! Abaqus_ToggleComment() range endif endfunction +let b:undo_ftplugin .= "|unmap [[|unmap ]]" + \ . "|unmap " + " Restore saved compatibility options let &cpoptions = s:cpo_save diff --git a/runtime/getdos.aap b/runtime/getdos.aap index 1577bdea..ea391a11 100644 --- a/runtime/getdos.aap +++ b/runtime/getdos.aap @@ -25,7 +25,7 @@ all fetch: @if get_md5(file) != "99df61106e781bfe28819a5c3e5912d0": :fetch {fetch = $fetcha} $file file = doc/cmdline.txt - @if get_md5(file) != "a094543b687a6ae17609b9cd05593b1c": + @if get_md5(file) != "bbf8a247a60b52b2e94bad0b51822265": :fetch {fetch = $fetcha} $file file = doc/debug.txt @if get_md5(file) != "dbfacfe554801fa070077a2a6cd7cdb7": @@ -46,7 +46,7 @@ all fetch: @if get_md5(file) != "d85466a169716e22b50a35b18268c43c": :fetch {fetch = $fetcha} $file file = doc/eval.txt - @if get_md5(file) != "4f4858809ce59967711bc8408a3aab1c": + @if get_md5(file) != "0daf7780fe6d6102fec2e819772d31e3": :fetch {fetch = $fetcha} $file file = doc/farsi.txt @if get_md5(file) != "8ab94d4664373206a820b8416d61c5af": @@ -64,7 +64,7 @@ all fetch: @if get_md5(file) != "d04ce3bf5a9e9cdcdff6b011247fbaa8": :fetch {fetch = $fetcha} $file file = doc/gui.txt - @if get_md5(file) != "0e5d943aebe61b6ab2779a1b6a9c319f": + @if get_md5(file) != "8054cd949915aafb4dda94680f073c6f": :fetch {fetch = $fetcha} $file file = doc/gui_w16.txt @if get_md5(file) != "2004f08531effe58d56e053af967edae": @@ -130,19 +130,19 @@ all fetch: @if get_md5(file) != "72f8554f0268c20536f71066d690c732": :fetch {fetch = $fetcha} $file file = doc/message.txt - @if get_md5(file) != "4dc5848fd29a8355fafd9767fab5f680": + @if get_md5(file) != "a73908a901557b9b01daa879ad074771": :fetch {fetch = $fetcha} $file file = doc/mlang.txt @if get_md5(file) != "32d4044efe0ce4250b5bc50e646d0b92": :fetch {fetch = $fetcha} $file file = doc/motion.txt - @if get_md5(file) != "88ab4d125a1fa9c33c5c5791d358b33e": + @if get_md5(file) != "369194086357f900cae928a982b02da6": :fetch {fetch = $fetcha} $file file = doc/netbeans.txt @if get_md5(file) != "4d6ea3c498112a8f661ec93f27c44044": :fetch {fetch = $fetcha} $file file = doc/options.txt - @if get_md5(file) != "8c217aace0b2c097c540418edf54c81f": + @if get_md5(file) != "3d253810dbdbd74f3fef4b9189ec3e45": :fetch {fetch = $fetcha} $file file = doc/os_390.txt @if get_md5(file) != "b802c3f3aa6eb5b3de48964c60195f9e": @@ -193,7 +193,7 @@ all fetch: @if get_md5(file) != "96b4b4638a6bf87c717ed1272bdb05ff": :fetch {fetch = $fetcha} $file file = doc/pi_netrw.txt - @if get_md5(file) != "0fdbd01148d25823d26bbdbfbd1b5957": + @if get_md5(file) != "8cea8db5ddf9223810e51299dd185bdd": :fetch {fetch = $fetcha} $file file = doc/pi_paren.txt @if get_md5(file) != "e55e3dc1cd3324059d2ea3de7ececf02": @@ -250,10 +250,10 @@ all fetch: @if get_md5(file) != "b0530e9b9fb8aac4caa3a381a84124ee": :fetch {fetch = $fetcha} $file file = doc/starting.txt - @if get_md5(file) != "2230f655e81d643e4aa8267d86ecdbb0": + @if get_md5(file) != "01ebcc49c8ea20a7bdf90175571d7f78": :fetch {fetch = $fetcha} $file file = doc/syntax.txt - @if get_md5(file) != "b05795e3ce692e9542921ec5a9512048": + @if get_md5(file) != "d23aff526629f7ea601b8768a72eacd0": :fetch {fetch = $fetcha} $file file = doc/tabpage.txt @if get_md5(file) != "497521819261bcfb96870a02d4a73b40": @@ -268,7 +268,7 @@ all fetch: @if get_md5(file) != "114849f7dcf01542de605be5c797fa37": :fetch {fetch = $fetcha} $file file = doc/todo.txt - @if get_md5(file) != "0a65cf79a7089b5d88f0cfb116e2a963": + @if get_md5(file) != "aa8c25a2c055459132fbb0407871547b": :fetch {fetch = $fetcha} $file file = doc/uganda.txt @if get_md5(file) != "b639f685802cc8fc4091711f752bba72": @@ -376,7 +376,7 @@ all fetch: @if get_md5(file) != "e6a4180c9c3fcb61b7ea20b64e08a75d": :fetch {fetch = $fetcha} $file file = doc/various.txt - @if get_md5(file) != "e8a2acc6945c6f50ee842d1937347aaa": + @if get_md5(file) != "0aa2232b1060b57f8a592f1542f566d8": :fetch {fetch = $fetcha} $file file = doc/version4.txt @if get_md5(file) != "5725b2997ead18ed222557a2be69e177": @@ -617,7 +617,7 @@ all fetch: @if get_md5(file) != "ce9bdd4f72052bd07185cd5cf9687de3": :fetch {fetch = $fetcha} $file file = filetype.vim - @if get_md5(file) != "6ef71922697002e0dfed3adee08d1080": + @if get_md5(file) != "cbcc0abf29b117e5664abb90a5f7b9cd": :fetch {fetch = $fetcha} $file file = scripts.vim @if get_md5(file) != "54ba1f512abd126a062d54cf0b70b392": @@ -669,13 +669,13 @@ all fetch: @if get_md5(file) != "14433d057f181ccc72a21cbf85347690": :fetch {fetch = $fetcha} $file file = autoload/netrw.vim - @if get_md5(file) != "b688a154dfba6a6cf632b59426da66e6": + @if get_md5(file) != "3f2b2229b4d3f523d9d8994d9c7633a3": :fetch {fetch = $fetcha} $file file = autoload/netrwFileHandlers.vim - @if get_md5(file) != "3bda9a928d5d5ea2507c9c221ba7902e": + @if get_md5(file) != "399ecf06c815742de9bf9065de6662e6": :fetch {fetch = $fetcha} $file file = autoload/netrwSettings.vim - @if get_md5(file) != "e00c333a978323aff9115ae20c2376b3": + @if get_md5(file) != "8cb132081a52a5c8f6122cd9c395f3ab": :fetch {fetch = $fetcha} $file file = autoload/paste.vim @if get_md5(file) != "ea89e81910ef039f52659f72e069cb79": @@ -1229,7 +1229,7 @@ all fetch: @if get_md5(file) != "bed56cf9c5e783dc09226c954e6fbbe8": :fetch {fetch = $fetcha} $file file = ftplugin/abaqus.vim - @if get_md5(file) != "b65c65794dea84dca70c0dc6fcae22b7": + @if get_md5(file) != "4cbcbb76291610b7e20ff3af839aa4ef": :fetch {fetch = $fetcha} $file file = ftplugin/ada.vim @if get_md5(file) != "da762fb94997bc2cdca820e564866fb1": @@ -1737,7 +1737,7 @@ all fetch: @if get_md5(file) != "2134e664165128ef80011bfe1e9ec527": :fetch {fetch = $fetcha} $file file = plugin/netrwPlugin.vim - @if get_md5(file) != "d623564b9138bd632d20a2f59c3056b6": + @if get_md5(file) != "bebb322d5ee794549476110127d052da": :fetch {fetch = $fetcha} $file file = plugin/rrhelper.vim @if get_md5(file) != "43cf94ae9c34e18e86ecde61f31f17b0": @@ -2209,7 +2209,7 @@ all fetch: @if get_md5(file) != "6072be6767ff62b2b8fda8be3f7bffd8": :fetch {fetch = $fetcha} $file file = syntax/fortran.vim - @if get_md5(file) != "8f3f81bfec453a3539a837c70eff659f": + @if get_md5(file) != "dd5d86c70492db2d4edbb056ee5f0c4f": :fetch {fetch = $fetcha} $file file = syntax/foxpro.vim @if get_md5(file) != "bc2b1cb5dba744ff6bc2c7efee1cfab4": @@ -2395,7 +2395,7 @@ all fetch: @if get_md5(file) != "2d14e793055e36e8f04f2aa234a97f5f": :fetch {fetch = $fetcha} $file file = syntax/java.vim - @if get_md5(file) != "bbcc6faa3f228c18f916ecbdb808a053": + @if get_md5(file) != "e6bc7d68c986d7c1ea30b4a9739a7f1b": :fetch {fetch = $fetcha} $file file = syntax/javacc.vim @if get_md5(file) != "ef7e9e58ed0c491b89062d1423ed034a": @@ -2479,7 +2479,7 @@ all fetch: @if get_md5(file) != "d29c54c1933e43be8d636db58eaa0404": :fetch {fetch = $fetcha} $file file = syntax/logtalk.vim - @if get_md5(file) != "7f9ddbcd4431e6a020cafa4b5035ae19": + @if get_md5(file) != "69b8482c2b16fd3547665cfafa4cec9a": :fetch {fetch = $fetcha} $file file = syntax/lotos.vim @if get_md5(file) != "c0cfefb794bf9846d12166e2359a8e16": @@ -2650,7 +2650,7 @@ all fetch: @if get_md5(file) != "6ff38bd5114faa25cc02f513d6e0802b": :fetch {fetch = $fetcha} $file file = syntax/netrw.vim - @if get_md5(file) != "af3650b04873e6178a90a9eab172040e": + @if get_md5(file) != "efd0a10da02050cd9549675831814d30": :fetch {fetch = $fetcha} $file file = syntax/nosyntax.vim @if get_md5(file) != "c8674cb9e6f1a1d371710e1d07fe93bc": @@ -4053,7 +4053,7 @@ all fetch: @if get_md5(file) != "684efe29ed03ae5b094cfcc4160b3573": :fetch {fetch = $fetcha} $file file = tutor/tutor.hu - @if get_md5(file) != "af021db8eb4b8d53632800323403d796": + @if get_md5(file) != "4be5529c7d7beb7dd1fc44c5d3cb743f": :fetch {fetch = $fetcha} $file file = tutor/tutor.it @if get_md5(file) != "992995099eb1d4b66e988a656d3c5895": @@ -4107,10 +4107,10 @@ all fetch: @if get_md5(file) != "26a1b9caefc27f32882f5e8119d91d4d": :fetch {fetch = $fetcha} $file file = tutor/tutor.hu.cp1250 - @if get_md5(file) != "af021db8eb4b8d53632800323403d796": + @if get_md5(file) != "4be5529c7d7beb7dd1fc44c5d3cb743f": :fetch {fetch = $fetcha} $file file = tutor/tutor.hu.utf-8 - @if get_md5(file) != "f29860f90736e07dbeab96c4ea108f9f": + @if get_md5(file) != "50bea9bca458255078843cbe730e8da9": :fetch {fetch = $fetcha} $file file = tutor/tutor.it.utf-8 @if get_md5(file) != "3a1d7f7b8216d73f1b0bbe09e7eb5607": @@ -4216,7 +4216,7 @@ all fetch: @if get_md5(file) != "af0da03b5c998a8f8ed94a66763febd9": :fetch {fetch = $fetcha} $file file = doc/tags - @if get_md5(file) != "62014a7d8c9b85d3538978ec839a6185": + @if get_md5(file) != "f94566810206769056a4d4ff7795550b": :fetch {fetch = $fetcha} $file :mkdir {f} print file = print/ascii.ps diff --git a/runtime/getunix.aap b/runtime/getunix.aap index 4dd32249..5024e24f 100644 --- a/runtime/getunix.aap +++ b/runtime/getunix.aap @@ -67,7 +67,7 @@ all fetch: @if get_md5(file) != "ba1a08e235fa7269c681f1d6471e4df0": :fetch {fetch = $fetcha} $file file = doc/starting.txt - @if get_md5(file) != "10e54ac4e68acf12e4715cabc30ca252": + @if get_md5(file) != "2f47f39312132c070a1cadf8a56bd68a": :fetch {fetch = $fetcha} $file file = doc/if_tcl.txt @if get_md5(file) != "08d16f9405911a27a31e633bdc76e748": @@ -109,7 +109,7 @@ all fetch: @if get_md5(file) != "0469488d1684092e03d56b4a2436ae58": :fetch {fetch = $fetcha} $file file = doc/message.txt - @if get_md5(file) != "e4dfc7582570fc8eb6c15e86873f1306": + @if get_md5(file) != "be110964410b06080bd2452b92620348": :fetch {fetch = $fetcha} $file file = doc/insert.txt @if get_md5(file) != "ba43b339af2b607d78e5e1f3a767a9f7": @@ -121,10 +121,10 @@ all fetch: @if get_md5(file) != "eba8440acfe0e0b3e9e1e616ac2250d3": :fetch {fetch = $fetcha} $file file = doc/cmdline.txt - @if get_md5(file) != "e57ec42d768030b9cd43e60f50aeb740": + @if get_md5(file) != "1800d3f270ff4a75fb955c280adf3f1b": :fetch {fetch = $fetcha} $file file = doc/pi_netrw.txt - @if get_md5(file) != "5f6db4bd578a979a7c3915880bba1de5": + @if get_md5(file) != "d7622c5e8a8f2966fba38b3468bdedc3": :fetch {fetch = $fetcha} $file file = doc/quotes.txt @if get_md5(file) != "e5832e5e98b4b6ee025cf53035436766": @@ -175,7 +175,7 @@ all fetch: @if get_md5(file) != "66353935f20f77035d6c15d422147579": :fetch {fetch = $fetcha} $file file = doc/gui.txt - @if get_md5(file) != "48f8161198f613b30377fc0438100fb0": + @if get_md5(file) != "582cd3c6de18f55154c15d9ee807fe7d": :fetch {fetch = $fetcha} $file file = doc/os_mint.txt @if get_md5(file) != "1a9bee087bf515d0704ac7af3c696560": @@ -211,7 +211,10 @@ all fetch: @if get_md5(file) != "3e4575f037f16cb6d100218cea6df49e": :fetch {fetch = $fetcha} $file file = doc/syntax.txt - @if get_md5(file) != "e7dd3c11e948f80f712e7d5da01a4134": + @if get_md5(file) != "4e64c04bf753f08394767c2ecd682452": + :fetch {fetch = $fetcha} $file + file = doc/todo.txt + @if get_md5(file) != "02dbf0a50e772e01ecf46ed8f1f2c0a8": :fetch {fetch = $fetcha} $file file = doc/workshop.txt @if get_md5(file) != "219e66a64511610faebdc8db4c6fe960": @@ -229,7 +232,7 @@ all fetch: @if get_md5(file) != "69f0d1e0970e4cd4ad59499d25f5567c": :fetch {fetch = $fetcha} $file file = doc/motion.txt - @if get_md5(file) != "12f1bad8a155bb5e1ffda7cfc8ac6193": + @if get_md5(file) != "ce476c39fc32e7f40e6574a77d3a41fa": :fetch {fetch = $fetcha} $file file = doc/change.txt @if get_md5(file) != "bf50f3c8d739eaf5f79da1940f59351a": @@ -241,10 +244,10 @@ all fetch: @if get_md5(file) != "898b6fec4886595d66b5c7ff304c98bd": :fetch {fetch = $fetcha} $file file = doc/various.txt - @if get_md5(file) != "7e54ae6301dab503e133e78751d31016": + @if get_md5(file) != "7fe1877bb0ded328693021f48321aec7": :fetch {fetch = $fetcha} $file file = doc/options.txt - @if get_md5(file) != "e49f2df3b018750af5a3510ea22b7693": + @if get_md5(file) != "d6a20a5fb84ef23144c44ba4959fe600": :fetch {fetch = $fetcha} $file file = doc/pi_gzip.txt @if get_md5(file) != "5ca3ce8eaca47588e1bc9bf16a1afcd0": @@ -375,6 +378,9 @@ all fetch: file = doc/ft_sql.txt @if get_md5(file) != "8953ad9b94f5a10cc61e28f7145c513b": :fetch {fetch = $fetcha} $file + file = doc/eval.txt + @if get_md5(file) != "eb792b19f876de8282629eb3ffe7a8f3": + :fetch {fetch = $fetcha} $file file = doc/usr_03.txt @if get_md5(file) != "9b32ceafa7c9b2d74e094be37674b48b": :fetch {fetch = $fetcha} $file @@ -396,12 +402,6 @@ all fetch: file = doc/pi_spec.txt @if get_md5(file) != "291c7143072ef8906e1954aa96465e1b": :fetch {fetch = $fetcha} $file - file = doc/eval.txt - @if get_md5(file) != "db82db8b54b531890264f9dfd9e03289": - :fetch {fetch = $fetcha} $file - file = doc/todo.txt - @if get_md5(file) != "504732167f89cc215162ef49d0420111": - :fetch {fetch = $fetcha} $file file = doc/Makefile @if get_md5(file) != "7cf18b4a71c49df64d147f539e7fbf1f": :fetch {fetch = $fetcha} $file @@ -617,7 +617,7 @@ all fetch: @if get_md5(file) != "34f97dceb103837465f28390e8ea1c1e": :fetch {fetch = $fetcha} $file file = filetype.vim - @if get_md5(file) != "e711b4a87667a86b1eb7b3a4c61aff8e": + @if get_md5(file) != "5aea9f1a9d07ef83d00df12bf23572a2": :fetch {fetch = $fetcha} $file file = scripts.vim @if get_md5(file) != "87cda0e807a2b92e42cde1769e829c00": @@ -648,7 +648,7 @@ all fetch: @if get_md5(file) != "1a4f70b2747396454da418853372a87b": :fetch {fetch = $fetcha} $file file = autoload/netrw.vim - @if get_md5(file) != "000bd69450c7f45e6bcec7ae46b0fdcd": + @if get_md5(file) != "6b184be13c31785680cf417859d0c343": :fetch {fetch = $fetcha} $file file = autoload/htmlcomplete.vim @if get_md5(file) != "d9d1276818e532f0a6257e6e9ad8d2d6": @@ -660,7 +660,7 @@ all fetch: @if get_md5(file) != "065b9a62b67c4797d3e5cb56c187e5ab": :fetch {fetch = $fetcha} $file file = autoload/netrwFileHandlers.vim - @if get_md5(file) != "5dc2a38655e51891dfb53ab6071d202e": + @if get_md5(file) != "ba01e292e08e58a3075cee4a80bd06de": :fetch {fetch = $fetcha} $file file = autoload/xmlcomplete.vim @if get_md5(file) != "beca52b0d638c14d259a4c68417d6470": @@ -681,7 +681,7 @@ all fetch: @if get_md5(file) != "9d528b4d33c3efdb8a4861bc9cceb92b": :fetch {fetch = $fetcha} $file file = autoload/netrwSettings.vim - @if get_md5(file) != "9041f8adcf4fc0e6b5a0c836cae62917": + @if get_md5(file) != "083198bc11abaf9cb9b4bfc487b9352b": :fetch {fetch = $fetcha} $file file = autoload/javascriptcomplete.vim @if get_md5(file) != "2b939814050b10dab16f7d2c9af2c130": @@ -1295,7 +1295,7 @@ all fetch: @if get_md5(file) != "0a822f3fbea1ada96816299877cdcf7c": :fetch {fetch = $fetcha} $file file = ftplugin/abaqus.vim - @if get_md5(file) != "f2ab23ab5d0a8ed516d38613b3993c36": + @if get_md5(file) != "7801d7b66ffed2102c97fbc9a2bf3ea2": :fetch {fetch = $fetcha} $file file = ftplugin/rpl.vim @if get_md5(file) != "5f290c7f9828e7e2e1677d41474096ab": @@ -1728,7 +1728,7 @@ all fetch: :fetch {fetch = $fetcha} $file :mkdir {f} plugin file = plugin/netrwPlugin.vim - @if get_md5(file) != "b3077aefd1ca9e788064089e231f4fcb": + @if get_md5(file) != "741ae781379280859b493805af7378fd": :fetch {fetch = $fetcha} $file file = plugin/gzip.vim @if get_md5(file) != "88a9ecef58f00ddc5775c242c3be525a": @@ -2233,7 +2233,7 @@ all fetch: @if get_md5(file) != "daaddfa98940d4abcef726e8ecff42d1": :fetch {fetch = $fetcha} $file file = syntax/fortran.vim - @if get_md5(file) != "4062b8d1074e61bda108ab1f15c6f8f1": + @if get_md5(file) != "d60569434a13be0c4d28c5f2888c30d4": :fetch {fetch = $fetcha} $file file = syntax/foxpro.vim @if get_md5(file) != "617f48747c6b959d4e44240940b47d70": @@ -2401,7 +2401,7 @@ all fetch: @if get_md5(file) != "8b83fc29a7e282fa165895b1131bb1ed": :fetch {fetch = $fetcha} $file file = syntax/java.vim - @if get_md5(file) != "5b885f4c1b8d755b0c3b6c95c2fe6b61": + @if get_md5(file) != "756c2106ef282e1f9a152c725959b79e": :fetch {fetch = $fetcha} $file file = syntax/javacc.vim @if get_md5(file) != "7b156ea71037e54fe736b0ae11c00a82": @@ -2587,7 +2587,7 @@ all fetch: @if get_md5(file) != "b091169b98867f7e3cf2e94d1412f293": :fetch {fetch = $fetcha} $file file = syntax/netrw.vim - @if get_md5(file) != "001e2b724e75e43d858ecd6220035bf3": + @if get_md5(file) != "3be52e4889b6623f89128dce6c941e49": :fetch {fetch = $fetcha} $file file = syntax/modsim3.vim @if get_md5(file) != "4b7f75d6422fdbc22a385e901d70f3b2": @@ -2653,7 +2653,7 @@ all fetch: @if get_md5(file) != "2ba9892f61ae0b92ff4ba0bfc658f021": :fetch {fetch = $fetcha} $file file = syntax/logtalk.vim - @if get_md5(file) != "57e3259965f04482def3cfbef1f6a176": + @if get_md5(file) != "eda38ea0bd848451c79204948d2b8964": :fetch {fetch = $fetcha} $file file = syntax/nosyntax.vim @if get_md5(file) != "fc6be3f145a3bc91e1edff782c5ca67a": @@ -4052,6 +4052,9 @@ all fetch: file = tutor/tutor.sk @if get_md5(file) != "43ee40950f02fa202d0dfb1f8c841944": :fetch {fetch = $fetcha} $file + file = tutor/tutor.hu + @if get_md5(file) != "c5fbfc1459bc5487e908bbb575174bf4": + :fetch {fetch = $fetcha} $file file = tutor/tutor.no @if get_md5(file) != "8196492c7c0620172db23d2e99ac4e89": :fetch {fetch = $fetcha} $file @@ -4061,9 +4064,6 @@ all fetch: file = tutor/tutor.ca @if get_md5(file) != "e01f12117ac53cb73e716f2e9b32ffd6": :fetch {fetch = $fetcha} $file - file = tutor/tutor.hu - @if get_md5(file) != "88a9d6b817543670dab5cd381c3b7109": - :fetch {fetch = $fetcha} $file file = tutor/tutor.cs @if get_md5(file) != "706b35f5b4d93af836012361888c4a66": :fetch {fetch = $fetcha} $file @@ -4109,6 +4109,9 @@ all fetch: file = tutor/tutor.ja.euc @if get_md5(file) != "37ab7f48c8f2382bcf64d3ef671b8109": :fetch {fetch = $fetcha} $file + file = tutor/tutor.hu.utf-8 + @if get_md5(file) != "a50375ed3d05cd85ad066f32b306eade": + :fetch {fetch = $fetcha} $file file = tutor/tutor.vi.utf-8 @if get_md5(file) != "0cdcfa5e9b1901648f09079766cb0a07": :fetch {fetch = $fetcha} $file @@ -4121,9 +4124,6 @@ all fetch: file = tutor/tutor.ru.utf-8 @if get_md5(file) != "fe2a7e06c8138485496d51fd07b6c157": :fetch {fetch = $fetcha} $file - file = tutor/tutor.hu.utf-8 - @if get_md5(file) != "58beb10ecfd9aa926c58a361803f74c6": - :fetch {fetch = $fetcha} $file file = tutor/tutor.cs.utf-8 @if get_md5(file) != "a3f279aff5a7480f46025f852904230a": :fetch {fetch = $fetcha} $file @@ -4140,7 +4140,7 @@ all fetch: @if get_md5(file) != "dddeed50201970c7649930df4d20efef": :fetch {fetch = $fetcha} $file file = tutor/tutor.hu.cp1250 - @if get_md5(file) != "88a9d6b817543670dab5cd381c3b7109": + @if get_md5(file) != "c5fbfc1459bc5487e908bbb575174bf4": :fetch {fetch = $fetcha} $file file = tutor/tutor.hr.cp1250 @if get_md5(file) != "7b74b73fddb1010ef696ba3d93b6f1fd": @@ -4591,7 +4591,7 @@ all fetch: @if get_md5(file) != "af0da03b5c998a8f8ed94a66763febd9": :fetch {fetch = $fetcha} $file file = doc/tags - @if get_md5(file) != "62014a7d8c9b85d3538978ec839a6185": + @if get_md5(file) != "a6b3518ecefb3f4923fb35a7d56b9353": :fetch {fetch = $fetcha} $file :mkdir {f} print file = print/cp1253.ps diff --git a/runtime/plugin/netrwPlugin.vim b/runtime/plugin/netrwPlugin.vim index e30ad824..73c5e2c6 100644 --- a/runtime/plugin/netrwPlugin.vim +++ b/runtime/plugin/netrwPlugin.vim @@ -16,19 +16,16 @@ " But be doers of the Word, and not only hearers, deluding your own selves {{{1 " (James 1:22 RSV) " =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - -" --------------------------------------------------------------------- " Load Once: {{{1 if &cp || exists("g:loaded_netrwPlugin") finish endif -let g:loaded_netrwPlugin = "v133" -let s:keepcpo = &cpo -if v:version < 700 - echohl WarningMsg | echo "***netrw*** you need vim version 7.0 for this version of netrw" | echohl None +let g:loaded_netrwPlugin = "v134" +if v:version < 702 + echohl WarningMsg | echo "***netrw*** you need vim version 7.2 for this version of netrw" | echohl None finish endif -let s:keepcpo= &cpo +let s:keepcpo = &cpo set cpo&vim " --------------------------------------------------------------------- diff --git a/runtime/syntax/fortran.vim b/runtime/syntax/fortran.vim index 1d160f28..3d323fbb 100644 --- a/runtime/syntax/fortran.vim +++ b/runtime/syntax/fortran.vim @@ -2,7 +2,7 @@ " Language: Fortran95 (and Fortran90, Fortran77, F and elf90) " Version: 0.88 " URL: http://www.unb.ca/chem/ajit/syntax/fortran.vim -" Last Change: 2006 Apr. 22 +" Last Change: 2008 Nov 01 " Maintainer: Ajit J. Thakkar (ajit AT unb.ca); " Usage: Do :help fortran-syntax from Vim " Credits: @@ -300,7 +300,7 @@ if (b:fortran_fixed_source == 1) syn match fortranLabelError "^.\{-,4}[^0-9 ]" contains=fortranTab syn match fortranLabelError "^.\{4}\d\S" endif - syn match fortranComment excludenl "^[!c*].*$" contains=@fortranCommentGroup + syn match fortranComment excludenl "^[!c*].*$" contains=@fortranCommentGroup,@spell syn match fortranLeftMargin transparent "^ \{5}" syn match fortranContinueMark display "^.\{5}\S"lc=5 else diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim index d5e32fae..1b7e7d67 100644 --- a/runtime/syntax/java.vim +++ b/runtime/syntax/java.vim @@ -2,7 +2,7 @@ " Language: Java " Maintainer: Claudio Fleiner " URL: http://www.fleiner.com/vim/syntax/java.vim -" Last Change: 2007 Dec 21 +" Last Change: 2008 Nov 06 " Please check :help java.vim for comments on some of the options available. @@ -179,7 +179,7 @@ syn match javaComment "/\*\*/" " Strings and constants syn match javaSpecialError contained "\\." syn match javaSpecialCharError contained "[^']" -syn match javaSpecialChar contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\)" +syn match javaSpecialChar contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\+\x\{4\}\)" syn region javaString start=+"+ end=+"+ end=+$+ contains=javaSpecialChar,javaSpecialError,@Spell " next line disabled, it can cause a crash for a long line "syn match javaStringError +"\([^"\\]\|\\.\)*$+ @@ -192,7 +192,7 @@ syn match javaNumber "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>" syn match javaNumber "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>" " unicode characters -syn match javaSpecial "\\u\d\{4\}" +syn match javaSpecial "\\u\+\d\{4\}" syn cluster javaTop add=javaString,javaCharacter,javaNumber,javaSpecial,javaStringError diff --git a/runtime/syntax/logtalk.vim b/runtime/syntax/logtalk.vim index 5fcbb097..7d90cd88 100644 --- a/runtime/syntax/logtalk.vim +++ b/runtime/syntax/logtalk.vim @@ -2,7 +2,7 @@ " " Language: Logtalk " Maintainer: Paulo Moura -" Last Change: June 16, 2008 +" Last Change: Oct 31, 2008 " Quit when a syntax file was already loaded: @@ -51,9 +51,9 @@ syn region logtalkExtCall matchgroup=logtalkExtCallTag start="{" matchgroup=l " Logtalk opening entity directives -syn region logtalkOpenEntityDir matchgroup=logtalkOpenEntityDirTag start=":- object(" matchgroup=logtalkOpenEntityDirTag end=")\." contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkString,logtalkAtom,logtalkEntityRel -syn region logtalkOpenEntityDir matchgroup=logtalkOpenEntityDirTag start=":- protocol(" matchgroup=logtalkOpenEntityDirTag end=")\." contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkEntityRel -syn region logtalkOpenEntityDir matchgroup=logtalkOpenEntityDirTag start=":- category(" matchgroup=logtalkOpenEntityDirTag end=")\." contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkEntityRel +syn region logtalkOpenEntityDir matchgroup=logtalkOpenEntityDirTag start=":- object(" matchgroup=logtalkOpenEntityDirTag end=")\." contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkString,logtalkAtom,logtalkEntityRel,logtalkLineComment +syn region logtalkOpenEntityDir matchgroup=logtalkOpenEntityDirTag start=":- protocol(" matchgroup=logtalkOpenEntityDirTag end=")\." contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkEntityRel,logtalkLineComment +syn region logtalkOpenEntityDir matchgroup=logtalkOpenEntityDirTag start=":- category(" matchgroup=logtalkOpenEntityDirTag end=")\." contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkEntityRel,logtalkLineComment " Logtalk closing entity directives diff --git a/runtime/syntax/netrw.vim b/runtime/syntax/netrw.vim index 1d9d3286..9941e1e3 100644 --- a/runtime/syntax/netrw.vim +++ b/runtime/syntax/netrw.vim @@ -22,7 +22,7 @@ syn match netrwDir "\%(\S\+ \)*\S\+/" contains=netrwClassify syn match netrwSizeDate "\<\d\+\s\d\{1,2}/\d\{1,2}/\d\{4}\s" contains=netrwDateSep skipwhite nextgroup=netrwTime syn match netrwSymLink "\%(\S\+ \)*\S\+@\ze\%(\s\{2,}\|$\)" contains=netrwClassify syn match netrwExe "\%(\S\+ \)*\S\+\*\ze\%(\s\{2,}\|$\)" contains=netrwClassify -syn match netrwTreeBar "^\%(| \)*" contains=netrwTreeBarSpace nextgroup=@netrwTreeGroup +syn match netrwTreeBar "^\%([-+|] \)*" contains=netrwTreeBarSpace nextgroup=@netrwTreeGroup syn match netrwTreeBarSpace " " contained syn match netrwClassify "[*=|@/]\ze\%(\s\{2,}\|$\)" contained diff --git a/runtime/tutor/tutor.hu b/runtime/tutor/tutor.hu index 84e6bd42..6fb32709 100644 --- a/runtime/tutor/tutor.hu +++ b/runtime/tutor/tutor.hu @@ -1,5 +1,5 @@ =============================================================================== -= Ü d v ö z ö l j ü k a V I M T u t o r b a n - 1.5-ös verzió === +== Ü d v ö z ö l j ü k a V I M - o k t a t ó b a n - 1.5-ös verzió == =============================================================================== A Vim egy nagyon hatékony szerkesztõ, amelnyek rengeteg utasítása @@ -38,7 +38,7 @@ 2. Tartsa lenyomva a lefelét (j), akkor ismétlõdik! ---> Most tudja, hogyan mehet a következõ leckére. - 3. A lefelé fomb használatával menjen a 1.2. leckére! + 3. A lefelé gomb használatával menjen a 1.2. leckére! Megj: Ha nem biztos benne, mit nyomott meg, nyomja meg az -et, hogy normál módba kerüljön, és ismételje meg a parancsot! @@ -60,8 +60,8 @@ Megj: A kurzor gomboknak is m Ha menteni szeretné a változásokat és kilépni, írja: :wq - 3. Amikor a shell promptot látja, írja be a parancsot, amely ebbe a - tutorba hozza: + 3. Amikor a shell promptot látja, írja be a parancsot, amely ebbe az + oktatóba hozza: Ez valószínûleg: vimtutor Normális esetben ezt írná: vim tutor.hu @@ -230,7 +230,7 @@ MEGJ: V ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 2.5. lecke: A VISSZAVONÁS (UNDO) PARANCS + 2.5. lecke: A VISSZAVONÁS (UNDO) PARANCS ** u gépelésével visszavonható az utolsó parancs, U az egész sort helyreállítja. ** @@ -245,9 +245,9 @@ MEGJ: V 7. CTRL-R (CTRL gomb lenyomása mellett üssön R-t) párszor csinálja újra a visszavont parancsokat (redo)! ----> Javíítsd a hhibákaat ebbben a sooorban majd állítsa visszaaa az eredetit. +---> Javíítsa a hhibákaat ebbben a sooorban majd állítsa visszaaa az eredetit. - 8. Ezek nagyon hasznos parancsok. Most ugarjon a 2. lecke összefoglalójára. + 8. Ezek nagyon hasznos parancsok. Most ugorjon a 2. lecke összefoglalójára. @@ -257,7 +257,7 @@ MEGJ: V 1. Törlés a kurzortól a szó végéig: dw - 2. Törlés a kurzortól a szó végéig: d$ + 2. Törlés a kurzortól a sor végéig: d$ 3. Egész sor törlése: dd @@ -275,7 +275,7 @@ MEGJ: V Visszavonások visszavonása: CTRL-R ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 3.1. lecke: A PUT PARANCS + 3.1. lecke: A BEILLESZTÉS (PUT) PARANCS ** p leütésével az utolsónak töröltet a kurzor után illeszhetjük. ** @@ -284,8 +284,8 @@ MEGJ: V 2. dd leütésével töröljük a sort és eltérolódik a Vim pufferében. - 3. Mozgassuk a kurzort AFÖLÉ a sor fölé, ahová mozgatni szeretnénk a - törölt sort. + 3. Mozgassuk a kurzort azelõtt a sor ELÕTTI sorba, ahová mozgatni + szeretnénk a törölt sort. 4. Normál módban írjunk p betût a törölt sor beillesztéséhez. @@ -299,7 +299,7 @@ MEGJ: V ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 3.2. lecke: A REPLACE PARANCS + 3.2. lecke: AZ ÁTÍRÁS (REPLACE) PARANCS ** r és a karakterek leütésével a kurzor alatti karaktert megváltoztatjuk. ** @@ -321,7 +321,7 @@ MEGJ: Eml ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 3.3. lecke: A CHANGE PARANCS + 3.3. lecke: A CSERE (CHANGE) PARANCS ** A szó egy részének megváltoztatásához írjuk: cw . ** @@ -415,7 +415,7 @@ Ugorjunk a k ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 4.2. lecke: A SEARCH PARANCS + 4.2. lecke: A KERESÉS (SEARCH) PARANCS ** / majd a kívánt kifejezés beírásával kereshetjük meg a kifejezést. ** @@ -459,7 +459,7 @@ Megj: Ez nagyon hasznos, ha olyan programot debugolunk, amelyben a ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 4.4. lecke: A HIBÁK KIJAVÍTÁSÁNAK EGY MÓDJA + 4.4. lecke: A HIBÁK KIJAVÍTÁSÁNAK EGY MÓDJA ** :s/új/régi/g begépelésével az 'új'-ra cseréljük a 'régi'-t. ** @@ -470,10 +470,10 @@ Megj: Ez nagyon hasznos, ha olyan programot debugolunk, amelyben a sorban. 3. Most ezt írjuk: :s/eggy/egg/g amely globálisan helyettesít - a sorban. + a sorban, azaz minden elõfordulást. Ez a sorban minden elõfordulást helyettesít. ----> eggy hegy meggy, szembe jön eggy másik heggy. +---> eggy heggy meggy, szembe jön eggy másik heggy. 4. Két sor között a karaktersor minden elõfordulásának helyettesítése: :#,#s/régi/új/g ahol #,# a két sor sorszáma. @@ -530,7 +530,7 @@ Megj: Minden : parancs ut ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 5.2. lecke: BÕVEBBEN A FÁJLOK ÍRÁSÁRÓL + 5.2. lecke: BÕVEBBEN A FÁJLOK ÍRÁSÁRÓL ** A fájlok változásait így írhatjuk ki :w FÁJLNÉV. ** @@ -542,12 +542,12 @@ Megj: Minden : parancs ut 3. Írja: :w TESZT (ahol TESZT a választott fájlnév)! - 4. Ez elmenti a teljes fájlt (a Vim Tutort) TESZT néven. + 4. Ez elmenti a teljes fájlt (a Vim oktatóját) TESZT néven. Ellenõrzésképp írjuk ismét :!dir hogy lássuk a könyvtárat! (Felfelé gombbal : után az elõzõ utasítások visszahozhatóak.) Megj: Ha Ön kilépne a Vimbõl és és visszatérne a TESZT fájlnévvel, akkor a - fájl a tutor mentéskori pontos másolata lenne. + fájl az oktató mentéskori pontos másolata lenne. 5. Távolítsa el a fájlt (MS-DOS): :!del TESZT vagy (Unix): :!rm TESZT @@ -626,7 +626,7 @@ MEGJ: A f ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 6.1. lecke: A OPEN PARANCS + 6.1. lecke: A MEGNYITÁS (OPEN) PARANCS ** o beírásával nyithat egy új sort a kurzor alatt és válthat beszúró módba ** @@ -684,16 +684,17 @@ Megj: A Vimben a sor legv 1. Mozgassuk a kurzort az elsõ ---> kezdetû sorra! - 2. Place the cursor at the beginning of the first word that is different - from the second line marked ---> (the word 'last'). + 2. Helyezze a kurzort az elsõ szó elejére amely eltér a második + ---> kezdetû sor tartalmától (a 'az utolsóval' résztõl). - 3. Now type R and replace the remainder of the text on the first line by - typing over the old text to make the first line the same as the second. + 3. Nyomjon R karaktert és írja ét a szöveg maradékát az elsõ sorban + úgy, hogy a két sor egyezõ legyen. ----> To make the first line the same as the last on this page use the keys. ----> To make the first line the same as the second, type R and the new text. +---> Az elsõ sort tegye azonossá az utolsóval: használja a gombokat. +---> Az elsõ sort tegye azonossá a másodikkal: írjon R-t és az új szöveget. - 4. Note that when you press to exit, any unaltered text remains. + 4. Jegyezzük meg, ha -et nyomok, akkor a változatlanuk hagyott + szövegek változatlanok maradnak. @@ -726,16 +727,16 @@ Megj: A Vimben a sor legv 6. LECKE ÖSSZEFOGLALÓJA - 1. Typing o opens a line BELOW the cursor and places the cursor on the open - line in Insert mode. - Typing a capital O opens the line ABOVE the line the cursor is on. + 1. o beírásával új sort nyitunk meg a sor ALATT és a kurzor az új + sorban lesz beszúrás-módban. + Nagy O a sor FELETT nyit új sort, és oda kerül a kurzor. - 2. Type an a to insert text AFTER the character the cursor is on. - Typing a capital A automatically appends text to the end of the line. + 2. a beírásával az aktuális karaktertõl UTÁN (jobbra) szúrhatunk be szöveget. + Nagy A automatikusan a sor legvégéhez adja hozzá a szöveget. - 3. Typing a capital R enters Replace mode until is pressed to exit. + 3. A nagy R beütésével átíró (replace) módba kerülünk lenyomásáig. - 4. Typing ":set xxx" sets the option "xxx" + 4. ":set xxx" beírásával az "xxx" opció állítható be. @@ -746,7 +747,7 @@ Megj: A Vimben a sor legv ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 7. lecke: ON-LINE HELP PARANCSOK + 7. lecke: AZ ON-LINE SÚGÓ PARANCSAI ** Az online súgórendszer használata ** @@ -801,8 +802,9 @@ Megj: A Vimben a sor legv tudóknak: ":help user-manual". (egyelõre nem tud magyarul) További magyar olvasnivalók érhetõek el az alábbi oldalról. - http://ubuntu.hu/index.php?title=Vim + http://wiki.hup.hu/index.php/Vim + Angol olvasmányok: For further reading and studying, this book is recommended: Vim - Vi Improved - by Steve Oualline Publisher: New Riders @@ -816,8 +818,13 @@ Megj: A Vimben a sor legv It is a good book to get to know almost anything you want to do with Vi. The sixth edition also includes information on Vim. - This tutorial was written by Michael C. Pierce and Robert K. Ware, - Colorado School of Mines using ideas supplied by Charles Smith, - Colorado State University. E-mail: bware@mines.colorado.edu. + Ezt az oktatót Michael C. Pierce és Robert K. Ware írta, a Colorado + School of Mines dolgozói Charles Smith (Colorado State University) + támogatásával. + + E-mail: bware@mines.colorado.edu. + + A Vimhez idomította Bram Moolenaar. + + Magyarította: Horváth Árpád , 2006-2008 - Modified for Vim by Bram Moolenaar. diff --git a/runtime/tutor/tutor.hu.cp1250 b/runtime/tutor/tutor.hu.cp1250 index 84e6bd42..6fb32709 100644 --- a/runtime/tutor/tutor.hu.cp1250 +++ b/runtime/tutor/tutor.hu.cp1250 @@ -1,5 +1,5 @@ =============================================================================== -= Ü d v ö z ö l j ü k a V I M T u t o r b a n - 1.5-ös verzió === +== Ü d v ö z ö l j ü k a V I M - o k t a t ó b a n - 1.5-ös verzió == =============================================================================== A Vim egy nagyon hatékony szerkesztõ, amelnyek rengeteg utasítása @@ -38,7 +38,7 @@ 2. Tartsa lenyomva a lefelét (j), akkor ismétlõdik! ---> Most tudja, hogyan mehet a következõ leckére. - 3. A lefelé fomb használatával menjen a 1.2. leckére! + 3. A lefelé gomb használatával menjen a 1.2. leckére! Megj: Ha nem biztos benne, mit nyomott meg, nyomja meg az -et, hogy normál módba kerüljön, és ismételje meg a parancsot! @@ -60,8 +60,8 @@ Megj: A kurzor gomboknak is m Ha menteni szeretné a változásokat és kilépni, írja: :wq - 3. Amikor a shell promptot látja, írja be a parancsot, amely ebbe a - tutorba hozza: + 3. Amikor a shell promptot látja, írja be a parancsot, amely ebbe az + oktatóba hozza: Ez valószínûleg: vimtutor Normális esetben ezt írná: vim tutor.hu @@ -230,7 +230,7 @@ MEGJ: V ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 2.5. lecke: A VISSZAVONÁS (UNDO) PARANCS + 2.5. lecke: A VISSZAVONÁS (UNDO) PARANCS ** u gépelésével visszavonható az utolsó parancs, U az egész sort helyreállítja. ** @@ -245,9 +245,9 @@ MEGJ: V 7. CTRL-R (CTRL gomb lenyomása mellett üssön R-t) párszor csinálja újra a visszavont parancsokat (redo)! ----> Javíítsd a hhibákaat ebbben a sooorban majd állítsa visszaaa az eredetit. +---> Javíítsa a hhibákaat ebbben a sooorban majd állítsa visszaaa az eredetit. - 8. Ezek nagyon hasznos parancsok. Most ugarjon a 2. lecke összefoglalójára. + 8. Ezek nagyon hasznos parancsok. Most ugorjon a 2. lecke összefoglalójára. @@ -257,7 +257,7 @@ MEGJ: V 1. Törlés a kurzortól a szó végéig: dw - 2. Törlés a kurzortól a szó végéig: d$ + 2. Törlés a kurzortól a sor végéig: d$ 3. Egész sor törlése: dd @@ -275,7 +275,7 @@ MEGJ: V Visszavonások visszavonása: CTRL-R ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 3.1. lecke: A PUT PARANCS + 3.1. lecke: A BEILLESZTÉS (PUT) PARANCS ** p leütésével az utolsónak töröltet a kurzor után illeszhetjük. ** @@ -284,8 +284,8 @@ MEGJ: V 2. dd leütésével töröljük a sort és eltérolódik a Vim pufferében. - 3. Mozgassuk a kurzort AFÖLÉ a sor fölé, ahová mozgatni szeretnénk a - törölt sort. + 3. Mozgassuk a kurzort azelõtt a sor ELÕTTI sorba, ahová mozgatni + szeretnénk a törölt sort. 4. Normál módban írjunk p betût a törölt sor beillesztéséhez. @@ -299,7 +299,7 @@ MEGJ: V ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 3.2. lecke: A REPLACE PARANCS + 3.2. lecke: AZ ÁTÍRÁS (REPLACE) PARANCS ** r és a karakterek leütésével a kurzor alatti karaktert megváltoztatjuk. ** @@ -321,7 +321,7 @@ MEGJ: Eml ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 3.3. lecke: A CHANGE PARANCS + 3.3. lecke: A CSERE (CHANGE) PARANCS ** A szó egy részének megváltoztatásához írjuk: cw . ** @@ -415,7 +415,7 @@ Ugorjunk a k ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 4.2. lecke: A SEARCH PARANCS + 4.2. lecke: A KERESÉS (SEARCH) PARANCS ** / majd a kívánt kifejezés beírásával kereshetjük meg a kifejezést. ** @@ -459,7 +459,7 @@ Megj: Ez nagyon hasznos, ha olyan programot debugolunk, amelyben a ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 4.4. lecke: A HIBÁK KIJAVÍTÁSÁNAK EGY MÓDJA + 4.4. lecke: A HIBÁK KIJAVÍTÁSÁNAK EGY MÓDJA ** :s/új/régi/g begépelésével az 'új'-ra cseréljük a 'régi'-t. ** @@ -470,10 +470,10 @@ Megj: Ez nagyon hasznos, ha olyan programot debugolunk, amelyben a sorban. 3. Most ezt írjuk: :s/eggy/egg/g amely globálisan helyettesít - a sorban. + a sorban, azaz minden elõfordulást. Ez a sorban minden elõfordulást helyettesít. ----> eggy hegy meggy, szembe jön eggy másik heggy. +---> eggy heggy meggy, szembe jön eggy másik heggy. 4. Két sor között a karaktersor minden elõfordulásának helyettesítése: :#,#s/régi/új/g ahol #,# a két sor sorszáma. @@ -530,7 +530,7 @@ Megj: Minden : parancs ut ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 5.2. lecke: BÕVEBBEN A FÁJLOK ÍRÁSÁRÓL + 5.2. lecke: BÕVEBBEN A FÁJLOK ÍRÁSÁRÓL ** A fájlok változásait így írhatjuk ki :w FÁJLNÉV. ** @@ -542,12 +542,12 @@ Megj: Minden : parancs ut 3. Írja: :w TESZT (ahol TESZT a választott fájlnév)! - 4. Ez elmenti a teljes fájlt (a Vim Tutort) TESZT néven. + 4. Ez elmenti a teljes fájlt (a Vim oktatóját) TESZT néven. Ellenõrzésképp írjuk ismét :!dir hogy lássuk a könyvtárat! (Felfelé gombbal : után az elõzõ utasítások visszahozhatóak.) Megj: Ha Ön kilépne a Vimbõl és és visszatérne a TESZT fájlnévvel, akkor a - fájl a tutor mentéskori pontos másolata lenne. + fájl az oktató mentéskori pontos másolata lenne. 5. Távolítsa el a fájlt (MS-DOS): :!del TESZT vagy (Unix): :!rm TESZT @@ -626,7 +626,7 @@ MEGJ: A f ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 6.1. lecke: A OPEN PARANCS + 6.1. lecke: A MEGNYITÁS (OPEN) PARANCS ** o beírásával nyithat egy új sort a kurzor alatt és válthat beszúró módba ** @@ -684,16 +684,17 @@ Megj: A Vimben a sor legv 1. Mozgassuk a kurzort az elsõ ---> kezdetû sorra! - 2. Place the cursor at the beginning of the first word that is different - from the second line marked ---> (the word 'last'). + 2. Helyezze a kurzort az elsõ szó elejére amely eltér a második + ---> kezdetû sor tartalmától (a 'az utolsóval' résztõl). - 3. Now type R and replace the remainder of the text on the first line by - typing over the old text to make the first line the same as the second. + 3. Nyomjon R karaktert és írja ét a szöveg maradékát az elsõ sorban + úgy, hogy a két sor egyezõ legyen. ----> To make the first line the same as the last on this page use the keys. ----> To make the first line the same as the second, type R and the new text. +---> Az elsõ sort tegye azonossá az utolsóval: használja a gombokat. +---> Az elsõ sort tegye azonossá a másodikkal: írjon R-t és az új szöveget. - 4. Note that when you press to exit, any unaltered text remains. + 4. Jegyezzük meg, ha -et nyomok, akkor a változatlanuk hagyott + szövegek változatlanok maradnak. @@ -726,16 +727,16 @@ Megj: A Vimben a sor legv 6. LECKE ÖSSZEFOGLALÓJA - 1. Typing o opens a line BELOW the cursor and places the cursor on the open - line in Insert mode. - Typing a capital O opens the line ABOVE the line the cursor is on. + 1. o beírásával új sort nyitunk meg a sor ALATT és a kurzor az új + sorban lesz beszúrás-módban. + Nagy O a sor FELETT nyit új sort, és oda kerül a kurzor. - 2. Type an a to insert text AFTER the character the cursor is on. - Typing a capital A automatically appends text to the end of the line. + 2. a beírásával az aktuális karaktertõl UTÁN (jobbra) szúrhatunk be szöveget. + Nagy A automatikusan a sor legvégéhez adja hozzá a szöveget. - 3. Typing a capital R enters Replace mode until is pressed to exit. + 3. A nagy R beütésével átíró (replace) módba kerülünk lenyomásáig. - 4. Typing ":set xxx" sets the option "xxx" + 4. ":set xxx" beírásával az "xxx" opció állítható be. @@ -746,7 +747,7 @@ Megj: A Vimben a sor legv ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 7. lecke: ON-LINE HELP PARANCSOK + 7. lecke: AZ ON-LINE SÚGÓ PARANCSAI ** Az online súgórendszer használata ** @@ -801,8 +802,9 @@ Megj: A Vimben a sor legv tudóknak: ":help user-manual". (egyelõre nem tud magyarul) További magyar olvasnivalók érhetõek el az alábbi oldalról. - http://ubuntu.hu/index.php?title=Vim + http://wiki.hup.hu/index.php/Vim + Angol olvasmányok: For further reading and studying, this book is recommended: Vim - Vi Improved - by Steve Oualline Publisher: New Riders @@ -816,8 +818,13 @@ Megj: A Vimben a sor legv It is a good book to get to know almost anything you want to do with Vi. The sixth edition also includes information on Vim. - This tutorial was written by Michael C. Pierce and Robert K. Ware, - Colorado School of Mines using ideas supplied by Charles Smith, - Colorado State University. E-mail: bware@mines.colorado.edu. + Ezt az oktatót Michael C. Pierce és Robert K. Ware írta, a Colorado + School of Mines dolgozói Charles Smith (Colorado State University) + támogatásával. + + E-mail: bware@mines.colorado.edu. + + A Vimhez idomította Bram Moolenaar. + + Magyarította: Horváth Árpád , 2006-2008 - Modified for Vim by Bram Moolenaar. diff --git a/runtime/tutor/tutor.hu.utf-8 b/runtime/tutor/tutor.hu.utf-8 index b64155ff..ec486d91 100644 --- a/runtime/tutor/tutor.hu.utf-8 +++ b/runtime/tutor/tutor.hu.utf-8 @@ -1,5 +1,5 @@ =============================================================================== -= Ü d v ö z ö l j ü k a V I M T u t o r b a n - 1.5-ös verzió === +== Ü d v ö z ö l j ü k a V I M - o k t a t ó b a n - 1.5-ös verzió == =============================================================================== A Vim egy nagyon hatékony szerkesztő, amelnyek rengeteg utasítása @@ -38,7 +38,7 @@ 2. Tartsa lenyomva a lefelét (j), akkor ismétlődik! ---> Most tudja, hogyan mehet a következő leckére. - 3. A lefelé fomb használatával menjen a 1.2. leckére! + 3. A lefelé gomb használatával menjen a 1.2. leckére! Megj: Ha nem biztos benne, mit nyomott meg, nyomja meg az -et, hogy normál módba kerüljön, és ismételje meg a parancsot! @@ -60,8 +60,8 @@ Megj: A kurzor gomboknak is működniük kell, de a hjkl használatával Ha menteni szeretné a változásokat és kilépni, írja: :wq - 3. Amikor a shell promptot látja, írja be a parancsot, amely ebbe a - tutorba hozza: + 3. Amikor a shell promptot látja, írja be a parancsot, amely ebbe az + oktatóba hozza: Ez valószínűleg: vimtutor Normális esetben ezt írná: vim tutor.hu @@ -230,7 +230,7 @@ MEGJ: Vállalkozóbbak kedvéért, csupán az objektum begépelésével parancs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 2.5. lecke: A VISSZAVONÁS (UNDO) PARANCS + 2.5. lecke: A VISSZAVONÁS (UNDO) PARANCS ** u gépelésével visszavonható az utolsó parancs, U az egész sort helyreállítja. ** @@ -245,9 +245,9 @@ MEGJ: Vállalkozóbbak kedvéért, csupán az objektum begépelésével parancs 7. CTRL-R (CTRL gomb lenyomása mellett üssön R-t) párszor csinálja újra a visszavont parancsokat (redo)! ----> Javíítsd a hhibákaat ebbben a sooorban majd állítsa visszaaa az eredetit. +---> Javíítsa a hhibákaat ebbben a sooorban majd állítsa visszaaa az eredetit. - 8. Ezek nagyon hasznos parancsok. Most ugarjon a 2. lecke összefoglalójára. + 8. Ezek nagyon hasznos parancsok. Most ugorjon a 2. lecke összefoglalójára. @@ -257,7 +257,7 @@ MEGJ: Vállalkozóbbak kedvéért, csupán az objektum begépelésével parancs 1. Törlés a kurzortól a szó végéig: dw - 2. Törlés a kurzortól a szó végéig: d$ + 2. Törlés a kurzortól a sor végéig: d$ 3. Egész sor törlése: dd @@ -275,7 +275,7 @@ MEGJ: Vállalkozóbbak kedvéért, csupán az objektum begépelésével parancs Visszavonások visszavonása: CTRL-R ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 3.1. lecke: A PUT PARANCS + 3.1. lecke: A BEILLESZTÉS (PUT) PARANCS ** p leütésével az utolsónak töröltet a kurzor után illeszhetjük. ** @@ -284,8 +284,8 @@ MEGJ: Vállalkozóbbak kedvéért, csupán az objektum begépelésével parancs 2. dd leütésével töröljük a sort és eltérolódik a Vim pufferében. - 3. Mozgassuk a kurzort AFÖLÉ a sor fölé, ahová mozgatni szeretnénk a - törölt sort. + 3. Mozgassuk a kurzort azelőtt a sor ELŐTTI sorba, ahová mozgatni + szeretnénk a törölt sort. 4. Normál módban írjunk p betűt a törölt sor beillesztéséhez. @@ -299,7 +299,7 @@ MEGJ: Vállalkozóbbak kedvéért, csupán az objektum begépelésével parancs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 3.2. lecke: A REPLACE PARANCS + 3.2. lecke: AZ ÁTÍRÁS (REPLACE) PARANCS ** r és a karakterek leütésével a kurzor alatti karaktert megváltoztatjuk. ** @@ -321,7 +321,7 @@ MEGJ: Emlékezzen, hogy nem memorizálással, hanem gyakorlással tanuljon. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 3.3. lecke: A CHANGE PARANCS + 3.3. lecke: A CSERE (CHANGE) PARANCS ** A szó egy részének megváltoztatásához írjuk: cw . ** @@ -415,7 +415,7 @@ Ugorjunk a következő leckére! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 4.2. lecke: A SEARCH PARANCS + 4.2. lecke: A KERESÉS (SEARCH) PARANCS ** / majd a kívánt kifejezés beírásával kereshetjük meg a kifejezést. ** @@ -459,7 +459,7 @@ Megj: Ez nagyon hasznos, ha olyan programot debugolunk, amelyben a ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 4.4. lecke: A HIBÁK KIJAVÍTÁSÁNAK EGY MÓDJA + 4.4. lecke: A HIBÁK KIJAVÍTÁSÁNAK EGY MÓDJA ** :s/új/régi/g begépelésével az 'új'-ra cseréljük a 'régi'-t. ** @@ -470,10 +470,10 @@ Megj: Ez nagyon hasznos, ha olyan programot debugolunk, amelyben a sorban. 3. Most ezt írjuk: :s/eggy/egg/g amely globálisan helyettesít - a sorban. + a sorban, azaz minden előfordulást. Ez a sorban minden előfordulást helyettesít. ----> eggy hegy meggy, szembe jön eggy másik heggy. +---> eggy heggy meggy, szembe jön eggy másik heggy. 4. Két sor között a karaktersor minden előfordulásának helyettesítése: :#,#s/régi/új/g ahol #,# a két sor sorszáma. @@ -530,7 +530,7 @@ Megj: Minden : parancs után -t kell ütni. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 5.2. lecke: BŐVEBBEN A FÁJLOK ÍRÁSÁRÓL + 5.2. lecke: BŐVEBBEN A FÁJLOK ÍRÁSÁRÓL ** A fájlok változásait így írhatjuk ki :w FÁJLNÉV. ** @@ -542,12 +542,12 @@ Megj: Minden : parancs után -t kell ütni. 3. Írja: :w TESZT (ahol TESZT a választott fájlnév)! - 4. Ez elmenti a teljes fájlt (a Vim Tutort) TESZT néven. + 4. Ez elmenti a teljes fájlt (a Vim oktatóját) TESZT néven. Ellenőrzésképp írjuk ismét :!dir hogy lássuk a könyvtárat! (Felfelé gombbal : után az előző utasítások visszahozhatóak.) Megj: Ha Ön kilépne a Vimből és és visszatérne a TESZT fájlnévvel, akkor a - fájl a tutor mentéskori pontos másolata lenne. + fájl az oktató mentéskori pontos másolata lenne. 5. Távolítsa el a fájlt (MS-DOS): :!del TESZT vagy (Unix): :!rm TESZT @@ -626,7 +626,7 @@ MEGJ: A fájl, amit beillesztett a kurzora alatt helyezkedik el. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 6.1. lecke: A OPEN PARANCS + 6.1. lecke: A MEGNYITÁS (OPEN) PARANCS ** o beírásával nyithat egy új sort a kurzor alatt és válthat beszúró módba ** @@ -684,16 +684,17 @@ Megj: A Vimben a sor legvégére is lehet állni, azonba ez elődjében 1. Mozgassuk a kurzort az első ---> kezdetű sorra! - 2. Place the cursor at the beginning of the first word that is different - from the second line marked ---> (the word 'last'). + 2. Helyezze a kurzort az első szó elejére amely eltér a második + ---> kezdetű sor tartalmától (a 'az utolsóval' résztől). - 3. Now type R and replace the remainder of the text on the first line by - typing over the old text to make the first line the same as the second. + 3. Nyomjon R karaktert és írja ét a szöveg maradékát az első sorban + úgy, hogy a két sor egyező legyen. ----> To make the first line the same as the last on this page use the keys. ----> To make the first line the same as the second, type R and the new text. +---> Az első sort tegye azonossá az utolsóval: használja a gombokat. +---> Az első sort tegye azonossá a másodikkal: írjon R-t és az új szöveget. - 4. Note that when you press to exit, any unaltered text remains. + 4. Jegyezzük meg, ha -et nyomok, akkor a változatlanuk hagyott + szövegek változatlanok maradnak. @@ -726,16 +727,16 @@ Megj: A Vimben a sor legvégére is lehet állni, azonba ez elődjében 6. LECKE ÖSSZEFOGLALÓJA - 1. Typing o opens a line BELOW the cursor and places the cursor on the open - line in Insert mode. - Typing a capital O opens the line ABOVE the line the cursor is on. + 1. o beírásával új sort nyitunk meg a sor ALATT és a kurzor az új + sorban lesz beszúrás-módban. + Nagy O a sor FELETT nyit új sort, és oda kerül a kurzor. - 2. Type an a to insert text AFTER the character the cursor is on. - Typing a capital A automatically appends text to the end of the line. + 2. a beírásával az aktuális karaktertől UTÁN (jobbra) szúrhatunk be szöveget. + Nagy A automatikusan a sor legvégéhez adja hozzá a szöveget. - 3. Typing a capital R enters Replace mode until is pressed to exit. + 3. A nagy R beütésével átíró (replace) módba kerülünk lenyomásáig. - 4. Typing ":set xxx" sets the option "xxx" + 4. ":set xxx" beírásával az "xxx" opció állítható be. @@ -746,7 +747,7 @@ Megj: A Vimben a sor legvégére is lehet állni, azonba ez elődjében ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 7. lecke: ON-LINE HELP PARANCSOK + 7. lecke: AZ ON-LINE SÚGÓ PARANCSAI ** Az online súgórendszer használata ** @@ -801,8 +802,9 @@ Megj: A Vimben a sor legvégére is lehet állni, azonba ez elődjében tudóknak: ":help user-manual". (egyelőre nem tud magyarul) További magyar olvasnivalók érhetőek el az alábbi oldalról. - http://ubuntu.hu/index.php?title=Vim + http://wiki.hup.hu/index.php/Vim + Angol olvasmányok: For further reading and studying, this book is recommended: Vim - Vi Improved - by Steve Oualline Publisher: New Riders @@ -816,8 +818,13 @@ Megj: A Vimben a sor legvégére is lehet állni, azonba ez elődjében It is a good book to get to know almost anything you want to do with Vi. The sixth edition also includes information on Vim. - This tutorial was written by Michael C. Pierce and Robert K. Ware, - Colorado School of Mines using ideas supplied by Charles Smith, - Colorado State University. E-mail: bware@mines.colorado.edu. + Ezt az oktatót Michael C. Pierce és Robert K. Ware írta, a Colorado + School of Mines dolgozói Charles Smith (Colorado State University) + támogatásával. + + E-mail: bware@mines.colorado.edu. + + A Vimhez idomította Bram Moolenaar. + + Magyarította: Horváth Árpád , 2006-2008 - Modified for Vim by Bram Moolenaar. -- 2.11.4.GIT