diff --git a/Contents b/Contents index 11c9e59057..d7fda544ef 100644 --- a/Contents +++ b/Contents @@ -9,10 +9,10 @@ Vim Vi IMproved. A clone of the UNIX text editor Vi. Very useful messages, shows current file name in window title, on-line help, rectangular cut/paste, etc., etc., etc... - Version 7.3c. Also runs under UNIX, MSDOS and other systems. - vim73crt.tgz contains the documentation and syntax files. - vim73cbin.tgz contains the binaries. - vim73csrc.tgz contains the sources. + Version 7.3d. Also runs under UNIX, MSDOS and other systems. + vim73drt.tgz contains the documentation and syntax files. + vim73dbin.tgz contains the binaries. + vim73dsrc.tgz contains the sources. Author: Bram Moolenaar et al. diff --git a/Makefile b/Makefile index 994a70d028..d1308a5c67 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ all install uninstall tools config configure reconfig proto depend lint tags typ # Before creating an archive first delete all backup files, *.orig, etc. MAJOR = 7 -MINOR = 3c +MINOR = 3d # Uncomment this line if the Win32s version is to be included. DOSBIN_S = dosbin_s diff --git a/README.txt b/README.txt index df66a1538e..55e25e2169 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -README.txt for version 7.3c of Vim: Vi IMproved. +README.txt for version 7.3d of Vim: Vi IMproved. WHAT IS VIM diff --git a/README_ami.txt b/README_ami.txt index 5969d4d1a3..5bc25f6821 100644 --- a/README_ami.txt +++ b/README_ami.txt @@ -1,4 +1,4 @@ -README_ami.txt for version 7.3c of Vim: Vi IMproved. +README_ami.txt for version 7.3d of Vim: Vi IMproved. This file explains the installation of Vim on Amiga systems. See README.txt for general information about Vim. diff --git a/README_amibin.txt b/README_amibin.txt index 2149c76b0c..f2433f9665 100644 --- a/README_amibin.txt +++ b/README_amibin.txt @@ -1,4 +1,4 @@ -README_amibin.txt for version 7.3c of Vim: Vi IMproved. +README_amibin.txt for version 7.3d of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_ami.txt" for installation instructions for the Amiga. diff --git a/README_amisrc.txt b/README_amisrc.txt index 7998f9e8b5..43cb4d2b00 100644 --- a/README_amisrc.txt +++ b/README_amisrc.txt @@ -1,4 +1,4 @@ -README_amisrc.txt for version 7.3c of Vim: Vi IMproved. +README_amisrc.txt for version 7.3d of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_ami.txt" for installation instructions for the Amiga. diff --git a/README_bindos.txt b/README_bindos.txt index fd4e37634a..4dc8109b12 100644 --- a/README_bindos.txt +++ b/README_bindos.txt @@ -1,4 +1,4 @@ -README_bindos.txt for version 7.3c of Vim: Vi IMproved. +README_bindos.txt for version 7.3d of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. diff --git a/README_dos.txt b/README_dos.txt index a0b87f3123..0dfb8680eb 100644 --- a/README_dos.txt +++ b/README_dos.txt @@ -1,4 +1,4 @@ -README_dos.txt for version 7.3c of Vim: Vi IMproved. +README_dos.txt for version 7.3d of Vim: Vi IMproved. This file explains the installation of Vim on MS-DOS and MS-Windows systems. See "README.txt" for general information about Vim. diff --git a/README_extra.txt b/README_extra.txt index 5ebcaddded..adcfe385f9 100644 --- a/README_extra.txt +++ b/README_extra.txt @@ -1,4 +1,4 @@ -README_extra.txt for version 7.3c of Vim: Vi IMproved. +README_extra.txt for version 7.3d of Vim: Vi IMproved. The extra archive of Vim is to be used in combination with the source archive (vim-7.2-src.tar.gz). The extra archive is useless without it. diff --git a/README_lang.txt b/README_lang.txt index e2eecf88ff..a556313151 100644 --- a/README_lang.txt +++ b/README_lang.txt @@ -1,4 +1,4 @@ -README_lang.txt for version 7.3c of Vim: Vi IMproved. +README_lang.txt for version 7.3d of Vim: Vi IMproved. This file contains files for non-English languages: - Translated messages. diff --git a/README_mac.txt b/README_mac.txt index dee05f6dfc..f46eb4ed67 100644 --- a/README_mac.txt +++ b/README_mac.txt @@ -1,4 +1,4 @@ -README_mac.txt for version 7.3c of Vim: Vi IMproved. +README_mac.txt for version 7.3d of Vim: Vi IMproved. This file explains the installation of Vim on Macintosh systems. See "README.txt" for general information about Vim. diff --git a/README_ole.txt b/README_ole.txt index 35db6a3068..56d029a267 100644 --- a/README_ole.txt +++ b/README_ole.txt @@ -1,4 +1,4 @@ -README_ole.txt for version 7.3c of Vim: Vi IMproved. +README_ole.txt for version 7.3d of Vim: Vi IMproved. This archive contains gvim.exe with OLE interface and VisVim. This version of gvim.exe can also load a number of interface dynamically (you @@ -16,5 +16,5 @@ Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support" For further information, type this inside Vim: :help if_ole -Futhermore, this archive contains VISVIM.DLL. It can be used to integrate +Furthermore, this archive contains VISVIM.DLL. It can be used to integrate the OLE gvim with Microsoft Visual Developer Studio. See VisVim/README.txt. diff --git a/README_os2.txt b/README_os2.txt index 46dc6b5d53..338b2682f2 100644 --- a/README_os2.txt +++ b/README_os2.txt @@ -1,4 +1,4 @@ -README_os2.txt for version 7.3c of Vim: Vi IMproved. +README_os2.txt for version 7.3d of Vim: Vi IMproved. This file explains the installation of Vim on OS/2 systems. See "README.txt" for general information about Vim. diff --git a/README_os390.txt b/README_os390.txt index 20f498912e..64a40fd322 100644 --- a/README_os390.txt +++ b/README_os390.txt @@ -1,9 +1,9 @@ -README_zOS.txt for version 7.3c of Vim: Vi IMproved. +README_zOS.txt for version 7.3d of Vim: Vi IMproved. This readme explains how to build Vim on z/OS. Formerly called OS/390. See "README.txt" for general information about Vim. -Most likley there are not many users out there using Vim on z/OS. So chances +Most likely there are not many users out there using Vim on z/OS. So chances are good, that some bugs are still undiscovered. Getting the source to z/OS: diff --git a/README_src.txt b/README_src.txt index 81eab519b7..264789843f 100644 --- a/README_src.txt +++ b/README_src.txt @@ -1,4 +1,4 @@ -README_src.txt for version 7.3c of Vim: Vi IMproved. +README_src.txt for version 7.3d of Vim: Vi IMproved. The source archive contains the files needed to compile Vim on Unix systems. It is packed for Unix systems (NL line separator). It is also used for other diff --git a/README_srcdos.txt b/README_srcdos.txt index bb67fa2ebe..84081400a6 100644 --- a/README_srcdos.txt +++ b/README_srcdos.txt @@ -1,4 +1,4 @@ -README_srcdos.txt for version 7.3c of Vim: Vi IMproved. +README_srcdos.txt for version 7.3d of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. diff --git a/README_unix.txt b/README_unix.txt index a2596bff35..9549f71559 100644 --- a/README_unix.txt +++ b/README_unix.txt @@ -1,4 +1,4 @@ -README_unix.txt for version 7.3c of Vim: Vi IMproved. +README_unix.txt for version 7.3d of Vim: Vi IMproved. This file explains the installation of Vim on Unix systems. See "README.txt" for general information about Vim. diff --git a/README_vms.txt b/README_vms.txt index f899e070f6..69902d0b27 100644 --- a/README_vms.txt +++ b/README_vms.txt @@ -1,4 +1,4 @@ -README_vms.txt for version 7.3c of Vim: Vi IMproved. +README_vms.txt for version 7.3d of Vim: Vi IMproved. This file explains the installation of Vim on VMS systems. See "README.txt" in the runtime archive for information about Vim. diff --git a/README_w32s.txt b/README_w32s.txt index 0da5cf625c..ef28498fea 100644 --- a/README_w32s.txt +++ b/README_w32s.txt @@ -1,4 +1,4 @@ -README_w32s.txt for version 7.3c of Vim: Vi IMproved. +README_w32s.txt for version 7.3d of Vim: Vi IMproved. This archive contains the gvim.exe that was specifically compiled for use in the Win32s subsystem in MS-Windows 3.1 and 3.11. diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi index 94413f08c2..2af03d245b 100644 --- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -1,6 +1,6 @@ # NSIS file to create a self-installing exe for Vim. # It requires NSIS version 2.0 or later. -# Last change: 2004 May 02 +# Last Change: 2010 Jul 30 # WARNING: if you make changes to this script, look out for $0 to be valid, # because uninstall deletes most files in $0. @@ -22,7 +22,7 @@ !define HAVE_NLS !define VER_MAJOR 7 -!define VER_MINOR 3c +!define VER_MINOR 3d # ----------- No configurable settings below this line ----------- @@ -450,7 +450,7 @@ Section Uninstall AskRemove: MessageBox MB_YESNO|MB_ICONQUESTION \ "Remove all files in your $1\vimfiles directory? \ - $\nIf you have created something there that you want to keep, click No" IDNO Fin + $\nCAREFUL: If you have created something there that you want to keep, click No" IDNO Fin RMDir /r $1\vimfiles NoRemove: diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim index 70b146d648..6d1c37f488 100644 --- a/runtime/autoload/netrw.vim +++ b/runtime/autoload/netrw.vim @@ -1,10 +1,10 @@ " netrw.vim: Handles file transfer and remote directory listing across " AUTOLOAD SECTION -" Date: May 14, 2010 -" Version: 138 +" Date: Jul 27, 2010 +" Version: 140 " Maintainer: Charles E Campbell, Jr " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim -" Copyright: Copyright (C) 1999-2009 Charles E. Campbell, Jr. {{{1 +" Copyright: Copyright (C) 1999-2010 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, @@ -22,7 +22,7 @@ if &cp || exists("g:loaded_netrw") finish endif -let g:loaded_netrw = "v138" +let g:loaded_netrw = "v140" if v:version < 702 echohl WarningMsg echo "***warning*** this version of netrw needs vim 7.2" @@ -153,6 +153,7 @@ call s:NetrwInit("g:netrw_alto" , &sb) call s:NetrwInit("g:netrw_altv" , &spr) call s:NetrwInit("g:netrw_banner" , 1) call s:NetrwInit("g:netrw_browse_split", 0) +call s:NetrwInit("g:netrw_bufsettings" , "noma nomod nonu nobl nowrap ro") call s:NetrwInit("g:netrw_chgwin" , -1) call s:NetrwInit("g:netrw_compress" , "gzip") call s:NetrwInit("g:netrw_ctags" , "ctags") @@ -163,7 +164,7 @@ if !exists("g:netrw_cursorline") endif " Default values - d-g ---------- {{{3 call s:NetrwInit("g:netrw_dirhist_cnt" , 0) -call s:NetrwInit("g:netrw_decompress" , '{ ".gz" : "gunzip", ".bz2" : "bunzip2", ".zip" : "unzip", ".tar" : "tar -xf"}') +call s:NetrwInit("g:netrw_decompress" , '{ ".gz" : "gunzip", ".bz2" : "bunzip2", ".zip" : "unzip", ".tar" : "tar -xf", ".xz" : "unxz" }') call s:NetrwInit("g:netrw_dirhistmax" , 10) call s:NetrwInit("g:netrw_fastbrowse" , 1) call s:NetrwInit("g:netrw_ftp_browse_reject", '^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$') @@ -325,7 +326,7 @@ fun! s:NetrwOptionSave(vt) " call Dret("s:NetrwOptionSave : options already saved") return endif -" call Decho("fo=".&fo.(exists("&acd")? " acd=".&acd : " acd doesn't exist")) +" call Decho("fo=".&fo.(exists("&acd")? " acd=".&acd : " acd doesn't exist")." diff=".&l:diff) " Save current settings and current directory let s:yykeep = @@ @@ -340,6 +341,7 @@ fun! s:NetrwOptionSave(vt) let {a:vt}netrw_cinokeep = &l:cino let {a:vt}netrw_comkeep = &l:com let {a:vt}netrw_cpokeep = &l:cpo + let {a:vt}netrw_diffkeep = &l:diff if g:netrw_keepdir let {a:vt}netrw_dirkeep = getcwd() endif @@ -349,6 +351,7 @@ fun! s:NetrwOptionSave(vt) let {a:vt}netrw_imkeep = &l:im let {a:vt}netrw_magickeep = &l:magic let {a:vt}netrw_repkeep = &l:report + let {a:vt}netrw_selkeep = &l:sel let {a:vt}netrw_spellkeep = &l:spell let {a:vt}netrw_twkeep = &l:tw " textwidth let {a:vt}netrw_wigkeep = &l:wig " wildignore @@ -398,6 +401,7 @@ fun! s:NetrwOptionRestore(vt) if exists("{a:vt}netrw_cinokeep") |let &l:cino = {a:vt}netrw_cinokeep |unlet {a:vt}netrw_cinokeep |endif if exists("{a:vt}netrw_comkeep") |let &l:com = {a:vt}netrw_comkeep |unlet {a:vt}netrw_comkeep |endif if exists("{a:vt}netrw_cpokeep") |let &l:cpo = {a:vt}netrw_cpokeep |unlet {a:vt}netrw_cpokeep |endif + if exists("{a:vt}netrw_diffkeep") |let &l:diff = {a:vt}netrw_diffkeep |unlet {a:vt}netrw_diffkeep |endif if exists("{a:vt}netrw_dirkeep") && isdirectory({a:vt}netrw_dirkeep) && g:netrw_keepdir let dirkeep = substitute({a:vt}netrw_dirkeep,'\\','/','g') if exists("{a:vt}netrw_dirkeep") |exe "keepjumps lcd ".fnameescape(dirkeep)|unlet {a:vt}netrw_dirkeep |endif @@ -408,6 +412,7 @@ fun! s:NetrwOptionRestore(vt) if exists("{a:vt}netrw_imkeep") |let &l:im = {a:vt}netrw_imkeep |unlet {a:vt}netrw_imkeep |endif if exists("{a:vt}netrw_magic") |let &l:magic = {a:vt}netrw_magic |unlet {a:vt}netrw_magic |endif if exists("{a:vt}netrw_repkeep") |let &l:report = {a:vt}netrw_repkeep |unlet {a:vt}netrw_repkeep |endif + if exists("{a:vt}netrw_selkeep") |let &l:sel = {a:vt}netrw_selkeep |unlet {a:vt}netrw_selkeep |endif if exists("{a:vt}netrw_spellkeep")|let &l:spell = {a:vt}netrw_spellkeep |unlet {a:vt}netrw_spellkeep|endif if exists("{a:vt}netrw_twkeep") |let &l:tw = {a:vt}netrw_twkeep |unlet {a:vt}netrw_twkeep |endif if exists("{a:vt}netrw_wigkeep") |let &l:wig = {a:vt}netrw_wigkeep |unlet {a:vt}netrw_wigkeep |endif @@ -433,6 +438,7 @@ fun! s:NetrwOptionRestore(vt) " call Decho("g:netrw_keepdir=".g:netrw_keepdir.": getcwd<".getcwd()."> acd=".&acd) " call Decho("fo=".&fo.(exists("&acd")? " acd=".&acd : " acd doesn't exist")) " call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap) +" call Decho("diff=".&l:diff." win#".winnr()." w:netrw_diffkeep=".(exists("w:netrw_diffkeep")? w:netrw_diffkeep : "doesn't exist")) " call Dret("s:NetrwOptionRestore : win#".winnr()." buf#".bufnr("%")) endfun @@ -450,12 +456,14 @@ fun! s:NetrwSafeOptions() setlocal tw=0 setlocal report=10000 setlocal isk+=@ isk+=* isk+=/ + setlocal sel=inclusive if g:netrw_use_noswf && has("win32") && !has("win95") setlocal noswf endif call s:NetrwCursorline() " allow the user to override safe options +" call Decho("ft<".&ft."> ei=".&ei) if &ft == "netrw" " call Decho("do any netrw FileType autocmds") silent keepalt keepjumps doau FileType netrw @@ -920,7 +928,7 @@ fun! netrw#NetRead(mode,...) unlet b:netrw_method unlet b:netrw_fname endif - if s:FileReadable(tmpfile) && tmpfile !~ '.tar.bz2$' && tmpfile !~ '.tar.gz$' && tmpfile !~ '.zip' && tmpfile !~ '.tar' && readcmd != 't' + if s:FileReadable(tmpfile) && tmpfile !~ '.tar.bz2$' && tmpfile !~ '.tar.gz$' && tmpfile !~ '.zip' && tmpfile !~ '.tar' && readcmd != 't' && tmpfile !~ '.tar.xz$' && tmpfile !~ '.txz' " call Decho("cleanup by deleting tmpfile<".tmpfile.">") call s:NetrwDelete(tmpfile) endif @@ -1371,8 +1379,8 @@ fun! s:NetrwGetFile(readcmd, tfile, method) else let tfile= a:tfile endif -" call Decho("exe silent! keepalt file ".fnameescape(tfile)) - exe "silent! keepalt file ".fnameescape(tfile) +" call Decho("exe sil! keepalt file ".fnameescape(tfile)) + exe "sil! keepalt file ".fnameescape(tfile) " edit temporary file (ie. read the temporary file in) if rfile =~ '\.zip$' @@ -1381,19 +1389,25 @@ fun! s:NetrwGetFile(readcmd, tfile, method) elseif rfile =~ '\.tar$' " call Decho("handling remote tar file with tar#Browse(tfile<".tfile.">)") call tar#Browse(tfile) - elseif rfile =~ '\.tar\.gz' + elseif rfile =~ '\.tar\.gz$' " call Decho("handling remote gzip-compressed tar file") call tar#Browse(tfile) - elseif rfile =~ '\.tar\.bz2' + elseif rfile =~ '\.tar\.bz2$' " call Decho("handling remote bz2-compressed tar file") call tar#Browse(tfile) + elseif rfile =~ '\.tar\.xz$' +" call Decho("handling remote xz-compressed tar file") + call tar#Browse(tfile) + elseif rfile =~ '\.txz$' +" call Decho("handling remote xz-compressed tar file (.txz)") + call tar#Browse(tfile) else " call Decho("edit temporary file") e! endif " rename buffer back to remote filename -" call Decho("exe silent! keepalt file ".fnameescape(rfile)) +" call Decho("exe sil! keepalt file ".fnameescape(rfile)) exe "sil! keepalt file ".fnameescape(rfile) filetype detect " call Dredir("renamed buffer back to remote filename<".rfile."> : expand(%)<".expand("%").">","ls!") @@ -2242,8 +2256,6 @@ fun! s:NetrwBrowse(islocal,dirname) if !exists("s:netrw_initbookhist") call s:NetrwBookHistRead() endif -" call FOTEST(7) -"call Decho("COMBAK#01 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">") " simplify the dirname (especially for ".."s in dirnames) if a:dirname !~ '^\a\+://' @@ -2251,8 +2263,6 @@ fun! s:NetrwBrowse(islocal,dirname) else let dirname= a:dirname endif -" call FOTEST(8) -"call Decho("COMBAK#02 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">") if exists("s:netrw_skipbrowse") unlet s:netrw_skipbrowse @@ -2271,17 +2281,13 @@ fun! s:NetrwBrowse(islocal,dirname) return endif - call s:NetrwOptionSave("w:") -" call FOTEST(9) -"call Decho("COMBAK#03 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">") + call s:NetrwOptionSave("w:") " re-instate any marked files if exists("s:netrwmarkfilelist_{bufnr('%')}") " call Decho("clearing marked files") exe "2match netrwMarkFile /".s:netrwmarkfilemtch_{bufnr("%")}."/" endif -" call FOTEST(10) -"call Decho("COMBAK#04 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">") if a:islocal && exists("w:netrw_acdkeep") && w:netrw_acdkeep " call Decho("handle w:netrw_acdkeep:") @@ -2308,11 +2314,11 @@ fun! s:NetrwBrowse(islocal,dirname) setlocal ma noro " call Decho("setlocal ma noro") let b:netrw_curdir= dirname -" call Decho("exe silent! keepalt file ".fnameescape(s:method."://".s:user.s:machine."/".s:path)." (bt=".&bt.")") +" call Decho("exe sil! keepalt file ".fnameescape(s:method."://".s:user.s:machine."/".s:path)." (bt=".&bt.")") exe "sil! keepalt file ".fnameescape(s:method."://".s:user.s:machine."/".s:path) - exe "sil keepalt doau BufReadPre ".fnameescape(s:fname) + exe "sil! keepalt doau BufReadPre ".fnameescape(s:fname) silent call netrw#NetRead(2,s:method."://".s:user.s:machine."/".s:path) - if s:path !~ '.tar.bz2$' && s:path !~ '.tar.gz' + if s:path !~ '.tar.bz2$' && s:path !~ '.tar.gz' && s:path !~ '.tar.xz' && s:path !~ '.txz' " netrw.vim and tar.vim have already handled decompression of the tarball; avoiding gzip.vim error exe "sil keepalt doau BufReadPost ".fnameescape(s:fname) endif @@ -2326,8 +2332,6 @@ fun! s:NetrwBrowse(islocal,dirname) " call Dret("s:NetrwBrowse : file<".s:fname.">") return endif -" call FOTEST(11) -"call Decho("COMBAK#05 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">") " use buffer-oriented WinVars if buffer ones exist but window ones don't {{{3 call s:UseBufWinVars() @@ -2339,8 +2343,6 @@ fun! s:NetrwBrowse(islocal,dirname) " set up menu {{{3 call s:NetrwMenu(1) -" call FOTEST(12) -"call Decho("COMBAK#06 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">") " set up buffer {{{3 let reusing= s:NetrwGetBuffer(a:islocal,dirname) @@ -2360,12 +2362,10 @@ fun! s:NetrwBrowse(islocal,dirname) " call Dret("s:NetrwBrowse : re-using buffer") return endif -"" call FOTEST(13) " PROBLEM WITH LISTING -"call Decho("COMBAK#07 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">") " set b:netrw_curdir to the new directory name {{{3 " call Decho("set b:netrw_curdir to the new directory name: (buf#".bufnr("%").")") - let b:netrw_curdir= dirname + let b:netrw_curdir= dirname if b:netrw_curdir =~ '[/\\]$' let b:netrw_curdir= substitute(b:netrw_curdir,'[/\\]$','','e') endif @@ -2383,8 +2383,6 @@ fun! s:NetrwBrowse(islocal,dirname) let b:netrw_curdir= b:netrw_curdir.'/' endif " call Decho("b:netrw_curdir<".b:netrw_curdir.">") -"" call FOTEST(14) " PROBLEM WITH LISTING -"call Decho("COMBAK#08 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">") " ------------ " (local only) {{{3 @@ -2456,17 +2454,12 @@ fun! s:NetrwBrowse(islocal,dirname) let b:netrw_curdir= dirname " call Decho("b:netrw_curdir<".b:netrw_curdir."> (remote)") endif " (additional remote handling) -"" call FOTEST(15) " PROBLEM WITH LISTING -"call Decho("COMBAK#09 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">") " ----------------------- " Directory Listing: {{{3 " ----------------------- call s:BrowserMaps(a:islocal) -"" call FOTEST(16) " PROBLEM WITH LISTING call s:PerformListing(a:islocal) -" call FOTEST(17) -"call Decho("COMBAK#10 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">") " The s:LocalBrowseShellCmdRefresh() function is called by an autocmd " installed by s:LocalFastBrowser() when g:netrw_fastbrowse <= 1 (ie. slow, medium speed). @@ -2534,7 +2527,7 @@ fun! s:NetrwGetBuffer(islocal,dirname) " call Decho(" re-use w:netrw_treebufnr=".w:netrw_treebufnr) let eikeep= &ei set ei=all - exe "b ".w:netrw_treebufnr + exe "sil! b ".w:netrw_treebufnr let &ei= eikeep " call Dret("s:NetrwGetBuffer : bufnum#".w:netrw_treebufnr."") return @@ -2614,7 +2607,7 @@ fun! s:NetrwGetBuffer(islocal,dirname) endif " get enew buffer and name it -or- re-use buffer {{{3 - keepj mark ' + sil! keepj mark ' if bufnum < 0 || !bufexists(bufnum) " call Decho("--get enew buffer and name it (bufexists([bufnum=".bufnum."])=".bufexists(bufnum).")") call s:NetrwEnew(dirname) @@ -2629,7 +2622,7 @@ fun! s:NetrwGetBuffer(islocal,dirname) let s:netrw_treelistnum= s:netrw_treelistnum + 1 endif let w:netrw_treebufnr= bufnr("%") -" call Decho(" exe silent! keepalt file NetrwTreeListing ".fnameescape(s:netrw_treelistnum)) +" call Decho(" exe sil! keepalt file NetrwTreeListing ".fnameescape(s:netrw_treelistnum)) exe 'sil! keepalt file NetrwTreeListing\ '.fnameescape(s:netrw_treelistnum) set bt=nofile noswf nnoremap [ :silent call TreeListMove('[') @@ -2641,7 +2634,7 @@ fun! s:NetrwGetBuffer(islocal,dirname) " let v:errmsg= "" " Decho let escdirname= fnameescape(dirname) " call Decho(" errmsg<".v:errmsg."> bufnr(escdirname<".escdirname.">)=".bufnr(escdirname)." bufname()<".bufname(bufnr(escdirname)).">") -" call Decho(' exe silent! keepalt file '.escdirname) +" call Decho(' exe sil! keepalt file '.escdirname) " let v:errmsg= "" " Decho exe 'sil! keepalt file '.escdirname " call Decho(" errmsg<".v:errmsg."> bufnr(".escdirname.")=".bufnr(escdirname)."<".bufname(bufnr(escdirname)).">") @@ -2654,13 +2647,13 @@ fun! s:NetrwGetBuffer(islocal,dirname) set ei=all if getline(2) =~ '^" Netrw Directory Listing' " call Decho(" re-use buffer#".bufnum."<".((bufnum > 0)? bufname(bufnum) : "")."> using: keepalt b ".bufnum) - exe "keepalt b ".bufnum + exe "sil! keepalt b ".bufnum else " call Decho(" reusing buffer#".bufnum."<".((bufnum > 0)? bufname(bufnum) : "")."> using: b ".bufnum) - exe "b ".bufnum + exe "sil! b ".bufnum endif if bufname("%") == '.' -" call Decho("exe silent! keepalt file ".fnameescape(getcwd())) +" call Decho("exe sil! keepalt file ".fnameescape(getcwd())) exe "sil! keepalt file ".fnameescape(getcwd()) endif let &ei= eikeep @@ -2689,8 +2682,8 @@ fun! s:NetrwGetBuffer(islocal,dirname) " call Decho("--do netrw settings: make this buffer#".bufnr("%")." not-a-file, modifiable, not line-numbered, etc--") let fname= expand("%") call s:NetrwListSettings(a:islocal) -" call Decho("exe keepalt file ".fnameescape(fname)) - exe "keepalt file ".fnameescape(fname) +" call Decho("exe sil! keepalt file ".fnameescape(fname)) + exe "sil! keepalt file ".fnameescape(fname) " delete all lines from buffer {{{3 " call Decho("--delete all lines from buffer--") @@ -2831,8 +2824,8 @@ fun! s:NetrwListSettings(islocal) let fname= bufname("%") " call Decho("setlocal bt=nofile nobl ma nonu nowrap noro") setlocal bt=nofile nobl ma nonu nowrap noro -" call Decho("exe keepalt file ".fnameescape(fname)) - exe "keepalt file ".fnameescape(fname) +" call Decho("exe sil! keepalt file ".fnameescape(fname)) + exe "sil! keepalt file ".fnameescape(fname) if g:netrw_use_noswf setlocal noswf endif @@ -2891,7 +2884,7 @@ fun! s:NetrwListStyle(islocal) " clear buffer - this will cause NetrwBrowse/LocalBrowseCheck to do a refresh " call Decho("clear buffer<".expand("%")."> with :%d") - keepj %d + sil! keepj %d " following prevents tree listing buffer from being marked "modified" setlocal nomod @@ -2903,11 +2896,11 @@ fun! s:NetrwListStyle(islocal) call s:NetrwCursorline() " keep cursor on the filename - sil keepj $ + sil! keepj $ let result= search('\%(^\%(|\+\s\)\=\|\s\{2,}\)\zs'.escape(fname,'.\[]*$^').'\%(\s\{2,}\|$\)','bc') " call Decho("search result=".result." w:netrw_bannercnt=".(exists("w:netrw_bannercnt")? w:netrw_bannercnt : 'N/A')) if result <= 0 && exists("w:netrw_bannercnt") - exe "keepj ".w:netrw_bannercnt + exe "sil! keepj ".w:netrw_bannercnt endif " call Dret("NetrwListStyle".(exists("w:netrw_liststyle")? ' : w:netrw_liststyle='.w:netrw_liststyle : "")) @@ -3095,6 +3088,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...) endif endif endif + " the point where netrw actually edits the (local) file " if its local only: LocalBrowseCheck() doesn't edit a file, but NetrwBrowse() will if a:islocal @@ -3110,9 +3104,12 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...) " or as a list of function references. It will ignore anything that's not " a function reference. See :help Funcref for information about function references. if exists("g:Netrw_funcref") +" call Decho("handle optional Funcrefs") if type(g:Netrw_funcref) == 2 +" call Decho("handling a g:Netrw_funcref") call g:Netrw_funcref() elseif type(g:Netrw_funcref) == 3 +" call Decho("handling a list of g:Netrw_funcrefs") for Fncref in g:Netrw_funcref if type(FncRef) == 2 call FncRef() @@ -3246,8 +3243,14 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...) call s:NetrwOptionRestore("s:") if dolockout -" call Decho("doing modification lockout settings: ma nomod noro") - setlocal ma nomod noro +" call Decho("filewritable(dirname<".dirname.">)=".filewritable(dirname)) + if filewritable(dirname) +" call Decho("doing modification lockout settings: ma nomod noro") + setlocal ma nomod noro + else +" call Decho("doing modification lockout settings: ma nomod ro") + setlocal ma nomod ro + endif " call Decho("setlocal ma nomod noro") endif @@ -3510,7 +3513,6 @@ fun! netrw#Explore(indx,dosplit,style,...) let curdir = simplify(b:netrw_curdir) let curfiledir = substitute(expand("%:p"),'^\(.*[/\\]\)[^/\\]*$','\1','e') " call Decho("curdir<".curdir."> curfiledir<".curfiledir.">") -" call FOTEST(1) " save registers sil! let keepregstar = @* @@ -3561,7 +3563,6 @@ fun! netrw#Explore(indx,dosplit,style,...) " call Decho("case a:dosplit=".a:dosplit." AND modified=".&modified." AND a:style=".a:style." is not 6") endif keepj norm! 0 -" call FOTEST(2) if a:0 > 0 " call Decho("case [a:0=".a:0."] > 0: a:1<".a:1.">") @@ -3596,7 +3597,6 @@ fun! netrw#Explore(indx,dosplit,style,...) return endif -" call FOTEST(3) " call Decho("dirname<".dirname.">") if dirname =~ '\.\./\=$' let dirname= simplify(fnamemodify(dirname,':p:h')) @@ -3648,7 +3648,6 @@ fun! netrw#Explore(indx,dosplit,style,...) let starpat= 0 " call Decho("default case: starpat=".starpat) endif -" call FOTEST(4) if starpat == 0 && a:indx >= 0 " [Explore Hexplore Vexplore Sexplore] [dirname] @@ -3875,7 +3874,6 @@ fun! netrw#Explore(indx,dosplit,style,...) call netrw#LocalBrowseCheck(s:NetrwBrowseChgDir(1,newdir)) endif endif -" call FOTEST(5) " visual display of **/ **// */ Exploration files " call Decho("w:netrw_explore_indx=".(exists("w:netrw_explore_indx")? w:netrw_explore_indx : "doesn't exist")) @@ -3920,7 +3918,6 @@ fun! netrw#Explore(indx,dosplit,style,...) echo " " " call Decho("cleared explore match list") endif -" call FOTEST(6) sil! let @* = keepregstar sil! let @+ = keepregstar @@ -4390,7 +4387,7 @@ endfun " using g:netrw_compress_suffix to know which to " do. By default: " g:netrw_compress = "gzip" -" g:netrw_decompress = { ".gz" : "gunzip" , ".bz2" : "bunzip2" , ".zip" : "unzip" , ".tar" : "tar -xf"} +" g:netrw_decompress = { ".gz" : "gunzip" , ".bz2" : "bunzip2" , ".zip" : "unzip" , ".tar" : "tar -xf", ".xz" : "unxz"} fun! s:NetrwMarkFileCompress(islocal) " call Dfunc("s:NetrwMarkFileCompress(islocal=".a:islocal.")") let svpos = netrw#NetrwSavePosn() @@ -4423,6 +4420,7 @@ fun! s:NetrwMarkFileCompress(islocal) endif break endif + unlet sfx endfor if exists("exe") unlet exe @@ -5219,6 +5217,7 @@ fun! s:NetrwMenu(domenu) exe 'sil! menu '.g:NetrwMenuPriority.'.9.4 '.g:NetrwTopLvlMenu.'Browsing\ Control.Refresh\ Listing'." \" exe 'sil! menu '.g:NetrwMenuPriority.'.9.5 '.g:NetrwTopLvlMenu.'Browsing\ Control.Settings/Options:NetrwSettings '.":NetrwSettings\" exe 'sil! menu '.g:NetrwMenuPriority.'.10 '.g:NetrwTopLvlMenu.'Delete\ File/DirectoryD D' + exe 'sil! menu '.g:NetrwMenuPriority.'.11.1 '.g:NetrwTopLvlMenu.'Edit\ File/Dir.Create\ New\ File% %' exe 'sil! menu '.g:NetrwMenuPriority.'.11.1 '.g:NetrwTopLvlMenu.'Edit\ File/Dir.In\ Current\ Window '."\" exe 'sil! menu '.g:NetrwMenuPriority.'.11.2 '.g:NetrwTopLvlMenu.'Edit\ File/Dir.Preview\ File/Directoryp p' exe 'sil! menu '.g:NetrwMenuPriority.'.11.3 '.g:NetrwTopLvlMenu.'Edit\ File/Dir.In\ Previous\ WindowP P' @@ -5814,7 +5813,7 @@ fun! s:NetrwRefresh(islocal,dirname) setlocal ma noro " call Decho("setlocal ma noro") " call Decho("clear buffer<".expand("%")."> with :%d") - keepj %d + sil! keepj %d if a:islocal call netrw#LocalBrowseCheck(a:dirname) else @@ -6093,7 +6092,7 @@ fun! s:NetrwTreeDir() " call Decho("user attempted to close treeroot") " now force a refresh " call Decho("clear buffer<".expand("%")."> with :%d") - keepj %d + sil! keepj %d " call Dret("NetrwTreeDir <".treedir."> : (side effect) s:treecurpos<".string(s:treecurpos).">") return b:netrw_curdir endif @@ -6174,7 +6173,7 @@ fun! s:NetrwTreeDisplay(dir,depth) call s:NetrwTreeDisplay(direntry.'/',depth) else " call Decho("<".entry."> is not a key in treedict (no subtree)") - keepj call setline(line("$")+1,depth.entry) + sil! keepj call setline(line("$")+1,depth.entry) endif endfor " call Dret("NetrwTreeDisplay") @@ -6206,10 +6205,10 @@ fun! s:NetrwTreeListing(dirname) " update the directory listing for the current directory " call Decho("updating dictionary with ".a:dirname.":[..directory listing..]") " call Decho("bannercnt=".w:netrw_bannercnt." line($)=".line("$")) - exe "silent! keepjumps ".w:netrw_bannercnt.',$g@^\.\.\=/$@d' + exe "sil! keepj ".w:netrw_bannercnt.',$g@^\.\.\=/$@d' let w:netrw_treedict[a:dirname]= getline(w:netrw_bannercnt,line("$")) " call Decho("w:treedict[".a:dirname."]= ".string(w:netrw_treedict[a:dirname])) - exe "silent! keepjumps ".w:netrw_bannercnt.",$d" + exe "sil! keepj ".w:netrw_bannercnt.",$d" " if past banner, record word if exists("w:netrw_bannercnt") && line(".") > w:netrw_bannercnt @@ -6263,21 +6262,21 @@ fun! s:NetrwWideListing() let newcolstart = w:netrw_bannercnt + fpc let newcolend = newcolstart + fpc - 1 " call Decho("bannercnt=".w:netrw_bannercnt." fpl=".w:netrw_fpl." fpc=".fpc." newcol[".newcolstart.",".newcolend."]") - silent! let keepregstar = @* + sil! let keepregstar = @* while line("$") >= newcolstart if newcolend > line("$") | let newcolend= line("$") | endif let newcolqty= newcolend - newcolstart exe newcolstart if newcolqty == 0 - exe "sil keepj norm! 0\$hx".w:netrw_bannercnt."G$p" + exe "sil! keepj norm! 0\$hx".w:netrw_bannercnt."G$p" else - exe "sil keepj norm! 0\".newcolqty.'j$hx'.w:netrw_bannercnt.'G$p' + exe "sil! keepj norm! 0\".newcolqty.'j$hx'.w:netrw_bannercnt.'G$p' endif - exe "sil keepj ".newcolstart.','.newcolend.'d' - exe 'sil keepj '.w:netrw_bannercnt + exe "sil! keepj ".newcolstart.','.newcolend.'d' + exe 'sil! keepj '.w:netrw_bannercnt endwhile silent! let @*= keepregstar - exe "sil keepj ".w:netrw_bannercnt.',$s/\s\+$//e' + exe "sil! keepj ".w:netrw_bannercnt.',$s/\s\+$//e' call histdel("/",-1) setlocal noma nomod ro " call Dret("NetrwWideListing") @@ -6302,7 +6301,7 @@ fun! s:PerformListing(islocal) if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && exists("w:netrw_treedict") " force a refresh for tree listings " call Decho("force refresh for treelisting: clear buffer<".expand("%")."> with :%d") - keepj %d + sil! keepj %d endif " save current directory on directory history list @@ -6316,7 +6315,7 @@ fun! s:PerformListing(islocal) keepj put ='\" '.b:netrw_curdir keepj 1d let w:netrw_bannercnt= 3 - exe "keepj ".w:netrw_bannercnt + exe "sil! keepj ".w:netrw_bannercnt else keepj 1 let w:netrw_bannercnt= 1 @@ -6342,7 +6341,7 @@ fun! s:PerformListing(islocal) keepj put ='\" Sorted by '.sortby let w:netrw_bannercnt= w:netrw_bannercnt + 1 endif - exe "keepj ".w:netrw_bannercnt + exe "sil! keepj ".w:netrw_bannercnt endif " show copy/move target, if any @@ -6351,15 +6350,15 @@ fun! s:PerformListing(islocal) " call Decho("show copy/move target<".s:netrwmftgt.">") keepj put ='' if s:netrwmftgt_islocal - keepj call setline(line("."),'" Copy/Move Tgt: '.s:netrwmftgt.' (local)') + sil! keepj call setline(line("."),'" Copy/Move Tgt: '.s:netrwmftgt.' (local)') else - keepj call setline(line("."),'" Copy/Move Tgt: '.s:netrwmftgt.' (remote)') + sil! keepj call setline(line("."),'" Copy/Move Tgt: '.s:netrwmftgt.' (remote)') endif let w:netrw_bannercnt= w:netrw_bannercnt + 1 else " call Decho("s:netrwmftgt does not exist, don't make Copy/Move Tgt") endif - exe "keepj ".w:netrw_bannercnt + exe "sil! keepj ".w:netrw_bannercnt endif " Hiding... -or- Showing... {{{3 @@ -6382,14 +6381,14 @@ fun! s:PerformListing(islocal) " bannercnt should index the line just after the banner if g:netrw_banner let w:netrw_bannercnt= w:netrw_bannercnt + 1 - exe "keepj ".w:netrw_bannercnt + exe "sil! keepj ".w:netrw_bannercnt " call Decho("bannercnt=".w:netrw_bannercnt." (should index line just after banner) line($)=".line("$")) endif " set up syntax highlighting {{{3 " call Decho("set up syntax highlighting") if has("syntax") - setlocal ft=netrw + setf netrw if !exists("g:syntax_on") || !g:syntax_on setlocal ft= endif @@ -6430,7 +6429,7 @@ fun! s:PerformListing(islocal) endif " remove priority pattern prefix " call Decho("remove priority pattern prefix") - exe 'sil keepj '.w:netrw_bannercnt.',$s/^\d\{3}'.g:netrw_sepchr.'//e' + exe 'sil! keepj '.w:netrw_bannercnt.',$s/^\d\{3}'.g:netrw_sepchr.'//e' call histdel("/",-1) elseif a:islocal @@ -6438,12 +6437,12 @@ fun! s:PerformListing(islocal) " call Decho("g:netrw_sort_direction=".g:netrw_sort_direction) if g:netrw_sort_direction =~ 'n' " call Decho('exe silent keepjumps '.w:netrw_bannercnt.',$sort') - exe 'sil keepj '.w:netrw_bannercnt.',$sort'.' '.g:netrw_sort_options + exe 'sil! keepj '.w:netrw_bannercnt.',$sort'.' '.g:netrw_sort_options else " call Decho('exe silent keepjumps '.w:netrw_bannercnt.',$sort!') - exe 'sil keepj '.w:netrw_bannercnt.',$sort!'.' '.g:netrw_sort_options + exe 'sil! keepj '.w:netrw_bannercnt.',$sort!'.' '.g:netrw_sort_options endif - exe 'sil keepj '.w:netrw_bannercnt.',$s/^\d\{-}\///e' + exe 'sil! keepj '.w:netrw_bannercnt.',$s/^\d\{-}\///e' call histdel("/",-1) endif endif @@ -6451,7 +6450,7 @@ fun! s:PerformListing(islocal) elseif g:netrw_sort_direction =~ 'r' " call Decho('reverse the sorted listing') if !g:netrw_banner || w:netrw_bannercnt < line('$') - exe 'sil keepj '.w:netrw_bannercnt.',$g/^/m '.w:netrw_bannercnt + exe 'sil! keepj '.w:netrw_bannercnt.',$g/^/m '.w:netrw_bannercnt call histdel("/",-1) endif endif @@ -6465,8 +6464,8 @@ fun! s:PerformListing(islocal) if exists("w:netrw_bannercnt") && (line("$") > w:netrw_bannercnt || !g:netrw_banner) " place cursor on the top-left corner of the file listing " call Decho("place cursor on top-left corner of file listing") - exe 'sil keepj '.w:netrw_bannercnt - keepj norm! 0 + exe 'sil! keepj '.w:netrw_bannercnt + sil! keepj norm! 0 endif " record previous current directory @@ -6479,7 +6478,7 @@ fun! s:PerformListing(islocal) " set display to netrw display settings " call Decho("set display to netrw display settings (noma nomod etc)") - setlocal noma nomod nonu nobl nowrap ro + exe "setl ".g:netrw_bufsettings if exists("s:treecurpos") call netrw#NetrwRestorePosn(s:treecurpos) @@ -6586,16 +6585,16 @@ fun! s:NetrwRemoteListing() endif " call Decho("listcmd<".listcmd."> (using g:netrw_ftp_list_cmd)") call s:NetrwRemoteFtpCmd(s:path,listcmd) -" exe "keepj ".w:netrw_bannercnt.',$g/^./call Decho("raw listing: ".getline("."))' +" exe "sil! keepalt keepj ".w:netrw_bannercnt.',$g/^./call Decho("raw listing: ".getline("."))' if w:netrw_liststyle == s:THINLIST || w:netrw_liststyle == s:WIDELIST || w:netrw_liststyle == s:TREELIST " shorten the listing " call Decho("generate short listing") - exe "keepj ".w:netrw_bannercnt + exe "sil! keepalt keepj ".w:netrw_bannercnt " cleanup if g:netrw_ftp_browse_reject != "" - exe "sil! keepj g/".g:netrw_ftp_browse_reject."/keepj d" + exe "sil! keepalt keepj g/".g:netrw_ftp_browse_reject."/keepj d" call histdel("/",-1) endif sil! keepj %s/\r$//e @@ -6603,15 +6602,15 @@ fun! s:NetrwRemoteListing() " if there's no ../ listed, then put ./ and ../ in let line1= line(".") - exe "keepj ".w:netrw_bannercnt + exe "sil! keepj ".w:netrw_bannercnt let line2= search('^\.\.\/\%(\s\|$\)','cnW') if line2 == 0 " call Decho("netrw is putting ./ and ../ into listing") - keepj put='../' - keepj put='./' + sil! keepj put='../' + sil! keepj put='./' endif - exe "keepj ".line1 - keepjumps norm! 0 + exe "sil! keepj ".line1 + sil! keepj norm! 0 " call Decho("line1=".line1." line2=".line2." line(.)=".line(".")) if search('^\d\{2}-\d\{2}-\d\{2}\s','n') " M$ ftp site cleanup @@ -6636,25 +6635,25 @@ fun! s:NetrwRemoteListing() " call Decho("listcmd<".listcmd."> (using g:netrw_list_cmd)") if g:netrw_scp_cmd =~ '^pscp' " call Decho("1: exe silent r! ".shellescape(listcmd.s:path, 1)) - exe "silent r! ".listcmd.shellescape(s:path, 1) + exe "sil! keepj r! ".listcmd.shellescape(s:path, 1) " remove rubbish and adjust listing format of 'pscp' to 'ssh ls -FLa' like - keepj g/^Listing directory/keepj d - keepj g/^d[-rwx][-rwx][-rwx]/keepj s+$+/+e - sil keepj g/^l[-rwx][-rwx][-rwx]/keepj s+$+@+e + sil! keepj g/^Listing directory/keepj d + sil! keepj g/^d[-rwx][-rwx][-rwx]/keepj s+$+/+e + sil! keepj g/^l[-rwx][-rwx][-rwx]/keepj s+$+@+e call histdel("/",-1) call histdel("/",-1) call histdel("/",-1) if g:netrw_liststyle != s:LONGLIST - keepj g/^[dlsp-][-rwx][-rwx][-rwx]/keepj s/^.*\s\(\S\+\)$/\1/e + sil! keepj g/^[dlsp-][-rwx][-rwx][-rwx]/keepj s/^.*\s\(\S\+\)$/\1/e call histdel("/",-1) endif else if s:path == "" " call Decho("2: exe silent r! ".listcmd) - exe "sil r! ".listcmd + exe "sil! keepalt r! ".listcmd else " call Decho("3: exe silent r! ".listcmd.' '.shellescape(s:path,1)) - exe "sil r! ".listcmd.' '.shellescape(s:path,1) + exe "sil! keepalt r! ".listcmd.' '.shellescape(s:path,1) " call Decho("listcmd<".listcmd."> path<".s:path.">") endif endif @@ -6662,7 +6661,7 @@ fun! s:NetrwRemoteListing() " cleanup if g:netrw_ftp_browse_reject != "" " call Decho("(cleanup) exe silent! g/".g:netrw_ssh_browse_reject."/keepjumps d") - exe "sil! g/".g:netrw_ssh_browse_reject."/keepjumps d" + exe "sil! g/".g:netrw_ssh_browse_reject."/keepj d" call histdel("/",-1) endif endif @@ -6673,23 +6672,23 @@ fun! s:NetrwRemoteListing() if s:method == "ftp" " cleanup - exe "keepj ".w:netrw_bannercnt + exe "sil! keepj ".w:netrw_bannercnt while getline('.') =~ g:netrw_ftp_browse_reject - keepj d + sil! keepj d endwhile " if there's no ../ listed, then put ./ and ../ in let line1= line(".") - keepj 1 - sil keepj call search('^\.\.\/\%(\s\|$\)','W') + sil! keepj 1 + sil! keepj call search('^\.\.\/\%(\s\|$\)','W') let line2= line(".") if line2 == 0 - exe 'keepj '.w:netrw_bannercnt."put='./'" + exe 'sil! keepj '.w:netrw_bannercnt."put='./'" if b:netrw_curdir != '/' - exe 'keepj '.w:netrw_bannercnt."put='../'" + exe 'sil! keepj '.w:netrw_bannercnt."put='../'" endif endif - exe "keepj ".line1 - keepjumps norm! 0 + exe "sil! keepj ".line1 + sil! keepj norm! 0 endif if search('^\d\{2}-\d\{2}-\d\{2}\s','n') " M$ ftp site cleanup @@ -6796,7 +6795,7 @@ fun! s:NetrwRemoteRmFile(path,rmfile,all) if path =~ '^\a\+://' let path= substitute(path,'^\a\+://[^/]\+/','','') endif - silent! keepjumps .,$d + sil! keepj .,$d call s:NetrwRemoteFtpCmd(path,"delete ".'"'.a:rmfile.'"') else " call Decho("case ssh: g:netrw_rm_cmd<".g:netrw_rm_cmd.">") @@ -7868,8 +7867,10 @@ fun! s:GetTempfile(fname) if a:fname != "" if a:fname =~ '\.[^./]\+$' " call Decho("using fname<".a:fname.">'s suffix") - if a:fname =~ '.tar.gz' || a:fname =~ '.tar.bz2' + if a:fname =~ '\.tar\.gz$' || a:fname =~ '\.tar\.bz2$' || a:fname =~ '\.tar\.xz$' let suffix = ".tar".substitute(a:fname,'^.*\(\.[^./]\+\)$','\1','e') + elseif a:fname =~ '.txz$' + let suffix = ".txz".substitute(a:fname,'^.*\(\.[^./]\+\)$','\1','e') else let suffix = substitute(a:fname,'^.*\(\.[^./]\+\)$','\1','e') endif @@ -8023,7 +8024,9 @@ fun! s:NetrwEnew(...) call s:NetrwOptionRestore("w:") " call Decho("generate a buffer with keepjumps keepalt enew!") + let netrw_keepdiff= &l:diff keepj keepalt enew! + let &l:diff= netrw_keepdiff " call Decho("bufnr($)=".bufnr("$")) call s:NetrwOptionSave("w:") diff --git a/runtime/autoload/sqlcomplete.vim b/runtime/autoload/sqlcomplete.vim index 2d88862a13..5599c0d03e 100644 --- a/runtime/autoload/sqlcomplete.vim +++ b/runtime/autoload/sqlcomplete.vim @@ -1,25 +1,44 @@ " Vim OMNI completion script for SQL " Language: SQL " Maintainer: David Fishburn -" Version: 9.0 -" Last Change: 2010 Apr 20 +" Version: 10.0 +" Last Change: 2010 Jun 11 " Usage: For detailed help " ":help sql.txt" " or ":help ft-sql-omni" " or read $VIMRUNTIME/doc/sql.txt " History +" Version 10.0 +" Updated PreCacheSyntax() +" - Now returns a List of the syntax items it finds. +" This allows other plugins / scripts to use this list for their own +" purposes. In this case XPTemplate can use them for a Choose list. +" - Verifies the parameters are the correct type and displays a +" warning if not. +" - Verifies the parameters are the correct type and displays a +" warning if not. +" Updated SQLCWarningMsg() +" - Prepends warning message with SQLComplete so you know who issued +" the warning. +" Updated SQLCErrorMsg() +" - Prepends error message with SQLComplete so you know who issued +" the error. +" " Version 9.0 " This change removes some of the support for tables with spaces in their " names in order to simplify the regexes used to pull out query table " aliases for more robust table name and column name code completion. " Full support for "table names with spaces" can be added in again " after 7.3. +" " Version 8.0 " Incorrectly re-executed the g:ftplugin_sql_omni_key_right and g:ftplugin_sql_omni_key_left " when drilling in and out of a column list for a table. +" " Version 7.0 " Better handling of object names +" " Version 6.0 " Supports object names with spaces "my table name" " @@ -37,7 +56,7 @@ endif if exists('g:loaded_sql_completion') finish endif -let g:loaded_sql_completion = 70 +let g:loaded_sql_completion = 100 " Maintains filename of dictionary let s:sql_file_table = "" @@ -363,7 +382,13 @@ endfunc function! sqlcomplete#PreCacheSyntax(...) let syn_group_arr = [] + let syn_items = [] + if a:0 > 0 + if type(a:1) != 3 + call s:SQLCWarningMsg("Parameter is not a list. Example:['syntaxGroup1', 'syntaxGroup2']") + return '' + endif let syn_group_arr = a:1 else let syn_group_arr = g:omni_sql_precache_syntax_groups @@ -372,7 +397,36 @@ function! sqlcomplete#PreCacheSyntax(...) " the sytnax items. if !empty(syn_group_arr) for group_name in syn_group_arr - call s:SQLCGetSyntaxList(group_name) + let syn_items = extend( syn_items, s:SQLCGetSyntaxList(group_name) ) + endfor + endif + + return syn_items +endfunction + +function! sqlcomplete#ResetCacheSyntax(...) + let syn_group_arr = [] + + if a:0 > 0 + if type(a:1) != 3 + call s:SQLCWarningMsg("Parameter is not a list. Example:['syntaxGroup1', 'syntaxGroup2']") + return '' + endif + let syn_group_arr = a:1 + else + let syn_group_arr = g:omni_sql_precache_syntax_groups + endif + " For each group specified in the list, precache all + " the sytnax items. + if !empty(syn_group_arr) + for group_name in syn_group_arr + let list_idx = index(s:syn_list, group_name, 0, &ignorecase) + if list_idx > -1 + " Remove from list of groups + call remove( s:syn_list, list_idx ) + " Remove from list of keywords + call remove( s:syn_value, list_idx ) + endif endfor endif endfunction @@ -430,13 +484,13 @@ endfunction function! s:SQLCWarningMsg(msg) echohl WarningMsg - echomsg a:msg + echomsg 'SQLComplete:'.a:msg echohl None endfunction function! s:SQLCErrorMsg(msg) echohl ErrorMsg - echomsg a:msg + echomsg 'SQLComplete:'.a:msg echohl None endfunction @@ -462,7 +516,7 @@ function! s:SQLCGetSyntaxList(syn_group) let g:omni_syntax_group_include_sql = syn_group endif let g:omni_syntax_group_exclude_sql = '' - let syn_value = OmniSyntaxList() + let syn_value = syntaxcomplete#OmniSyntaxList() let g:omni_syntax_group_include_sql = s:save_inc let g:omni_syntax_group_exclude_sql = s:save_exc " Cache these values for later use diff --git a/runtime/autoload/syntaxcomplete.vim b/runtime/autoload/syntaxcomplete.vim index c887bd5a11..7b96bfd77a 100644 --- a/runtime/autoload/syntaxcomplete.vim +++ b/runtime/autoload/syntaxcomplete.vim @@ -1,14 +1,34 @@ " Vim completion script " Language: All languages, uses existing syntax highlighting rules " Maintainer: David Fishburn -" Version: 5.0 -" Last Change: 2010 Jan 31 +" Version: 7.0 +" Last Change: 2010 Jul 29 " Usage: For detailed help, ":help ft-syntax-omni" " History +" +" Version 7.0 +" Updated syntaxcomplete#OmniSyntaxList() +" - Looking up the syntax groups defined from a syntax file +" looked for only 1 format of {filetype}GroupName, but some +" syntax writers use this format as well: +" {b:current_syntax}GroupName +" OmniSyntaxList() will now check for both if the first +" method does not find a match. +" +" Version 6.0 +" Added syntaxcomplete#OmniSyntaxList() +" - Allows other plugins to use this for their own +" purposes. +" - It will return a List of all syntax items for the +" syntax group name passed in. +" - XPTemplate for SQL will use this function via the +" sqlcomplete plugin to populate a Choose box. +" " Version 5.0 -" When processing a list of syntax groups, the final group -" was missed in function SyntaxCSyntaxGroupItems. +" Updated SyntaxCSyntaxGroupItems() +" - When processing a list of syntax groups, the final group +" was missed in function SyntaxCSyntaxGroupItems. " " Set completion with CTRL-X CTRL-O to autoloaded function. " This check is in place in case this script is @@ -24,7 +44,7 @@ endif if exists('g:loaded_syntax_completion') finish endif -let g:loaded_syntax_completion = 40 +let g:loaded_syntax_completion = 70 " Set ignorecase to the ftplugin standard " This is the default setting, but if you define a buffer local @@ -128,7 +148,30 @@ function! syntaxcomplete#Complete(findstart, base) return compl_list endfunc -function! OmniSyntaxList() +function! syntaxcomplete#OmniSyntaxList(...) + if a:0 > 0 + let parms = [] + if 3 == type(a:1) + let parms = a:1 + elseif 1 == type(a:1) + let parms = split(a:1, ',') + endif + return OmniSyntaxList( parms ) + else + return OmniSyntaxList() + endif +endfunc + +function! OmniSyntaxList(...) + let list_parms = [] + if a:0 > 0 + if 3 == type(a:1) + let list_parms = a:1 + elseif 1 == type(a:1) + let list_parms = split(a:1, ',') + endif + endif + " Default to returning a dictionary, if use_dictionary is set to 0 " a list will be returned. " let use_dictionary = 1 @@ -157,16 +200,40 @@ function! OmniSyntaxList() endif let saveL = @l + let filetype = substitute(&filetype, '\.', '_', 'g') + if empty(list_parms) + " Default the include group to include the requested syntax group + let syntax_group_include_{filetype} = '' + " Check if there are any overrides specified for this filetype + if exists('g:omni_syntax_group_include_'.filetype) + let syntax_group_include_{filetype} = + \ substitute( g:omni_syntax_group_include_{filetype},'\s\+','','g') + let list_parms = split(g:omni_syntax_group_include_{filetype}, ',') + if syntax_group_include_{filetype} =~ '\w' + let syntax_group_include_{filetype} = + \ substitute( syntax_group_include_{filetype}, + \ '\s*,\s*', '\\|', 'g' + \ ) + endif + endif + else + " A specific list was provided, use it + endif + " Loop through all the syntax groupnames, and build a " syntax file which contains these names. This can " work generically for any filetype that does not already " have a plugin defined. " This ASSUMES the syntax groupname BEGINS with the name " of the filetype. From my casual viewing of the vim7\syntax - " directory. + " directory this is true for almost all syntax definitions. + " As an example, the SQL syntax groups have this pattern: + " sqlType + " sqlOperators + " sqlKeyword ... redir @l - silent! exec 'syntax list ' + silent! exec 'syntax list '.join(list_parms) redir END let syntax_full = "\n".@l @@ -181,31 +248,23 @@ function! OmniSyntaxList() let filetype = substitute(&filetype, '\.', '_', 'g') - " Default the include group to include the requested syntax group - let syntax_group_include_{filetype} = '' - " Check if there are any overrides specified for this filetype - if exists('g:omni_syntax_group_include_'.filetype) - let syntax_group_include_{filetype} = - \ substitute( g:omni_syntax_group_include_{filetype},'\s\+','','g') - if syntax_group_include_{filetype} =~ '\w' - let syntax_group_include_{filetype} = - \ substitute( syntax_group_include_{filetype}, - \ '\s*,\s*', '\\|', 'g' - \ ) - endif - endif - - " Default the exclude group to nothing - let syntax_group_exclude_{filetype} = '' - " Check if there are any overrides specified for this filetype - if exists('g:omni_syntax_group_exclude_'.filetype) - let syntax_group_exclude_{filetype} = - \ substitute( g:omni_syntax_group_exclude_{filetype},'\s\+','','g') - if syntax_group_exclude_{filetype} =~ '\w' - let syntax_group_exclude_{filetype} = - \ substitute( syntax_group_exclude_{filetype}, - \ '\s*,\s*', '\\|', 'g' - \ ) + let list_exclude_groups = [] + if a:0 > 0 + " Do nothing since we have specific a specific list of groups + else + " Default the exclude group to nothing + let syntax_group_exclude_{filetype} = '' + " Check if there are any overrides specified for this filetype + if exists('g:omni_syntax_group_exclude_'.filetype) + let syntax_group_exclude_{filetype} = + \ substitute( g:omni_syntax_group_exclude_{filetype},'\s\+','','g') + let list_exclude_groups = split(g:omni_syntax_group_exclude_{filetype}, ',') + if syntax_group_exclude_{filetype} =~ '\w' + let syntax_group_exclude_{filetype} = + \ substitute( syntax_group_exclude_{filetype}, + \ '\s*,\s*', '\\|', 'g' + \ ) + endif endif endif @@ -230,47 +289,51 @@ function! OmniSyntaxList() let index = 0 let index = match(syntax_full, next_group_regex, index) + if index == -1 && exists('b:current_syntax') && ft_part_name != b:current_syntax + " There appears to be two standards when writing syntax files. + " Either items begin as: + " syn keyword {filetype}Keyword values ... + " let b:current_syntax = "sql" + " let b:current_syntax = "sqlanywhere" + " Or + " syn keyword {syntax_filename}Keyword values ... + " let b:current_syntax = "mysql" + " So, we will make the format of finding the syntax group names + " a bit more flexible and look for both if the first fails to + " find a match. + let next_group_regex = '\n' . + \ '\zs'.b:current_syntax.'\w\+\ze'. + \ '\s\+xxx\s\+' + let index = 0 + let index = match(syntax_full, next_group_regex, index) + endif + while index > -1 let group_name = matchstr( syntax_full, '\w\+', index ) let get_syn_list = 1 - " if syntax_group_include_{&filetype} == '' - " if syntax_group_exclude_{&filetype} != '' - " if '\<'.syntax_group_exclude_{&filetype}.'\>' =~ '\<'.group_name.'\>' + for exclude_group_name in list_exclude_groups + if '\<'.exclude_group_name.'\>' =~ '\<'.group_name.'\>' + let get_syn_list = 0 + endif + endfor + + " This code is no longer needed in version 6.0 since we have + " augmented the syntax list command to only retrieve the syntax + " groups we are interested in. + " + " if get_syn_list == 1 + " if syntax_group_include_{filetype} != '' + " if '\<'.syntax_group_include_{filetype}.'\>' !~ '\<'.group_name.'\>' " let get_syn_list = 0 " endif " endif - " else - " if '\<'.syntax_group_include_{&filetype}.'\>' !~ '\<'.group_name.'\>' - " let get_syn_list = 0 - " endif " endif - if syntax_group_exclude_{filetype} != '' - if '\<'.syntax_group_exclude_{filetype}.'\>' =~ '\<'.group_name.'\>' - let get_syn_list = 0 - endif - endif - - if get_syn_list == 1 - if syntax_group_include_{filetype} != '' - if '\<'.syntax_group_include_{filetype}.'\>' !~ '\<'.group_name.'\>' - let get_syn_list = 0 - endif - endif - endif if get_syn_list == 1 " Pass in the full syntax listing, plus the group name we " are interested in. let extra_syn_list = s:SyntaxCSyntaxGroupItems(group_name, syntax_full) - - " if !empty(extra_syn_list) - " for elem in extra_syn_list - " let item = {'word':elem, 'kind':'t', 'info':group_name} - " let compl_list += [item] - " endfor - " endif - let syn_list = syn_list . extra_syn_list . "\n" endif diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim index 3e44579ce1..508405341b 100644 --- a/runtime/autoload/tar.vim +++ b/runtime/autoload/tar.vim @@ -1,7 +1,7 @@ " tar.vim: Handles browsing tarfiles " AUTOLOAD PORTION -" Date: Dec 28, 2009 -" Version: 24 +" Date: Jul 27, 2010 +" Version: 25 " Maintainer: Charles E Campbell, Jr " License: Vim License (see vim's :help license) " @@ -22,7 +22,7 @@ if &cp || exists("g:loaded_tar") finish endif -let g:loaded_tar= "v24" +let g:loaded_tar= "v25" if v:version < 702 echohl WarningMsg echo "***warning*** this version of tar needs vim 7.2" @@ -164,6 +164,9 @@ fun! tar#Browse(tarfile) elseif tarfile =~# '\.lzma$' " call Decho("3: exe silent r! lzma -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ") exe "silent r! lzma -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - " + elseif tarfile =~# '\.\(xz\|txz\)$' +" call Decho("3: exe silent r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ") + exe "silent r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - " else if tarfile =~ '^\s*-' " A file name starting with a dash is taken as an option. Prepend ./ to avoid that. @@ -265,10 +268,13 @@ fun! tar#Read(fname,mode) elseif fname =~ '\.lzma$' && executable("lzcat") let decmp= "|lzcat" let doro = 1 + elseif fname =~ '\.xz$' && executable("xzcat") + let decmp= "|xzcat" + let doro = 1 else let decmp="" let doro = 0 - if fname =~ '\.bz2$\|\.gz$\|\.lzma$\|\.zip$\|\.Z$' + if fname =~ '\.bz2$\|\.gz$\|\.lzma$\|\.xz$\|\.zip$\|\.Z$' setlocal bin endif endif @@ -290,6 +296,9 @@ fun! tar#Read(fname,mode) elseif tarfile =~# '\.lzma$' " call Decho("7: exe silent r! lzma -d -c ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp) exe "silent r! lzma -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp + elseif tarfile =~# '\.\(xz\|txz\)$' +" call Decho("3: exe silent r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp) + exe "silent r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp else if tarfile =~ '^\s*-' " A file name starting with a dash is taken as an option. Prepend ./ to avoid that. @@ -387,17 +396,22 @@ fun! tar#Write(fname) call system("gzip -d -- ".shellescape(tarfile,0)) let tarfile = substitute(tarfile,'\.gz','','e') let compress= "gzip -- ".shellescape(tarfile,0) -" call Decho("compress<".compress.">") - elseif tarfile =~# '\.lzma' - call system("lzma -d -- ".shellescape(tarfile,0)) - let tarfile = substitute(tarfile,'\.lzma','','e') - let compress= "lzma -- ".shellescape(tarfile,0) " call Decho("compress<".compress.">") elseif tarfile =~# '\.tgz' call system("gzip -d -- ".shellescape(tarfile,0)) let tarfile = substitute(tarfile,'\.tgz','.tar','e') let compress= "gzip -- ".shellescape(tarfile,0) let tgz = 1 +" call Decho("compress<".compress.">") + elseif tarfile =~# '\.xz' + call system("xz -d -- ".shellescape(tarfile,0)) + let tarfile = substitute(tarfile,'\.xz','','e') + let compress= "xz -- ".shellescape(tarfile,0) +" call Decho("compress<".compress.">") + elseif tarfile =~# '\.lzma' + call system("lzma -d -- ".shellescape(tarfile,0)) + let tarfile = substitute(tarfile,'\.lzma','','e') + let compress= "lzma -- ".shellescape(tarfile,0) " call Decho("compress<".compress.">") endif " call Decho("tarfile<".tarfile.">") diff --git a/runtime/autoload/tohtml.vim b/runtime/autoload/tohtml.vim index 620c9c3502..55399a788e 100644 --- a/runtime/autoload/tohtml.vim +++ b/runtime/autoload/tohtml.vim @@ -1,6 +1,6 @@ " Vim autoload file for the tohtml plugin. " Maintainer: Ben Fritz -" Last Change: 2010 July 24 +" Last Change: 2010 Jul 29 " " Additional contributors: " @@ -39,7 +39,6 @@ func! tohtml#Convert2HTML(line1, line2) let g:html_diff_win_num += 1 runtime syntax/2html.vim call add(buf_list, bufnr('%')) - "exec '%s#'] + let body_line = '' + let html = [] call add(html, '') @@ -69,6 +70,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) " validate without warnings about encoding call add(html, '') + let body_line_num = len(html) call add(html, '') call add(html, '') @@ -78,6 +80,9 @@ func! tohtml#Diff2HTML(win_list, buf_list) endfor call add(html, '') + let diff_style_start = 0 + let insert_index = 0 + for buf in a:buf_list let temp = [] exe bufwinnr(buf) . 'wincmd w' @@ -86,13 +91,40 @@ func! tohtml#Diff2HTML(win_list, buf_list) " to act on everything in a fold by mistake. setlocal nofoldenable + " When not using CSS or when using xhtml, the line can be important. + " Assume it will be the same for all buffers and grab it from the first + " buffer. Similarly, need to grab the body end line as well. + if body_line == '' + 1 + call search('', 'b') + let s:body_end_line = getline('.') + endif + " Grab the style information. Some of this will be duplicated... 1 let style_start = search('^') if style_start > 0 && style_end > 0 - let style += getline(style_start + 1, style_end - 1) + let buf_styles = getline(style_start + 1, style_end - 1) + for a_style in buf_styles + if index(style, a_style) == -1 + if diff_style_start == 0 + if a_style =~ '\') call add(html, '
') - call add(html, '') + call add(html, s:body_end_line) call add(html, '') let i = 1 diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt index 6663c15e7c..f04d6ee10e 100644 --- a/runtime/doc/arabic.txt +++ b/runtime/doc/arabic.txt @@ -1,4 +1,4 @@ -*arabic.txt* For Vim version 7.3c. Last change: 2005 Mar 29 +*arabic.txt* For Vim version 7.3d. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Nadim Shaikli diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 7521d61039..259d6f5b21 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 7.3c. Last change: 2010 Jul 22 +*autocmd.txt* For Vim version 7.3d. Last change: 2010 Jul 22 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 767ea16bda..e689983f75 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.3c. Last change: 2010 Mar 23 +*change.txt* For Vim version 7.3d. Last change: 2010 Jul 29 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1245,7 +1245,8 @@ gq{motion} Format the lines that {motion} moves over. :nnoremap Q gq gqgq *gqgq* *gqq* -gqq Format the current line. {not in Vi} +gqq Format the current line. With a count format that + many lines. {not in Vi} *v_gq* {Visual}gq Format the highlighted text. (for {Visual} see diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index c06d585225..3c7cd7c9b8 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 7.3c. Last change: 2010 May 07 +*cmdline.txt* For Vim version 7.3d. Last change: 2010 May 07 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt index 8672a62cf9..e72d59a839 100644 --- a/runtime/doc/debug.txt +++ b/runtime/doc/debug.txt @@ -1,4 +1,4 @@ -*debug.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*debug.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt index 6cecbc3c5b..8fb5c05857 100644 --- a/runtime/doc/debugger.txt +++ b/runtime/doc/debugger.txt @@ -1,4 +1,4 @@ -*debugger.txt* For Vim version 7.3c. Last change: 2005 Mar 29 +*debugger.txt* For Vim version 7.3d. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt index 81d27d35db..5d47f9a064 100644 --- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -1,4 +1,4 @@ -*develop.txt* For Vim version 7.3c. Last change: 2008 Dec 17 +*develop.txt* For Vim version 7.3d. Last change: 2008 Dec 17 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 1b5c2a1392..2bccbf45f7 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.3c. Last change: 2009 Sep 15 +*diff.txt* For Vim version 7.3d. Last change: 2010 Jul 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -57,6 +57,7 @@ In each of the edited files these options are set: 'diff' on 'scrollbind' on + 'cursorbind' on 'scrollopt' includes "hor" 'wrap' off 'foldmethod' "diff" @@ -133,6 +134,7 @@ the old values are not remembered. 'diff' off 'scrollbind' off + 'cursorbind' off 'scrollopt' without "hor" 'wrap' on 'foldmethod' "manual" diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt index 04d9e16550..20d2707e47 100644 --- a/runtime/doc/digraph.txt +++ b/runtime/doc/digraph.txt @@ -1,4 +1,4 @@ -*digraph.txt* For Vim version 7.3c. Last change: 2010 Apr 11 +*digraph.txt* For Vim version 7.3d. Last change: 2010 Apr 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 73a8ea49da..6ba17d3e15 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 7.3c. Last change: 2010 Jul 21 +*editing.txt* For Vim version 7.3d. Last change: 2010 Jul 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1622,10 +1622,13 @@ There are three different types of searching: In the above example you might want to set path to: > :set path=**,/u/user_x/** -< This searches: > - /u/user_x/work/release/** - /u/user_x/** -< This searches the same directories, but in a different order. +< This searches: + /u/user_x/work/release/** ~ + /u/user_x/** ~ + This searches the same directories, but in a different order. + Note that completion for ":find", ":sfind", and ":tabfind" commands do not + currently work with 'path' items that contain a url or use the double star + (/usr/**2) or upward search (;) notations. > vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index e5f4a1e210..414199fe7f 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.3c. Last change: 2010 Jul 25 +*eval.txt* For Vim version 7.3d. Last change: 2010 Jul 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5094,7 +5094,7 @@ setreg({regname}, {value} [,{options}]) Set the register {regname} to {value}. If {options} contains "a" or {regname} is upper case, then the value is appended. - {options} can also contains a register type specification: + {options} can also contain a register type specification: "c" or "v" |characterwise| mode "l" or "V" |linewise| mode "b" or "" |blockwise-visual| mode diff --git a/runtime/doc/evim-it.1 b/runtime/doc/evim-it.1 index 48e9a83ce2..1e98a2d3f7 100755 --- a/runtime/doc/evim-it.1 +++ b/runtime/doc/evim-it.1 @@ -17,10 +17,10 @@ e imposta le opzioni per farlo comportare come un editore "modeless". State sempre usando Vim, ma come un editore "posizionati-e-clicca". Simile all'uso di Notepad in MS-Windows. .B evim -richiede la presenza della GUI, per avere a disposizione menu e barra +richiede la presenza della GUI, per avere a disposizione menù e barra strumenti. .PP -Da usarsi solo da parte di chi non è in grado di lavorare con Vim nella +Da usarsi soltanto se non si è in grado di lavorare con Vim nella maniera usuale. La modifica file sarà molto meno efficiente. .PP @@ -34,7 +34,7 @@ L'opzione 'insertmode' Sono definite delle mappature che consentono di usare COPIA e INCOLLA con i familiari tasti usati sotto MS-Windows. CTRL-X taglia testo, CTRL-C copia testo e CTRL-V incolla testo. -Usate CTRL-Q per ottenere quello chs si ottierrebbe con CTRL-V in Vim nativo. +Usate CTRL-Q per ottenere quello che si otterrebbe con CTRL-V in Vim nativo. .SH OPZIONI Vedere vim(1). .SH FILE @@ -51,4 +51,4 @@ vim(1) Buona parte di .B Vim è stato scritto da Bram Moolenaar, con molto aiuto da altri. -Vedere il Menu "Aiuto/Crediti". +Vedere il menù "Aiuto/Crediti". diff --git a/runtime/doc/evim-it.UTF-8.1 b/runtime/doc/evim-it.UTF-8.1 index c6656bfd55..f96d0cb42c 100644 --- a/runtime/doc/evim-it.UTF-8.1 +++ b/runtime/doc/evim-it.UTF-8.1 @@ -17,10 +17,10 @@ e imposta le opzioni per farlo comportare come un editore "modeless". State sempre usando Vim, ma come un editore "posizionati-e-clicca". Simile all'uso di Notepad in MS-Windows. .B evim -richiede la presenza della GUI, per avere a disposizione menu e barra +richiede la presenza della GUI, per avere a disposizione menù e barra strumenti. .PP -Da usarsi solo da parte di chi non è in grado di lavorare con Vim nella +Da usarsi soltanto se non si è in grado di lavorare con Vim nella maniera usuale. La modifica file sarà molto meno efficiente. .PP @@ -34,7 +34,7 @@ L'opzione 'insertmode' è impostata per poter immettere del testo direttamente. Sono definite delle mappature che consentono di usare COPIA e INCOLLA con i familiari tasti usati sotto MS-Windows. CTRL-X taglia testo, CTRL-C copia testo e CTRL-V incolla testo. -Usate CTRL-Q per ottenere quello chs si ottierrebbe con CTRL-V in Vim nativo. +Usate CTRL-Q per ottenere quello che si otterrebbe con CTRL-V in Vim nativo. .SH OPZIONI Vedere vim(1). .SH FILE @@ -51,4 +51,4 @@ vim(1) Buona parte di .B Vim è stato scritto da Bram Moolenaar, con molto aiuto da altri. -Vedere il Menu "Aiuto/Crediti". +Vedere il menù "Aiuto/Crediti". diff --git a/runtime/doc/farsi.txt b/runtime/doc/farsi.txt index 2724f5c1bf..1ff80cc105 100644 --- a/runtime/doc/farsi.txt +++ b/runtime/doc/farsi.txt @@ -1,4 +1,4 @@ -*farsi.txt* For Vim version 7.3c. Last change: 2005 Mar 29 +*farsi.txt* For Vim version 7.3d. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Mortaza Ghassab Shiran diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index f985fd985f..b67f8ae783 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -1,4 +1,4 @@ -*filetype.txt* For Vim version 7.3c. Last change: 2008 Jul 15 +*filetype.txt* For Vim version 7.3d. Last change: 2008 Jul 15 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt index 0042fa49b0..d16a5edd88 100644 --- a/runtime/doc/fold.txt +++ b/runtime/doc/fold.txt @@ -1,4 +1,4 @@ -*fold.txt* For Vim version 7.3c. Last change: 2010 May 13 +*fold.txt* For Vim version 7.3d. Last change: 2010 May 13 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/ft_ada.txt b/runtime/doc/ft_ada.txt index e637218cfe..12b90f6bc1 100644 --- a/runtime/doc/ft_ada.txt +++ b/runtime/doc/ft_ada.txt @@ -1,4 +1,4 @@ -*ft_ada.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*ft_ada.txt* For Vim version 7.3d. Last change: 2010 Jul 20 ADA FILE TYPE PLUG-INS REFERENCE MANUAL~ diff --git a/runtime/doc/ft_sql.txt b/runtime/doc/ft_sql.txt index 5c7b3e2257..42b2e122cc 100644 --- a/runtime/doc/ft_sql.txt +++ b/runtime/doc/ft_sql.txt @@ -1,4 +1,4 @@ -*ft_sql.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*ft_sql.txt* For Vim version 7.3d. Last change: 2010 Jul 20 by David Fishburn diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index d031c52ef9..48f010a049 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1,4 +1,4 @@ -*gui.txt* For Vim version 7.3c. Last change: 2010 May 14 +*gui.txt* For Vim version 7.3d. Last change: 2010 May 14 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/gui_w16.txt b/runtime/doc/gui_w16.txt index cbf54ede91..2b2b317923 100644 --- a/runtime/doc/gui_w16.txt +++ b/runtime/doc/gui_w16.txt @@ -1,4 +1,4 @@ -*gui_w16.txt* For Vim version 7.3c. Last change: 2005 Mar 29 +*gui_w16.txt* For Vim version 7.3d. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt index dac17d419f..f02be8d6c8 100644 --- a/runtime/doc/gui_w32.txt +++ b/runtime/doc/gui_w32.txt @@ -1,4 +1,4 @@ -*gui_w32.txt* For Vim version 7.3c. Last change: 2007 Aug 30 +*gui_w32.txt* For Vim version 7.3d. Last change: 2007 Aug 30 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt index 37c5a3dd67..f39f7d73c7 100644 --- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -1,4 +1,4 @@ -*gui_x11.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*gui_x11.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/hangulin.txt b/runtime/doc/hangulin.txt index c1ab071acd..22b3d54d51 100644 --- a/runtime/doc/hangulin.txt +++ b/runtime/doc/hangulin.txt @@ -1,4 +1,4 @@ -*hangulin.txt* For Vim version 7.3c. Last change: 2009 Jun 24 +*hangulin.txt* For Vim version 7.3d. Last change: 2009 Jun 24 VIM REFERENCE MANUAL by Chi-Deok Hwang and Sung-Hyun Nam diff --git a/runtime/doc/hebrew.txt b/runtime/doc/hebrew.txt index 152c072355..7a8697a7f6 100644 --- a/runtime/doc/hebrew.txt +++ b/runtime/doc/hebrew.txt @@ -1,4 +1,4 @@ -*hebrew.txt* For Vim version 7.3c. Last change: 2007 Jun 14 +*hebrew.txt* For Vim version 7.3d. Last change: 2007 Jun 14 VIM REFERENCE MANUAL by Ron Aaron (and Avner Lottem) diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt index 16136a4258..643022b10e 100644 --- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -1,4 +1,4 @@ -*help.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*help.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM - main help file k diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt index c02b45a932..4ee4248375 100644 --- a/runtime/doc/helphelp.txt +++ b/runtime/doc/helphelp.txt @@ -1,4 +1,4 @@ -*helphelp.txt* For Vim version 7.3c. Last change: 2008 Jul 21 +*helphelp.txt* For Vim version 7.3d. Last change: 2010 Jul 29 VIM REFERENCE MANUAL by Bram Moolenaar @@ -60,11 +60,20 @@ Help on help files *helphelp* If there are several matches, you can have them listed by hitting CTRL-D. Example: > :help cont -< To use a regexp |pattern|, first do ":help" and then + +< Instead of typing ":help CTRL-V" to search for help + for CTRL-V you can type: > + :help ^V +< This also works together with other characters, for + example to find help for CTRL-V in Insert mode: > + :help i^V +< + To use a regexp |pattern|, first do ":help" and then use ":tag {pattern}" in the help window. The ":tnext" command can then be used to jump to other matches, "tselect" to list matches and choose one. > :help index| :tse z. + < When there is no argument you will see matches for "help", to avoid listing all possible matches (that would be very slow). diff --git a/runtime/doc/howto.txt b/runtime/doc/howto.txt index d1101dcb4d..bc3a9362db 100644 --- a/runtime/doc/howto.txt +++ b/runtime/doc/howto.txt @@ -1,4 +1,4 @@ -*howto.txt* For Vim version 7.3c. Last change: 2006 Apr 02 +*howto.txt* For Vim version 7.3d. Last change: 2006 Apr 02 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt index bb2da34b85..25332b7d69 100644 --- a/runtime/doc/if_cscop.txt +++ b/runtime/doc/if_cscop.txt @@ -1,4 +1,4 @@ -*if_cscop.txt* For Vim version 7.3c. Last change: 2009 Mar 18 +*if_cscop.txt* For Vim version 7.3d. Last change: 2009 Mar 18 VIM REFERENCE MANUAL by Andy Kahn diff --git a/runtime/doc/if_lua.txt b/runtime/doc/if_lua.txt index 32af771fc0..d464d3765c 100644 --- a/runtime/doc/if_lua.txt +++ b/runtime/doc/if_lua.txt @@ -1,4 +1,4 @@ -*if_lua.txt* For Vim version 7.3c. Last change: 2010 Jul 22 +*if_lua.txt* For Vim version 7.3d. Last change: 2010 Jul 22 VIM REFERENCE MANUAL by Luis Carvalho diff --git a/runtime/doc/if_mzsch.txt b/runtime/doc/if_mzsch.txt index b51a20ed94..1623c257bb 100644 --- a/runtime/doc/if_mzsch.txt +++ b/runtime/doc/if_mzsch.txt @@ -1,4 +1,4 @@ -*if_mzsch.txt* For Vim version 7.3c. Last change: 2010 Feb 11 +*if_mzsch.txt* For Vim version 7.3d. Last change: 2010 Feb 11 VIM REFERENCE MANUAL by Sergey Khorev diff --git a/runtime/doc/if_ole.txt b/runtime/doc/if_ole.txt index cd525f2154..dbe09d0771 100644 --- a/runtime/doc/if_ole.txt +++ b/runtime/doc/if_ole.txt @@ -1,4 +1,4 @@ -*if_ole.txt* For Vim version 7.3c. Last change: 2008 Aug 16 +*if_ole.txt* For Vim version 7.3d. Last change: 2008 Aug 16 VIM REFERENCE MANUAL by Paul Moore diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt index c2f9d5af63..5c335b96f2 100644 --- a/runtime/doc/if_perl.txt +++ b/runtime/doc/if_perl.txt @@ -1,4 +1,4 @@ -*if_perl.txt* For Vim version 7.3c. Last change: 2010 Jul 21 +*if_perl.txt* For Vim version 7.3d. Last change: 2010 Jul 21 VIM REFERENCE MANUAL by Sven Verdoolaege diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index 079ea0c0d8..a369f1867f 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -1,4 +1,4 @@ -*if_pyth.txt* For Vim version 7.3c. Last change: 2010 Jul 25 +*if_pyth.txt* For Vim version 7.3d. Last change: 2010 Jul 25 VIM REFERENCE MANUAL by Paul Moore diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt index 61ad9b0c16..e302b34da5 100644 --- a/runtime/doc/if_ruby.txt +++ b/runtime/doc/if_ruby.txt @@ -1,4 +1,4 @@ -*if_ruby.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*if_ruby.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM REFERENCE MANUAL by Shugo Maeda diff --git a/runtime/doc/if_sniff.txt b/runtime/doc/if_sniff.txt index 6dc21b1302..8f82c244d8 100644 --- a/runtime/doc/if_sniff.txt +++ b/runtime/doc/if_sniff.txt @@ -1,4 +1,4 @@ -*if_sniff.txt* For Vim version 7.3c. Last change: 2005 Mar 29 +*if_sniff.txt* For Vim version 7.3d. Last change: 2005 Mar 29 VIM REFERENCE MANUAL diff --git a/runtime/doc/if_tcl.txt b/runtime/doc/if_tcl.txt index f91bce24b8..6aa25abb56 100644 --- a/runtime/doc/if_tcl.txt +++ b/runtime/doc/if_tcl.txt @@ -1,4 +1,4 @@ -*if_tcl.txt* For Vim version 7.3c. Last change: 2008 Aug 16 +*if_tcl.txt* For Vim version 7.3d. Last change: 2008 Aug 16 VIM REFERENCE MANUAL by Ingo Wilken diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index 4282ba23b2..480c999703 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -1,4 +1,4 @@ -*indent.txt* For Vim version 7.3c. Last change: 2010 Mar 27 +*indent.txt* For Vim version 7.3d. Last change: 2010 Jul 30 VIM REFERENCE MANUAL by Bram Moolenaar @@ -549,7 +549,7 @@ those useless characters first with a command like: > :%s /\r$//g Or, you can simply |:let| the variable PHP_removeCRwhenUnix to 1 and the -script will silently remove them when Vim loads a PHP file (at each |BufRead|). +script will silently remove them when Vim loads a PHP file (at each|BufRead|). OPTIONS: ~ @@ -557,7 +557,7 @@ PHP indenting can be altered in several ways by modifying the values of some variables: *php-comment* -To not enable auto-formatting of comments by default (if you want to use your +To not enable auto-formating of comments by default (if you want to use your own 'formatoptions'): > :let g:PHP_autoformatcomment = 0 @@ -584,6 +584,10 @@ For example, with N = 1, this will give: (Notice the extra indent between the PHP container markers and the code) ------------- +To indent PHP tags as the surrounding code: > + :let g:PHP_outdentphpescape = 0 +------------- + To automatically remove '\r' characters when the 'fileformat' is set to Unix: > :let g:PHP_removeCRwhenUnix = 1 ------------- @@ -609,7 +613,7 @@ NOTE: Indenting will be a bit slower if this option is used because some To indent 'case:' and 'default:' statements in switch() blocks: > :let g:PHP_vintage_case_default_indent = 1 -(By default they are indented at the same level than the 'switch()' to avoid +(Since in PHP braces are not required inside 'case/default' blocks, by default they are indented at the same level than the 'switch()' to avoid unnecessary indentation) diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 8ea2648078..4d6633b8b4 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 7.3c. Last change: 2010 Jul 21 +*index.txt* For Vim version 7.3d. Last change: 2010 Jul 21 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index ac539265a9..563594e9c6 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*insert.txt* For Vim version 7.3d. Last change: 2010 Jul 29 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1488,6 +1488,38 @@ on word characters. This can be controlled adding the following to your vimrc: > let g:omni_syntax_use_iskeyword = 0 +For plugin developers, the plugin exposes a public function OmniSyntaxList. +This function can be used to request a List of syntax items. When editing a +SQL file (:e syntax.sql) you can use the ":syntax list" command to see the +various groups and syntax items. For example: > + syntax list + +Yields data similar to this: > + sqlOperator xxx some prior all like and any escape exists in is not + or intersect minus between distinct + links to Operator + sqlType xxx varbit varchar nvarchar bigint int uniqueidentifier + date money long tinyint unsigned xml text smalldate + double datetime nchar smallint numeric time bit char + varbinary binary smallmoney + image float integer timestamp real decimal + +There are two syntax groups listed here: sqlOperator and sqlType. To retrieve +a List of syntax items you can call OmniSyntaxList a number of different +ways. To retrieve all syntax items regardless of syntax group: > + echo OmniSyntaxList( [] ) + +To retrieve only the syntax items for the sqlOperator syntax group: > + echo OmniSyntaxList( ['sqlOperator'] ) + +To retrieve all syntax items for both the sqlOperator and sqlType groups: > + echo OmniSyntaxList( ['sqlOperator', 'sqlType'] ) + +From within a plugin, you would typically assign the output to a List: > + let myKeywords = [] + let myKeywords = OmniSyntaxList( ['sqlKeyword'] ) + + SQL *ft-sql-omni* diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index daa84cff78..ba1460cf45 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -1,4 +1,4 @@ -*intro.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*intro.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index 153cd7fb31..70271fda07 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1,4 +1,4 @@ -*map.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*map.txt* For Vim version 7.3d. Last change: 2010 Jul 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1208,13 +1208,15 @@ completion can be enabled: -complete=event autocommand events -complete=expression Vim expression -complete=file file and directory names - -complete=shellcmd Shell command + -complete=filetype filetype names |'filetype'| -complete=function function name -complete=help help subjects -complete=highlight highlight groups -complete=mapping mapping name -complete=menu menus -complete=option options + -complete=shellcmd Shell command + -complete=syntax syntax file names |'syntax'| -complete=tag tags -complete=tag_listfiles tags, file names are shown when CTRL-D is hit -complete=var user variables @@ -1266,6 +1268,8 @@ the 'path' option: > : return split(globpath(&path, a:A), "\n") :endfun < +This example does not work for file names with spaces! + Range handling *E177* *E178* *:command-range* *:command-count* diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index a72d0f6123..e7f571d9d8 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1,4 +1,4 @@ -*mbyte.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*mbyte.txt* For Vim version 7.3d. Last change: 2010 Jul 26 VIM REFERENCE MANUAL by Bram Moolenaar et al. @@ -928,7 +928,7 @@ See 'imactivatekey' for the format. {only works Windows GUI and compiled with the |+multi_byte_ime| feature} -To input multibyte characters on Windows, you have to use Input Method Editor +To input multibyte characters on Windows, you can use an Input Method Editor (IME). In process of your editing text, you must switch status (on/off) of IME many many many times. Because IME with status on is hooking all of your key inputs, you cannot input 'j', 'k', or almost all of keys to Vim directly. diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index c4ed18b0d3..47aad11797 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*message.txt* For Vim version 7.3d. Last change: 2010 Jul 26 VIM REFERENCE MANUAL by Bram Moolenaar @@ -467,7 +467,16 @@ Oh, oh. You must have been doing something complicated, or some other program is consuming your memory. Be careful! Vim is not completely prepared for an out-of-memory situation. First make sure that any changes are saved. Then try to solve the memory shortage. To stay on the safe side, exit Vim and -start again. Also see |msdos-limitations|. +start again. + +Buffers are only partly kept in memory, thus editing a very large file is +unlikely to cause an out-of-memory situation. Undo information is completely +in memory, you can reduce that with these options: +- 'undolevels' Set to a low value, or to -1 to disable undo completely. This + helps for a change that affects all lines. +- 'undoreload' Set to zero to disable. + +Also see |msdos-limitations|. *E339* > Pattern too long diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt index 5c53452211..e546ac2967 100644 --- a/runtime/doc/mlang.txt +++ b/runtime/doc/mlang.txt @@ -1,4 +1,4 @@ -*mlang.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*mlang.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index c6d7e9c691..e969a04e0b 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 7.3c. Last change: 2010 May 14 +*motion.txt* For Vim version 7.3d. Last change: 2010 May 14 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt index 266f77d73a..7a2aecdfb6 100644 --- a/runtime/doc/netbeans.txt +++ b/runtime/doc/netbeans.txt @@ -1,4 +1,4 @@ -*netbeans.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*netbeans.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM REFERENCE MANUAL by Gordon Prieur et al. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 4d0e4f7789..54cc2641e6 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.3c. Last change: 2010 Jul 25 +*options.txt* For Vim version 7.3d. Last change: 2010 Aug 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1746,12 +1746,15 @@ A jump table for the options with a short description can be found at |Q_op|. Value Effect ~ 0 Text is shown normally - 1 Each block of concealed text is replaced with the - character defined in 'listchars' (default is a dash) - and highlighted with the "Conceal" highlight group. + 1 Each block of concealed text is replaced with one + character. If the syntax item does not have a custom + replacement character defined (see |:syn-cchar|) the + character defined in 'listchars' is used (default is a + space). + It is highlighted with the "Conceal" highlight group. 2 Concealed text is completely hidden unless it has a custom replacement character defined (see - |:syn-cchar|. + |:syn-cchar|). 3 Concealed text is completely hidden. Note: in the cursor line concealed text is not hidden, so that you can @@ -4588,8 +4591,8 @@ A jump table for the options with a short description can be found at |Q_op|. 'listchars' 'lcs' string (default "eol:$") global {not in Vi} - Strings to use in 'list' mode. It is a comma separated list of string - settings. + Strings to use in 'list' mode and for the |:list| command. It is a + comma separated list of string settings. eol:c Character to show at the end of each line. When omitted, there is no extra character at the end of the line. diff --git a/runtime/doc/os_390.txt b/runtime/doc/os_390.txt index 1d8431ec29..34bf81f45c 100644 --- a/runtime/doc/os_390.txt +++ b/runtime/doc/os_390.txt @@ -1,4 +1,4 @@ -*os_390.txt* For Vim version 7.3c. Last change: 2010 May 30 +*os_390.txt* For Vim version 7.3d. Last change: 2010 May 30 VIM REFERENCE MANUAL by Ralf Schandl diff --git a/runtime/doc/os_amiga.txt b/runtime/doc/os_amiga.txt index 10e61c413f..8c2ea61b56 100644 --- a/runtime/doc/os_amiga.txt +++ b/runtime/doc/os_amiga.txt @@ -1,4 +1,4 @@ -*os_amiga.txt* For Vim version 7.3c. Last change: 2005 Mar 29 +*os_amiga.txt* For Vim version 7.3d. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_beos.txt b/runtime/doc/os_beos.txt index ce597aace1..13538c169d 100644 --- a/runtime/doc/os_beos.txt +++ b/runtime/doc/os_beos.txt @@ -1,4 +1,4 @@ -*os_beos.txt* For Vim version 7.3c. Last change: 2005 Mar 29 +*os_beos.txt* For Vim version 7.3d. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_dos.txt b/runtime/doc/os_dos.txt index f77463f7a9..6bbe4624a9 100644 --- a/runtime/doc/os_dos.txt +++ b/runtime/doc/os_dos.txt @@ -1,4 +1,4 @@ -*os_dos.txt* For Vim version 7.3c. Last change: 2006 Mar 30 +*os_dos.txt* For Vim version 7.3d. Last change: 2006 Mar 30 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt index 62685bf420..4f0ea9da6b 100644 --- a/runtime/doc/os_mac.txt +++ b/runtime/doc/os_mac.txt @@ -1,4 +1,4 @@ -*os_mac.txt* For Vim version 7.3c. Last change: 2006 Apr 30 +*os_mac.txt* For Vim version 7.3d. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar et al. diff --git a/runtime/doc/os_mint.txt b/runtime/doc/os_mint.txt index a929a5cdae..83fa975e75 100644 --- a/runtime/doc/os_mint.txt +++ b/runtime/doc/os_mint.txt @@ -1,4 +1,4 @@ -*os_mint.txt* For Vim version 7.3c. Last change: 2005 Mar 29 +*os_mint.txt* For Vim version 7.3d. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Jens M. Felderhoff diff --git a/runtime/doc/os_msdos.txt b/runtime/doc/os_msdos.txt index fdb8d85607..f27add8fca 100644 --- a/runtime/doc/os_msdos.txt +++ b/runtime/doc/os_msdos.txt @@ -1,4 +1,4 @@ -*os_msdos.txt* For Vim version 7.3c. Last change: 2005 Mar 29 +*os_msdos.txt* For Vim version 7.3d. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_os2.txt b/runtime/doc/os_os2.txt index 897ad145da..1f4756ebd7 100644 --- a/runtime/doc/os_os2.txt +++ b/runtime/doc/os_os2.txt @@ -1,4 +1,4 @@ -*os_os2.txt* For Vim version 7.3c. Last change: 2007 Apr 22 +*os_os2.txt* For Vim version 7.3d. Last change: 2007 Apr 22 VIM REFERENCE MANUAL by Paul Slootman diff --git a/runtime/doc/os_qnx.txt b/runtime/doc/os_qnx.txt index f433921add..485b03cc0b 100644 --- a/runtime/doc/os_qnx.txt +++ b/runtime/doc/os_qnx.txt @@ -1,4 +1,4 @@ -*os_qnx.txt* For Vim version 7.3c. Last change: 2005 Mar 29 +*os_qnx.txt* For Vim version 7.3d. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Julian Kinraid diff --git a/runtime/doc/os_risc.txt b/runtime/doc/os_risc.txt index 6bbe057f20..2d1b354d1d 100644 --- a/runtime/doc/os_risc.txt +++ b/runtime/doc/os_risc.txt @@ -1,4 +1,4 @@ -*os_risc.txt* For Vim version 7.3c. Last change: 2008 Jun 28 +*os_risc.txt* For Vim version 7.3d. Last change: 2008 Jun 28 VIM REFERENCE MANUAL by Thomas Leonard diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt index 5420d17047..589a79d45b 100644 --- a/runtime/doc/os_unix.txt +++ b/runtime/doc/os_unix.txt @@ -1,4 +1,4 @@ -*os_unix.txt* For Vim version 7.3c. Last change: 2005 Mar 29 +*os_unix.txt* For Vim version 7.3d. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_vms.txt b/runtime/doc/os_vms.txt index 6edfbe86ff..defab925ec 100644 --- a/runtime/doc/os_vms.txt +++ b/runtime/doc/os_vms.txt @@ -1,4 +1,4 @@ -*os_vms.txt* For Vim version 7.3c. Last change: 2009 Oct 28 +*os_vms.txt* For Vim version 7.3d. Last change: 2010 Jul 28 VIM REFERENCE MANUAL @@ -766,16 +766,20 @@ GNU_TOOLS.ZIP package downloadable from http://www.polarhome.com/vim/ 9. VMS related changes *vms-changes* -Recent changes -- The following plugins are included into VMS runtime: - genutils 2.4, multiselect 2.2, multvals 3.1, selectbuf 4.3, - bufexplorer 7.1.7, taglist 4.5 -- minor changes in vimrc (just in VMS runtime) +Version 7.3 +- CTAGS 5.8 included +- VMS compile warnings fixed - floating-point overflow warning corrected on VAX +- filepath completition corrected - too many chars were escaped in filename + and shell commands +- the following plugins are included into VMS runtime: + genutils 2.4, multiselect 2.2, multvals 3.1, selectbuf 4.3, + bufexplorer 7.1.7, taglist 4.5 +- minor changes in vimrc (just in VMS runtime) - make_vms.mms - HUGE model is the default - [TESTDIR]make_vms.mms include as many tests possible - modify test30 and test54 for VMS - enable FLOAT feature in VMS port -- os_vms.txt updated +- os_vms.txt updated Version 7.2 (2008 Aug 9) - VCF files write corrected diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt index be33db2251..9859bf4533 100644 --- a/runtime/doc/os_win32.txt +++ b/runtime/doc/os_win32.txt @@ -1,4 +1,4 @@ -*os_win32.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*os_win32.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM REFERENCE MANUAL by George Reilly diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 081a8f7470..76ad17771f 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1,4 +1,4 @@ -*pattern.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*pattern.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/pi_getscript.txt b/runtime/doc/pi_getscript.txt index 9e6dbdbe4c..b7ad6725aa 100644 --- a/runtime/doc/pi_getscript.txt +++ b/runtime/doc/pi_getscript.txt @@ -1,4 +1,4 @@ -*pi_getscript.txt* For Vim version 7.3c. Last change: 2009 Oct 14 +*pi_getscript.txt* For Vim version 7.3d. Last change: 2009 Oct 14 > GETSCRIPT REFERENCE MANUAL by Charles E. Campbell, Jr. < diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt index 5abb12db77..b796f2d7de 100644 --- a/runtime/doc/pi_gzip.txt +++ b/runtime/doc/pi_gzip.txt @@ -1,4 +1,4 @@ -*pi_gzip.txt* For Vim version 7.3c. Last change: 2002 Oct 29 +*pi_gzip.txt* For Vim version 7.3d. Last change: 2002 Oct 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index 52df67c8fe..f5f3273031 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -1,4 +1,4 @@ -*pi_netrw.txt* For Vim version 7.3c. Last change: 2010 May 14 +*pi_netrw.txt* For Vim version 7.3d. Last change: 2010 Jul 28 ----------------------------------------------------- NETRW REFERENCE MANUAL by Charles E. Campbell, Jr. @@ -316,86 +316,95 @@ settings are described below, in |netrw-browser-options|, and in |netrw-externapp|: *b:netrw_lastfile* last file Network-read/written retained on a - per-buffer basis (supports plain :Nw ) + per-buffer basis (supports plain :Nw ) + + *g:netrw_bufsettings* the settings that netrw buffers have + (default) noma nomod nonu nowrap ro nobl *g:netrw_chgwin* specifies a window number where file edits will take - place. (also see |netrw-C|) - (default) not defined - - *g:Netrw_funcref* specifies a function to be called when netrw edits - a file. The file is first edited, and then the - function reference (|Funcref|) is called. - (default) not defined + place. (also see |netrw-C|) + (default) not defined + *g:Netrw_funcref* specifies a function (or functions) to be called when + netrw edits a file. The file is first edited, and + then the function reference (|Funcref|) is called. + This variable may also hold a |List| of Funcrefs. + (default) not defined +> + Example: place in .vimrc; affects all file opening + fun! MyFuncRef() + endfun + let g:Netrw_funcref= function("MyFuncRef") +< *g:netrw_ftp* if it doesn't exist, use default ftp - =0 use default ftp (uid password) - =1 use alternate ftp method (user uid password) - If you're having trouble with ftp, try changing the - value of this variable to see if the alternate ftp - method works for your setup. + =0 use default ftp (uid password) + =1 use alternate ftp method (user uid password) + If you're having trouble with ftp, try changing the + value of this variable to see if the alternate ftp + method works for your setup. *g:netrw_ftpextracmd* default: doesn't exist - If this variable exists, then any string it contains - will be placed into the commands set to your ftp - client. As an example: - ="passive" + If this variable exists, then any string it contains + will be placed into the commands set to your ftp + client. As an example: + ="passive" *g:netrw_ftpmode* ="binary" (default) - ="ascii" + ="ascii" *g:netrw_ignorenetrc* =0 (default for linux, cygwin) - =1 If you have a <.netrc> file but it doesn't work and - you want it ignored, then set this variable as - shown. (default for Windows + cmd.exe) + =1 If you have a <.netrc> file but it doesn't work and + you want it ignored, then set this variable as + shown. (default for Windows + cmd.exe) *g:netrw_menu* =0 disable netrw's menu - =1 (default) netrw's menu enabled + =1 (default) netrw's menu enabled *g:netrw_nogx* if this variable exists, then the "gx" map will not - be available (see |netrw-gx|) + be available (see |netrw-gx|) *g:netrw_uid* (ftp) user-id, retained on a per-vim-session basis *s:netrw_passwd* (ftp) password, retained on a per-vim-session basis *g:netrw_preview* =0 (default) preview window shown in a horizontally - split window - =1 preview window shown in a vertically split window. - Also affects the "previous window" (see |netrw-P|) in - the same way. + split window + =1 preview window shown in a vertically split window. + Also affects the "previous window" (see |netrw-P|) in + the same way. *g:netrw_scpport* = "-P" : option to use to set port for scp *g:netrw_sshport* = "-p" : option to use to set port for ssh *g:netrw_sepchr* =\0xff - =\0x01 for enc == euc-jp (and perhaps it should be for + =\0x01 for enc == euc-jp (and perhaps it should be for others, too, please let me know) - Separates priority codes from filenames internally. - See |netrw-p12|. + Separates priority codes from filenames internally. + See |netrw-p12|. *g:netrw_silent* =0 : transfers done normally - =1 : transfers done silently + =1 : transfers done silently *g:netrw_use_errorwindow* =1 : messages from netrw will use a separate one - line window. This window provides reliable - delivery of messages. (default) - =0 : messages from netrw will use echoerr ; - messages don't always seem to show up this - way, but one doesn't have to quit the window. + line window. This window provides reliable + delivery of messages. (default) + =0 : messages from netrw will use echoerr ; + messages don't always seem to show up this + way, but one doesn't have to quit the window. *g:netrw_win95ftp* =1 if using Win95, will remove four trailing blank - lines that o/s's ftp "provides" on transfers - =0 force normal ftp behavior (no trailing line removal) + lines that o/s's ftp "provides" on transfers + =0 force normal ftp behavior (no trailing line removal) *g:netrw_cygwin* =1 assume scp under windows is from cygwin. Also - permits network browsing to use ls with time and - size sorting (default if windows) - =0 assume Windows' scp accepts windows-style paths - Network browsing uses dir instead of ls - This option is ignored if you're using unix + permits network browsing to use ls with time and + size sorting (default if windows) + =0 assume Windows' scp accepts windows-style paths + Network browsing uses dir instead of ls + This option is ignored if you're using unix *g:netrw_use_nt_rcp* =0 don't use the rcp of WinNT, Win2000 and WinXP - =1 use WinNT's rcp in binary mode (default) + =1 use WinNT's rcp in binary mode (default) PATHS *netrw-path* {{{2 @@ -456,7 +465,7 @@ browsed remote directories, for example. On the other hand, thanks go to Jan M. for pointing out the many vulnerabilities that netrw (and vim itself) had had in handling "crafted" filenames. The |shellescape()| and |fnameescape()| functions were written in -response by Bram Moolenaar to handle this sort of problems, and netrw has +response by Bram Moolenaar to handle these sort of problems, and netrw has been modified to use them. Still, my advice is, if the "filename" looks like a vim command that you aren't comfortable with having executed, don't open it. @@ -589,7 +598,7 @@ password. PASSWORD *netrw-passwd* The script attempts to get passwords for ftp invisibly using |inputsecret()|, -a built-in Vim function. See |NetUserPass()| for how to change the password +a built-in Vim function. See |netrw-userpass| for how to change the password after one has set it. Unfortunately there doesn't appear to be a way for netrw to feed a password to @@ -778,8 +787,10 @@ variables listed below, and may be modified by the user. The g:netrw_..._cmd options (|g:netrw_ftp_cmd| and |g:netrw_sftp_cmd|) specify the external program to use handle the ftp protocol. They may -include command line options (such as -p for passive mode). +include command line options (such as -p for passive mode). Example: > + let g:netrw_ftp_cmd= "ftp -p" +< Browsing is supported by using the |g:netrw_list_cmd|; the substring "HOSTNAME" will be changed via substitution with whatever the current request is for a hostname. @@ -798,12 +809,12 @@ temporary file: open machine [port] open machine [port] user userid password userid password [g:netrw_ftpmode] password - [g:netrw_extracmd] [g:netrw_ftpmode] + [g:netrw_ftpextracmd] [g:netrw_ftpmode] get filename tempfile [g:netrw_extracmd] get filename tempfile > --------------------------------------------------------------------- < -The |g:netrw_ftpmode| and g:netrw_extracmd are optional. +The |g:netrw_ftpmode| and |g:netrw_ftpextracmd| are optional. Netrw then executes the lines above by use of a filter: > @@ -2544,13 +2555,13 @@ Associated setting variables: |g:netrw_chgwin| (Vit Gottwald) How to generate public/private key and save public key it on server: > - http://www.tartarus.org/~simon/puttydoc/Chapter8.html#pubkey-gettingready - 8.3 Getting ready for public key authentication + http://www.chiark.greenend.org.uk/~sgtatham/putty/0.60/htmldoc/Chapter8.html#pubkey-gettingready + (8.3 Getting ready for public key authentication) < 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 + http://www.chiark.greenend.org.uk/~sgtatham/putty/0.60/htmldoc/Chapter5.html + (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 @@ -2695,9 +2706,26 @@ which is loaded automatically at startup (assuming :set nocp). ============================================================================== 12. History *netrw-history* {{{1 + v140: Jul 27, 2010 * (Lech Lorens) unexpected change of window + v139: May 14, 2010 * when viewing remote directory listings and + changing listing style, going to tree listing + mode was issuing two rather useless messages + about the buffer name. They have now been + silenced. + * (Jean Johner) with "behave mswin", clicking + on a filename in wide mode opened a new file + with a missing first letter + * (Britton Kerin) wanted netrw listings to be + buflisted; the |g:netrw_bufsettings| option + permits that. + Jun 18, 2010 * (Jan Steffens) added support for xz compression + Jun 23, 2010 * vimdiff dir1 dir2 now works + Jul 27, 2010 * (John Orr) pointed out that the intended maparg + test for gx was actually testing for g rather + than gx. Fixed. v138: May 01, 2010 * added the bomb setting to the Save-Set-Restore option handling (for Tony M) - * (Bram Moolenaar) netrw optionally sets cursorline + May 14, 2010 * (Bram Moolenaar) netrw optionally sets cursorline (and sometimes cursorcolumn) for its display. This option setting was leaking through with remote file handling. diff --git a/runtime/doc/pi_paren.txt b/runtime/doc/pi_paren.txt index 66a4efcd94..c702126137 100644 --- a/runtime/doc/pi_paren.txt +++ b/runtime/doc/pi_paren.txt @@ -1,4 +1,4 @@ -*pi_paren.txt* For Vim version 7.3c. Last change: 2008 Jun 16 +*pi_paren.txt* For Vim version 7.3d. Last change: 2008 Jun 16 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/pi_spec.txt b/runtime/doc/pi_spec.txt index ef0c63c39e..c28dbe1628 100644 --- a/runtime/doc/pi_spec.txt +++ b/runtime/doc/pi_spec.txt @@ -1,4 +1,4 @@ -*pi_spec.txt* For Vim version 7.3c. Last change: 2006 Apr 24 +*pi_spec.txt* For Vim version 7.3d. Last change: 2006 Apr 24 by Gustavo Niemeyer ~ diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt index d90d7a615b..25907465ec 100644 --- a/runtime/doc/pi_tar.txt +++ b/runtime/doc/pi_tar.txt @@ -1,4 +1,4 @@ -*pi_tar.txt* For Vim version 7.3c. Last change: 2009 Dec 28 +*pi_tar.txt* For Vim version 7.3d. Last change: 2010 Jul 27 +====================+ | Tar File Interface | @@ -6,7 +6,7 @@ Author: Charles E. Campbell, Jr. (remove NOSPAM from Campbell's email first) -Copyright 2005-2008: The GPL (gnu public license) applies to *tar-copyright* +Copyright 2005-2010: The GPL (gnu public license) applies to *tar-copyright* tar.vim, tarPlugin.vim, and pi_tar.txt. No warranty, express or implied. Use At-Your-Own-Risk. @@ -26,10 +26,10 @@ Copyright 2005-2008: The GPL (gnu public license) applies to *tar-copyright* also write to the file. Currently, one may not make a new file in tar archives via the plugin. - *:Untarvim* - UNTARVIM~ + *:Vimuntar* + VIMUNTAR~ - :Untarvim [vimhome] + :Vimuntar [vimhome] This command copies, if necessary, the tarball to the .vim or vimfiles directory using the first writable directory in the |'runtimepath'| @@ -83,6 +83,7 @@ Copyright 2005-2008: The GPL (gnu public license) applies to *tar-copyright* 4. History *tar-history* + v25 Jun 19, 2010 * (Jan Steffens) added support for xz compression v24 Apr 07, 2009 * :Untarvim command implemented Sep 28, 2009 * Added lzma support v22 Aug 08, 2008 * security fixes diff --git a/runtime/doc/pi_vimball.txt b/runtime/doc/pi_vimball.txt index 3913b48ace..b56b661a68 100644 --- a/runtime/doc/pi_vimball.txt +++ b/runtime/doc/pi_vimball.txt @@ -1,4 +1,4 @@ -*pi_vimball.txt* For Vim version 7.3c. Last change: 2010 Apr 12 +*pi_vimball.txt* For Vim version 7.3d. Last change: 2010 Apr 12 ---------------- Vimball Archiver diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt index 7657355215..3843df0d01 100644 --- a/runtime/doc/pi_zip.txt +++ b/runtime/doc/pi_zip.txt @@ -1,4 +1,4 @@ -*pi_zip.txt* For Vim version 7.3c. Last change: 2010 Apr 12 +*pi_zip.txt* For Vim version 7.3d. Last change: 2010 Apr 12 +====================+ | Zip File Interface | diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt index 8a66f95493..0229e9581f 100644 --- a/runtime/doc/print.txt +++ b/runtime/doc/print.txt @@ -1,4 +1,4 @@ -*print.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*print.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index e8f65081ad..8bdde4aa67 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1,4 +1,4 @@ -*quickfix.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*quickfix.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 3c01174d46..1c0dbdc0f8 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 7.3c. Last change: 2010 Jul 24 +*quickref.txt* For Vim version 7.3d. Last change: 2010 Jul 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/quotes.txt b/runtime/doc/quotes.txt index c10bc3b4e8..7a41c65fef 100644 --- a/runtime/doc/quotes.txt +++ b/runtime/doc/quotes.txt @@ -1,4 +1,4 @@ -*quotes.txt* For Vim version 7.3c. Last change: 2006 Apr 24 +*quotes.txt* For Vim version 7.3d. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt index 37ad2fff91..b976079864 100644 --- a/runtime/doc/recover.txt +++ b/runtime/doc/recover.txt @@ -1,4 +1,4 @@ -*recover.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*recover.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/remote.txt b/runtime/doc/remote.txt index c23c06cd4e..9d5158eeb9 100644 --- a/runtime/doc/remote.txt +++ b/runtime/doc/remote.txt @@ -1,4 +1,4 @@ -*remote.txt* For Vim version 7.3c. Last change: 2008 May 24 +*remote.txt* For Vim version 7.3d. Last change: 2008 May 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt index 9d2a231e33..a9a064716b 100644 --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1,4 +1,4 @@ -*repeat.txt* For Vim version 7.3c. Last change: 2009 Nov 04 +*repeat.txt* For Vim version 7.3d. Last change: 2009 Nov 04 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/rileft.txt b/runtime/doc/rileft.txt index 015fd3916a..e260b5064b 100644 --- a/runtime/doc/rileft.txt +++ b/runtime/doc/rileft.txt @@ -1,4 +1,4 @@ -*rileft.txt* For Vim version 7.3c. Last change: 2006 Apr 24 +*rileft.txt* For Vim version 7.3d. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Avner Lottem diff --git a/runtime/doc/russian.txt b/runtime/doc/russian.txt index f0a70e4842..ad962c244f 100644 --- a/runtime/doc/russian.txt +++ b/runtime/doc/russian.txt @@ -1,4 +1,4 @@ -*russian.txt* For Vim version 7.3c. Last change: 2006 Apr 24 +*russian.txt* For Vim version 7.3d. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Vassily Ragosin diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt index 4405396528..aeead0e41c 100644 --- a/runtime/doc/scroll.txt +++ b/runtime/doc/scroll.txt @@ -1,4 +1,4 @@ -*scroll.txt* For Vim version 7.3c. Last change: 2006 Aug 27 +*scroll.txt* For Vim version 7.3d. Last change: 2006 Aug 27 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt index 6a42a15dbf..2bda92ab99 100644 --- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -1,4 +1,4 @@ -*sign.txt* For Vim version 7.3c. Last change: 2010 May 07 +*sign.txt* For Vim version 7.3d. Last change: 2010 May 07 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index b36345973f..437cdc5a7e 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1,4 +1,4 @@ -*spell.txt* For Vim version 7.3c. Last change: 2010 Apr 11 +*spell.txt* For Vim version 7.3d. Last change: 2010 Apr 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/sponsor.txt b/runtime/doc/sponsor.txt index 51f629ec43..085bcfd825 100644 --- a/runtime/doc/sponsor.txt +++ b/runtime/doc/sponsor.txt @@ -1,4 +1,4 @@ -*sponsor.txt* For Vim version 7.3c. Last change: 2008 Jun 21 +*sponsor.txt* For Vim version 7.3d. Last change: 2008 Jun 21 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 8250df8d99..f3385a3611 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.3c. Last change: 2009 Dec 31 +*starting.txt* For Vim version 7.3d. Last change: 2009 Dec 31 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 26d1d6cf90..514fc3a701 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.3c. Last change: 2010 Jul 25 +*syntax.txt* For Vim version 7.3d. Last change: 2010 Jul 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -431,7 +431,7 @@ shorter and valid HTML 4 file), use: > Concealed text is removed from the HTML and replaced with the appropriate character from |:syn-cchar| or 'listchars' depending on the current value of 'conceallevel'. If you always want to display all text in your document, -either set 'conceallevel' to before invoking 2html, or use: > +either set 'conceallevel' to zero before invoking 2html, or use: > :let g:html_ignore_conceal = 1 Similarly, closed folds are put in the HTML as they are displayed. If you @@ -2700,6 +2700,19 @@ such use of @ as an error. To solve this: > Putting "let g:tex_stylish=1" into your <.vimrc> will make always accept such use of @. + *tex-cchar* *tex-cole* *tex-conceal* +Taking Advantage of Conceal Mode~ + +If you have |'conceallevel'| set to 2 and if your encoding is utf-8, then a +number of character sequences can be translated into appropriate utf-8 glyphs, +including various accented characters, Greek characters in MathZones, and +superscripts and subscripts in MathZones. Not all characters can be made into +superscripts or subscripts; the constraint is due to what utf-8 supports. +In fact, only a few characters are supported as subscripts. + +One way to use this is to have vertically split windows (see |CTRL-W_v|); one +with |'conceallevel'| at 0 and the other at 2; and both using |'scrollbind'|. + TF *tf.vim* *ft-tf-syntax* diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt index 2380714718..7dbd7d3b74 100644 --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -1,4 +1,4 @@ -*tabpage.txt* For Vim version 7.3c. Last change: 2007 Mar 11 +*tabpage.txt* For Vim version 7.3d. Last change: 2010 Jul 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -58,17 +58,19 @@ clicking right of the labels. In the GUI tab pages line you can use the right mouse button to open menu. |tabline-menu|. -:tabe[dit] *:tabe* *:tabedit* *:tabnew* -:tabnew Open a new tab page with an empty window, after the current - tab page. +:[count]tabe[dit] *:tabe* *:tabedit* *:tabnew* +:[count]tabnew + Open a new tab page with an empty window, after the current + tab page. For [count] see |:tab| below. -:tabe[dit] [++opt] [+cmd] {file} -:tabnew [++opt] [+cmd] {file} +:[count]tabe[dit] [++opt] [+cmd] {file} +:[count]tabnew [++opt] [+cmd] {file} Open a new tab page and edit {file}, like with |:edit|. + For [count] see |:tab| below. -:tabf[ind] [++opt] [+cmd] {file} *:tabf* *:tabfind* +:[count]tabf[ind] [++opt] [+cmd] {file} *:tabf* *:tabfind* Open a new tab page and edit {file} in 'path', like with - |:find|. + |:find|. For [count] see |:tab| below. {not available when the |+file_in_path| feature was disabled at compile time} @@ -77,9 +79,11 @@ In the GUI tab pages line you can use the right mouse button to open menu. page instead. Doesn't work for |:diffsplit|, |:diffpatch|, |:execute| and |:normal|. When [count] is omitted the tab page appears after the current - one. When [count] is specified the new tab page comes after - tab page [count]. Use ":0tab cmd" to get the new tab page as - the first one. Examples: > + one. + When [count] is specified the new tab page comes after tab + page [count]. Use ":0tab cmd" to get the new tab page as the + first one. + Examples: > :tab split " opens current buffer in new tab page :tab help gt " opens tab page with help for "gt" diff --git a/runtime/doc/tags b/runtime/doc/tags index a02e4e6bc1..94ef999999 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -1836,10 +1836,10 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* :Sexplore pi_netrw.txt /*:Sexplore* :TOhtml syntax.txt /*:TOhtml* :Texplore pi_netrw.txt /*:Texplore* -:Untarvim pi_tar.txt /*:Untarvim* :UseVimball pi_vimball.txt /*:UseVimball* :Vexplore pi_netrw.txt /*:Vexplore* :VimballList pi_vimball.txt /*:VimballList* +:Vimuntar pi_tar.txt /*:Vimuntar* :X editing.txt /*:X* :XMLent insert.txt /*:XMLent* :XMLns insert.txt /*:XMLns* @@ -5780,6 +5780,7 @@ g:netrw_altv pi_netrw.txt /*g:netrw_altv* g:netrw_banner pi_netrw.txt /*g:netrw_banner* g:netrw_browse_split pi_netrw.txt /*g:netrw_browse_split* g:netrw_browsex_viewer pi_netrw.txt /*g:netrw_browsex_viewer* +g:netrw_bufsettings pi_netrw.txt /*g:netrw_bufsettings* g:netrw_chgperm pi_netrw.txt /*g:netrw_chgperm* g:netrw_chgwin pi_netrw.txt /*g:netrw_chgwin* g:netrw_compress pi_netrw.txt /*g:netrw_compress* @@ -7987,6 +7988,9 @@ terminal-info term.txt /*terminal-info* terminal-options term.txt /*terminal-options* terminfo term.txt /*terminfo* termresponse-variable eval.txt /*termresponse-variable* +tex-cchar syntax.txt /*tex-cchar* +tex-cole syntax.txt /*tex-cole* +tex-conceal syntax.txt /*tex-conceal* tex-error syntax.txt /*tex-error* tex-folding syntax.txt /*tex-folding* tex-math syntax.txt /*tex-math* diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index 1d6870550d..881d38e41c 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -1,4 +1,4 @@ -*tagsrch.txt* For Vim version 7.3c. Last change: 2009 Feb 18 +*tagsrch.txt* For Vim version 7.3d. Last change: 2009 Feb 18 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index 1984d6984d..cd12b54e40 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -1,4 +1,4 @@ -*term.txt* For Vim version 7.3c. Last change: 2009 Nov 05 +*term.txt* For Vim version 7.3d. Last change: 2009 Nov 05 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt index f3983551ed..6e3988b2ee 100644 --- a/runtime/doc/tips.txt +++ b/runtime/doc/tips.txt @@ -1,4 +1,4 @@ -*tips.txt* For Vim version 7.3c. Last change: 2009 Nov 07 +*tips.txt* For Vim version 7.3d. Last change: 2009 Nov 07 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index e6f5883f61..0d37f5c9dd 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.3c. Last change: 2010 Jul 25 +*todo.txt* For Vim version 7.3d. Last change: 2010 Aug 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,20 +30,16 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -Access to free memory with :redir command. (Dominique Pelle, 2010 Jul 25) - -Patch for :find completion. (Nazri Ramliy) -But I prefer to keep term.h and include/term.h Nazri will work on it. - -Move more common code from if_python.c and if_python3.c to if_py_both.h +Windows installer doesn't delete the uninstall key on 64 bit systems. Before release 7.3: - Rename vim73 branch to default (hints: Xavier de Gaye, 2010 May 23) +test72 causes a beep for using "u" when it doesn't work. + Cursor positioning wrong with 0x200e character. (John Becket, 2010 May 6) -Test 69 breaks on MS-Windows, both 32 and 64 builds. (George Reilly, 2010 Feb -26) +Should readfile() ignore BOM when not in binary mode? Bug: searching for tags file uses 'suffixesadd', should not happen. (Dominique Pelle, 2010 June 28) @@ -65,6 +61,9 @@ Results in E670. (Tony Mechelynck, 2010 May 2) ":helpgrep" does not put the cursor in the correct column when preceded by accented character. (Tony Mechelynck, 2010 Apr 15) +Patch: Let rare word highlighting overrule good word highlighting. +(Jakson A. Aquino, 2010 Jul 30) + Better Czech keymap. (Stepnem, 2010 May 4) Use if no response from Jiri Tobisek. @@ -104,8 +103,6 @@ Jumplist doesn't work properly in Insert mode? (Jean Johner, 2010 Mar 20) Problem with transparent cmdline. Also: Terminal title is wrong with non-ASCII character. (Lily White, 2010 Mar 7) -Patch for horizontal mouse wheel. (Bjorn Winckler, 2010 Jul 18) - iconv() doesn't fail on an illegal character, as documented. (Yongwei Wu, 2009 Nov 15, example Nov 26) Add argument to specify whether iconv() should fail or replace with a character and continue? @@ -655,6 +652,8 @@ with "gvim -nb:localhost:55555:foo". From nc do: '1:editFile!0 "foo"'. Then go to Insert mode and add a few lines. Then backspacing every other time moves the cursor instead of deleting. (Chris Kaiser, 2007 Sep 25) +Patch to use Modern UI 2.0 for the Nsis installer. (Guopeng Wen, 2010 Jul 30) + Changes for Win32 makefile. (Mike Williams, 2007 Jan 22, Alexei Alexandrov, 2007 Feb 8) diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt index 206e862a9b..d9954be913 100644 --- a/runtime/doc/uganda.txt +++ b/runtime/doc/uganda.txt @@ -1,4 +1,4 @@ -*uganda.txt* For Vim version 7.3c. Last change: 2009 Dec 27 +*uganda.txt* For Vim version 7.3d. Last change: 2009 Dec 27 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt index 0fe9aab48c..be8a9d14f4 100644 --- a/runtime/doc/undo.txt +++ b/runtime/doc/undo.txt @@ -1,4 +1,4 @@ -*undo.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*undo.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt index a3b793537f..a837793368 100644 --- a/runtime/doc/usr_01.txt +++ b/runtime/doc/usr_01.txt @@ -1,4 +1,4 @@ -*usr_01.txt* For Vim version 7.3c. Last change: 2008 May 07 +*usr_01.txt* For Vim version 7.3d. Last change: 2008 May 07 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt index 538ee04d6d..535c5ace39 100644 --- a/runtime/doc/usr_02.txt +++ b/runtime/doc/usr_02.txt @@ -1,4 +1,4 @@ -*usr_02.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*usr_02.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt index 119dbfe6f8..bb26b7cba6 100644 --- a/runtime/doc/usr_03.txt +++ b/runtime/doc/usr_03.txt @@ -1,4 +1,4 @@ -*usr_03.txt* For Vim version 7.3c. Last change: 2006 Jun 21 +*usr_03.txt* For Vim version 7.3d. Last change: 2006 Jun 21 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_04.txt b/runtime/doc/usr_04.txt index 3d4464bb00..33a374f580 100644 --- a/runtime/doc/usr_04.txt +++ b/runtime/doc/usr_04.txt @@ -1,4 +1,4 @@ -*usr_04.txt* For Vim version 7.3c. Last change: 2008 Sep 06 +*usr_04.txt* For Vim version 7.3d. Last change: 2008 Sep 06 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt index b4985ad9b5..45bb73c0cd 100644 --- a/runtime/doc/usr_05.txt +++ b/runtime/doc/usr_05.txt @@ -1,4 +1,4 @@ -*usr_05.txt* For Vim version 7.3c. Last change: 2009 Jun 04 +*usr_05.txt* For Vim version 7.3d. Last change: 2009 Jun 04 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_06.txt b/runtime/doc/usr_06.txt index 2c633f356b..d92c336683 100644 --- a/runtime/doc/usr_06.txt +++ b/runtime/doc/usr_06.txt @@ -1,4 +1,4 @@ -*usr_06.txt* For Vim version 7.3c. Last change: 2009 Oct 28 +*usr_06.txt* For Vim version 7.3d. Last change: 2009 Oct 28 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_07.txt b/runtime/doc/usr_07.txt index cfa93065cd..f9547ed1f8 100644 --- a/runtime/doc/usr_07.txt +++ b/runtime/doc/usr_07.txt @@ -1,4 +1,4 @@ -*usr_07.txt* For Vim version 7.3c. Last change: 2006 Apr 24 +*usr_07.txt* For Vim version 7.3d. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_08.txt b/runtime/doc/usr_08.txt index e37bf57c8a..8d09639a53 100644 --- a/runtime/doc/usr_08.txt +++ b/runtime/doc/usr_08.txt @@ -1,4 +1,4 @@ -*usr_08.txt* For Vim version 7.3c. Last change: 2006 Jul 18 +*usr_08.txt* For Vim version 7.3d. Last change: 2006 Jul 18 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt index 4793f78d79..0bd498411f 100644 --- a/runtime/doc/usr_09.txt +++ b/runtime/doc/usr_09.txt @@ -1,4 +1,4 @@ -*usr_09.txt* For Vim version 7.3c. Last change: 2006 Apr 24 +*usr_09.txt* For Vim version 7.3d. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt index fc5b30315c..e6b6841d33 100644 --- a/runtime/doc/usr_10.txt +++ b/runtime/doc/usr_10.txt @@ -1,4 +1,4 @@ -*usr_10.txt* For Vim version 7.3c. Last change: 2006 Nov 05 +*usr_10.txt* For Vim version 7.3d. Last change: 2006 Nov 05 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt index f99d84ca3f..ee51780d1d 100644 --- a/runtime/doc/usr_11.txt +++ b/runtime/doc/usr_11.txt @@ -1,4 +1,4 @@ -*usr_11.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*usr_11.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_12.txt b/runtime/doc/usr_12.txt index ede54fe423..bf9e7d8c3d 100644 --- a/runtime/doc/usr_12.txt +++ b/runtime/doc/usr_12.txt @@ -1,4 +1,4 @@ -*usr_12.txt* For Vim version 7.3c. Last change: 2007 May 11 +*usr_12.txt* For Vim version 7.3d. Last change: 2007 May 11 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_20.txt b/runtime/doc/usr_20.txt index f58a17b5ce..7a2e50d021 100644 --- a/runtime/doc/usr_20.txt +++ b/runtime/doc/usr_20.txt @@ -1,4 +1,4 @@ -*usr_20.txt* For Vim version 7.3c. Last change: 2006 Apr 24 +*usr_20.txt* For Vim version 7.3d. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_21.txt b/runtime/doc/usr_21.txt index f23c42afe9..bb844d7815 100644 --- a/runtime/doc/usr_21.txt +++ b/runtime/doc/usr_21.txt @@ -1,4 +1,4 @@ -*usr_21.txt* For Vim version 7.3c. Last change: 2008 Nov 09 +*usr_21.txt* For Vim version 7.3d. Last change: 2008 Nov 09 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt index c71092ee4c..4cc0e9ad61 100644 --- a/runtime/doc/usr_22.txt +++ b/runtime/doc/usr_22.txt @@ -1,4 +1,4 @@ -*usr_22.txt* For Vim version 7.3c. Last change: 2010 Feb 21 +*usr_22.txt* For Vim version 7.3d. Last change: 2010 Feb 21 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_23.txt b/runtime/doc/usr_23.txt index d37f94fdf1..855e9e6403 100644 --- a/runtime/doc/usr_23.txt +++ b/runtime/doc/usr_23.txt @@ -1,4 +1,4 @@ -*usr_23.txt* For Vim version 7.3c. Last change: 2006 Apr 24 +*usr_23.txt* For Vim version 7.3d. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_24.txt b/runtime/doc/usr_24.txt index bd3884d8d2..b3585a2a4b 100644 --- a/runtime/doc/usr_24.txt +++ b/runtime/doc/usr_24.txt @@ -1,4 +1,4 @@ -*usr_24.txt* For Vim version 7.3c. Last change: 2006 Jul 23 +*usr_24.txt* For Vim version 7.3d. Last change: 2006 Jul 23 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt index 050c24b31d..32b4160068 100644 --- a/runtime/doc/usr_25.txt +++ b/runtime/doc/usr_25.txt @@ -1,4 +1,4 @@ -*usr_25.txt* For Vim version 7.3c. Last change: 2007 May 11 +*usr_25.txt* For Vim version 7.3d. Last change: 2007 May 11 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_26.txt b/runtime/doc/usr_26.txt index e5ab08d981..4e1018d50d 100644 --- a/runtime/doc/usr_26.txt +++ b/runtime/doc/usr_26.txt @@ -1,4 +1,4 @@ -*usr_26.txt* For Vim version 7.3c. Last change: 2006 Apr 24 +*usr_26.txt* For Vim version 7.3d. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_27.txt b/runtime/doc/usr_27.txt index b83511534e..32edaa84c5 100644 --- a/runtime/doc/usr_27.txt +++ b/runtime/doc/usr_27.txt @@ -1,4 +1,4 @@ -*usr_27.txt* For Vim version 7.3c. Last change: 2010 Mar 28 +*usr_27.txt* For Vim version 7.3d. Last change: 2010 Mar 28 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt index 514be336db..04a8a8ede0 100644 --- a/runtime/doc/usr_28.txt +++ b/runtime/doc/usr_28.txt @@ -1,4 +1,4 @@ -*usr_28.txt* For Vim version 7.3c. Last change: 2008 Jun 14 +*usr_28.txt* For Vim version 7.3d. Last change: 2008 Jun 14 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt index 53d85f8fe7..4e4db20677 100644 --- a/runtime/doc/usr_29.txt +++ b/runtime/doc/usr_29.txt @@ -1,4 +1,4 @@ -*usr_29.txt* For Vim version 7.3c. Last change: 2008 Jun 28 +*usr_29.txt* For Vim version 7.3d. Last change: 2008 Jun 28 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_30.txt b/runtime/doc/usr_30.txt index 36e7b101b4..a1ea0607fd 100644 --- a/runtime/doc/usr_30.txt +++ b/runtime/doc/usr_30.txt @@ -1,4 +1,4 @@ -*usr_30.txt* For Vim version 7.3c. Last change: 2007 Nov 10 +*usr_30.txt* For Vim version 7.3d. Last change: 2007 Nov 10 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_31.txt b/runtime/doc/usr_31.txt index 9fc5950b0c..55d80dff6f 100644 --- a/runtime/doc/usr_31.txt +++ b/runtime/doc/usr_31.txt @@ -1,4 +1,4 @@ -*usr_31.txt* For Vim version 7.3c. Last change: 2007 May 08 +*usr_31.txt* For Vim version 7.3d. Last change: 2007 May 08 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_32.txt b/runtime/doc/usr_32.txt index 94d336b15c..f1f1850237 100644 --- a/runtime/doc/usr_32.txt +++ b/runtime/doc/usr_32.txt @@ -1,4 +1,4 @@ -*usr_32.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*usr_32.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt index 4a41fa1d6b..63f2e82ff0 100644 --- a/runtime/doc/usr_40.txt +++ b/runtime/doc/usr_40.txt @@ -1,4 +1,4 @@ -*usr_40.txt* For Vim version 7.3c. Last change: 2006 Jun 21 +*usr_40.txt* For Vim version 7.3d. Last change: 2006 Jun 21 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index 23820e68ce..60fb3db25d 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -1,4 +1,4 @@ -*usr_41.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*usr_41.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_42.txt b/runtime/doc/usr_42.txt index 3c5fd35d1a..fff387dc78 100644 --- a/runtime/doc/usr_42.txt +++ b/runtime/doc/usr_42.txt @@ -1,4 +1,4 @@ -*usr_42.txt* For Vim version 7.3c. Last change: 2008 May 05 +*usr_42.txt* For Vim version 7.3d. Last change: 2008 May 05 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_43.txt b/runtime/doc/usr_43.txt index 05f1493cac..ef5312ed40 100644 --- a/runtime/doc/usr_43.txt +++ b/runtime/doc/usr_43.txt @@ -1,4 +1,4 @@ -*usr_43.txt* For Vim version 7.3c. Last change: 2008 Dec 28 +*usr_43.txt* For Vim version 7.3d. Last change: 2008 Dec 28 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_44.txt b/runtime/doc/usr_44.txt index 2cf3607327..6f9893b8bb 100644 --- a/runtime/doc/usr_44.txt +++ b/runtime/doc/usr_44.txt @@ -1,4 +1,4 @@ -*usr_44.txt* For Vim version 7.3c. Last change: 2008 Dec 28 +*usr_44.txt* For Vim version 7.3d. Last change: 2008 Dec 28 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt index c71ac0eb8d..d7fe0d319d 100644 --- a/runtime/doc/usr_45.txt +++ b/runtime/doc/usr_45.txt @@ -1,4 +1,4 @@ -*usr_45.txt* For Vim version 7.3c. Last change: 2008 Nov 15 +*usr_45.txt* For Vim version 7.3d. Last change: 2008 Nov 15 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt index 95b2da138d..dff37f37ec 100644 --- a/runtime/doc/usr_90.txt +++ b/runtime/doc/usr_90.txt @@ -1,4 +1,4 @@ -*usr_90.txt* For Vim version 7.3c. Last change: 2008 Sep 10 +*usr_90.txt* For Vim version 7.3d. Last change: 2008 Sep 10 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt index 568f349d84..1e80cacd1e 100644 --- a/runtime/doc/usr_toc.txt +++ b/runtime/doc/usr_toc.txt @@ -1,4 +1,4 @@ -*usr_toc.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*usr_toc.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 1c0f7287e8..1cf5fa97f2 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 7.3c. Last change: 2010 Jul 24 +*various.txt* For Vim version 7.3d. Last change: 2010 Aug 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -106,7 +106,8 @@ g8 Print the hex values of the bytes used in the *:l* *:list* :[range]l[ist] [count] [flags] Same as :print, but display unprintable characters - with '^' and put $ after the line. + with '^' and put $ after the line. This can be + changed with the 'listchars' option. See |ex-flags| for [flags]. *:nu* *:number* diff --git a/runtime/doc/version4.txt b/runtime/doc/version4.txt index 7bc3c97766..e6acee00d9 100644 --- a/runtime/doc/version4.txt +++ b/runtime/doc/version4.txt @@ -1,4 +1,4 @@ -*version4.txt* For Vim version 7.3c. Last change: 2006 Apr 24 +*version4.txt* For Vim version 7.3d. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version5.txt b/runtime/doc/version5.txt index 7c8d4a52f7..c2f50e711e 100644 --- a/runtime/doc/version5.txt +++ b/runtime/doc/version5.txt @@ -1,4 +1,4 @@ -*version5.txt* For Vim version 7.3c. Last change: 2008 Dec 17 +*version5.txt* For Vim version 7.3d. Last change: 2008 Dec 17 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version6.txt b/runtime/doc/version6.txt index 95fdc36f9b..110f27e689 100644 --- a/runtime/doc/version6.txt +++ b/runtime/doc/version6.txt @@ -1,4 +1,4 @@ -*version6.txt* For Vim version 7.3c. Last change: 2008 Aug 06 +*version6.txt* For Vim version 7.3d. Last change: 2008 Aug 06 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index 522434c986..357ebe517d 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.3c. Last change: 2010 Jul 25 +*version7.txt* For Vim version 7.3d. Last change: 2010 Aug 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -7225,13 +7225,13 @@ The gvim executable is 32 bits, the installed gvimext.dll is either a 32 or 64 bit version. (mostly by George Reilly) Made the DOS installer work with more compilers. The MS-Windows big gvim is now built with Python 2.7 and 3.1.2, Perl 5.12 and -Ruby 1.9.1. +Ruby 1.9.1. You need the matching .dll files to use them. The extra and language files are no longer distributed separately. The source files for all systems are included in one distribution. After using ":recover" or recovering a file in another way, ":x" and "ZZ" -don't save what you see. This could result in work being lost. Now the text +didn't save what you see. This could result in work being lost. Now the text after recovery is compared to the original file contents. When they differ the buffer is marked as modified. @@ -7254,6 +7254,8 @@ Updated spell files for Ubuntu locale names. Switched from autoconf 2.63 to 2.65. +Removed Mupad indent and ftplugin files, they are not useful. + Added *added-7.3* ----- @@ -7277,6 +7279,8 @@ Support GDK_SUPER_MASK for GTK on Mac. (Stephan Schulz) Made CTRL and ALT modifier work for mouse wheel. (Benjamin Haskell) +Added support for horizontal scroll wheel. (Bjorn Winckler) + When the buffer is in diff mode, have :TOhtml create HTML to show the diff side-by-side. (Christian Brabandt) @@ -7301,7 +7305,15 @@ Wozniski) Support completion for ":find". (Nazri Ramliy) -Avoid use of the GTK mail_loop() so that the GtkFileChooser can be used. +Command line completion for :ownsyntax and :setfiletype. (Dominique Pelle) + +Command line completion for :lmap and :lunmap. + +Support syntax and filetype completion for user commands. (Christian Brabandt) + +Add completion for ":ownsyntax" and improve completion for ":filetype". + +Avoid use of the GTK main_loop() so that the GtkFileChooser can be used. (James Vega) When 'formatexpr' evaluates to non-zero fall back to internal formatting, also @@ -7314,21 +7326,16 @@ Support wide file names in gvimext. (Szabolcs Horvat) Improve test for joining lines. (Milan Vancura) Make joining a range of lines much faster. (Milan Vancura) -Command line completion for :ownsyntax and :setfiletype. (Dominique Pelle) - -Command line completion for :lmap and :lunmap. - Add patch to improve support of z/OS (OS/390). (Ralf Schandl) Added the helphelp.txt file. Moved text from various.txt to it. Added "q" item for 'statusline'. Added |w:quickfix_title|. (Lech Lorens) -Added support for horizontal scroll wheel. (Bjorn Winckler) +Various improvements for VMS. (Zoltan Arpadffy) - -New syntax files: +New syntax files: ~ Haskell Cabal build file (Vincent Berthoux) ChaiScript (Jason Turner) Cucumber (Tim Pope) @@ -7342,13 +7349,13 @@ SVG - Scalable Vector Graphics (Vincent Berthoux) task data (John Florian) task 42 edit (John Florian) -New filetype plugins: +New filetype plugins: ~ Cucumber (Tim Pope) Liquid (Tim Pope) Markdown (Tim Pope) Tcl (Robert L Hicks) -New indent plugins: +New indent plugins: ~ ChaiScript (Jason Turner) Cucumber (Tim Pope) CUDA (Bram Moolenaar) @@ -7357,7 +7364,7 @@ Liquid (Tim Pope) Mail (Bram Moolenaar) Perl 6 (Andy Lester) -Other new runtime files: +Other new runtime files: ~ Breton spell file (Dominique Pelle) Tutor Bairish (Sepp Hell) Tutor in Esperanto. (Dominique Pellé) @@ -10066,6 +10073,27 @@ Remove -arch flag from build flags for Perl. (Bjorn Wickler) Fix 'autochdir' not showing up in :options window. (Dominique Pelle) +Fix: test 69 didn't work on MS-Windows. Test 72 beeped too often. + +Avoid illegal memory access in spell suggestion. (Dominique Pelle) +Fix: crash in spell checking with a 0x300 character. + +Avoid that running tests changes viminfo. + +Fix: changing case of a character removed combining characters. +Fixed: CTRL-R in Insert mode doesn't insert composing characters. + +Added the WOW64 flag to OLE registration, for 64 bit Windows systems. + +Various fixes for coverity warnings. + +Fix compile warnings, esp. for 64-bit systems. (Mike Williams) + +Fix: :redir to a dictionary that is changed before ":redir END" causes a +memory access error. + +Fix: terminal title not properly restored when there are multi-byte +characters. (partly by James Vega) vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index 2fe57f8359..4b6e2e3ed0 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -1,4 +1,4 @@ -*vi_diff.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*vi_diff.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/vim-it.1 b/runtime/doc/vim-it.1 index 835fe66147..0ab3eff0d2 100755 --- a/runtime/doc/vim-it.1 +++ b/runtime/doc/vim-it.1 @@ -38,7 +38,7 @@ Particolarmente utile per editare programmi. Ci sono parecchi miglioramenti rispetto a Vi: undo multipli, finestre e buffer multipli, evidenziazione sintattica, possibilità di modificare la linea di comando, completamento nomi file, help -in linea, selezione testi in modalità visuale, etc.. +in linea, selezione testi in Modo Visual, etc.. Vedere ":help vi_diff.txt" per un sommario delle differenze fra .B Vim e Vi. @@ -52,7 +52,7 @@ Quasi sempre .B Vim viene invocato, per modificare un file, col comando .PP - vim file + vim nome_file .PP Più in generale .B Vim @@ -64,7 +64,7 @@ Se lista_file non Altrimenti, una e una sola delle quattro maniere indicate qui sotto può essere usata per scegliere uno o più file da modificare. .TP 12 -file .. +nome_file .. Una lista di nomi di file. Il primo di questi sarà il file corrente, e verrà letto nel buffer. Il cursore sarà posizionato sulla prima linea del buffer. @@ -74,22 +74,22 @@ lista_file. .TP \- Il file da editare è letto dallo "stdin" [di solito, ma non -necessriamente, il terminale \- NdT]. I comandi sono letti da "stderr", +necessariamente, il terminale \- NdT]. I comandi sono letti da "stderr", che dovrebbe essere un terminale [tty]. .TP \-t {tag} Il file da editare e la posizione iniziale del cursore dipendono da "tag", una specie di "etichetta" a cui saltare. -{tag} viene cercata nel file tags, ed il file ad essa associato diventa +{tag} viene cercata nel file "tags", ed il file ad essa associato diventa quello corrente, ed il comando ad essa associato viene eseguito. Di solito si usa per programmi C, nel qual caso {tag} potrebbe essere un nome di funzione. L'effetto è che il file contenente quella funzione diventa il file corrente e il cursore è posizionato all'inizio della funzione. -Vedere ":help tag-commands". +Vedere ":help tag\-commands". .TP \-q [file_errori] -Inizia nella modalità quickFix [correzione veloce]. +Inizia in Modo QuickFix [correzione veloce]. Il file [file_errori] è letto e il primo errore è visualizzato. Se [file_errori] non è indicato, il suo nome è ottenuto dal valore dell'opzione 'errorfile' (che, se non specificata, vale "AztecC.Err" @@ -102,35 +102,35 @@ si comporta in modo diverso se invocato con nomi differenti (il programma eseguibile "sottostante" può essere sempre lo stesso). .TP 10 vim -Modalità "Normal", comportamento normale. +Modo Normal, comportamento normale. .TP ex -Inizia in modalità "Ex". -Si può passare in modalità "Normal" col comandi ":vi". -Si può invocare la modalità "Ex" anche con l'argomento "\-e". +Inizia in Modo "Ex". +Si può passare in Modo Normal col comando ":vi". +Si può invocare il Modo "Ex" anche con l'argomento "\-e". .TP view -Inizia in modalità "Sola Lettura". Non potete modificare i file. -Si può invocare la modalità "Sola Lettura" anche con l'argomento "\-R". +Inizia in Modo Read-only (Sola Lettura). Non potete modificare i file. +Si può invocare il Modo Read-only anche con l'argomento "\-R". .TP gvim gview La versione GUI [Graphical User Interface]. Apre una nuova finestra. -Si può invocare la modalità "GUI" anche con l'argomento "\-g". +Si può invocare il Modo GUI anche con l'argomento "\-g". .TP evim eview -La versione GUI in modalità "Facile" (semplificata). +La versione GUI in Modo Easy (semplificata). Apre una nuova finestra. -Si può invocare la modalità "Facile" anche con l'argomento "\-y". +Si può invocare il Modo Easy anche con l'argomento "\-y". .TP rvim rview rgvim rgview -Come sopra, ma con restrizioni ai comandi. Non si potrnno eseguire comandi -dello shell o sospendere +Come sopra, ma con restrizioni ai comandi. Non si potranno eseguire comandi +della shell o sospendere .B Vim. -Si può invocare la modalità "Ristretta" anche con l'argomento "\-Z". +Si può chiedere la stessa cosa anche con l'argomento "\-Z". .SH OPZIONI Le opzioni possono essere in un ordine qualsiasi, prima o dopo i nomi di -file. Opzioni che non necessitano un argomento possono essere raggruppate +file. Opzioni che non necessitano un argomento possono essere specificate dietro a un solo "\-". .TP 12 +[numero] @@ -140,7 +140,7 @@ Se "numero" manca, il cursore sar +/{espressione} Per il primo file il cursore sarà posizionato alla prima occorrenza di {espressione}. -Vedere ":help search-pattern" per come specificare l'espressione. +Vedere ":help search\-pattern" per come specificare l'espressione. .TP +{comando} .TP @@ -149,7 +149,7 @@ Vedere ":help search-pattern" per come specificare l'espressione. primo file è stato letto. {comando} è interpretato come un comando Ex. Se il {comando} contiene spazi deve essere incluso fra doppi apici -(o altro delimitatore, a seconda dello shell che si sta usando). +(o altro delimitatore, a seconda della shell che si sta usando). Esempio: Vim "+set si" main.c .br Note: Si possono avere fino a 10 comandi "+" o "\-c". @@ -170,16 +170,16 @@ Si possono usare fino a 10 di questi comandi, indipendentemente dai comandi \-A Se .B Vim -è stato compilato con supporto ARABIC per editare file con orientamento +è stato compilato con supporto Arabic per editare file con orientamento destra-sinistra e tastiera con mappatura Araba, questa opzione inizia .B Vim -in modalità "Arabic", cioè impostando 'arabic'. +in Modo Arabic, cioè impostando 'arabic'. Altrimenti viene dato un messaggio di errore e .B Vim termina in modo anormale. .TP \-b -Modalità "Binaria". +Modo Binary (binario). Vengono impostate alcune opzioni che permettono di modificare un file binario o un programma eseguibile. .TP @@ -188,11 +188,11 @@ Compatibile. Imposta l'opzione 'compatible'. In questo modo .B Vim ha quasi lo stesso comportamento di Vi, anche in presenza di un file -di configurazione .vimrc [proprio di Vim \- NdT]. +di configurazione .vimrc [proprio di Vim, vi usa .exrc \- Ndt]. .TP \-d -Inizia in modalità "Diff" [differenze]. -Dovrebbero esserci come argomenti due o tre nomi di file. +Inizia in Modo Diff [differenze]. +Dovrebbero esserci come argomenti due o tre o quattro nomi di file. .B Vim aprirà tutti i file evidenziando le differenze fra gli stessi. Funziona come vimdiff(1). @@ -204,23 +204,23 @@ Esempio: "\-d con:20/30/600/150". .TP \-D -Debugging. Vim si mette in modalità "debugging" a partire +Debugging. Vim si mette in Modo "debugging" a partire dall'esecuzione del primo comando da uno script. .TP \-e Eseguire .B Vim -in modalità "Ex", come se il programma eseguito sia "ex". +in Modo Ex, come se il programma eseguito sia "ex". .TP \-E Eseguire .B Vim -in modalità "Ex" migliorata, come se il programma eseguito sia "exim". +in Modo Ex migliorato, come se il programma eseguito sia "exim". .TP \-f Direttamente [Foreground]. Per la versione GUI, .B Vim -non crea [fork] una nuova finestra, indipendente dallo shell di invocazione. +non crea [fork] una nuova finestra, indipendente dalla shell di invocazione. Per l'Amiga, .B Vim non è fatto ripartire per aprire una nuova finestra. @@ -233,7 +233,7 @@ Sull'Amiga i comandi ":sh" e ":!" non sono disponibili. \-\-nofork Direttamente [Foreground]. Per la versione GUI, .B Vim -non crea [fork] una nuova finestra, indipendente dallo shell di invocazione. +non crea [fork] una nuova finestra, indipendente dalla shell di invocazione. .TP \-F Se @@ -241,7 +241,7 @@ Se è stato compilato con supporto FKMAP per editare file con orientamento destra-sinistra e tastiera con mappatura Farsi, questa opzione inizia .B Vim -in modalità "Farsi", cioè impostando 'fkmap' e 'rightleft'. +in Modo Farsi, cioè impostando 'fkmap' e 'rightleft'. Altrimenti viene dato un messaggio di errore e .B Vim termina in modo anormale. @@ -266,7 +266,7 @@ Se è stato compilato col supporto RIGHTLEFT per editare file con orientamento destra-sinistra e tastiera con mappatura Ebraica, questa opzione inizia .B Vim -in modalità "Ebraica", cioè impostando 'hkmap' e 'rightleft'. +in Modo Ebraico, cioè impostando 'hkmap' e 'rightleft'. Altrimenti viene dato un messaggio di errore e .B Vim termina in modo anormale. @@ -280,13 +280,13 @@ Si pu Equivalente a \-r. .TP \-l -Modalità Lisp. -Imposta le opzini 'lisp' e 'showmatch'. +Modo Lisp. +Imposta le opzioni 'lisp' e 'showmatch'. .TP \-m Inibisce modifica file. Annulla l'opzione 'write'. -E' ancora possibile modificare un buffer [in memoria \- Ndt], ma non scriverlo. +È ancora possibile modificare un buffer [in memoria \- Ndt], ma non scriverlo. .TP \-M Modifiche non permesse. Le opzioni 'modifiable' e 'write' sono annullate, @@ -294,7 +294,7 @@ in modo da impedire sia modifiche che riscritture. Da notare che queste opzioni possono essere abilitate in seguito, permettendo così modifiche. .TP \-N -Modalità "Non-compatibile". Annulla l'opzione 'compatible'. +Modo "Non-compatibile". Annulla l'opzione 'compatible'. Così .B Vim va un po' meglio, ma è meno compatibile con Vi, anche in assenza di un @@ -319,12 +319,12 @@ Apri N finestre, in verticale. Se N manca, apri una finestra per ciascun file. .TP \-R -Modalità "Sola Lettura". +Modo Read-only (Sola Lettura). Imposta l'opzione 'readonly'. Si può ancora modificare il buffer, ma siete protetti da una riscrittura involontaria. Se volete davvero riscrivere il file, aggiungete un punto esclamativo -al comando "Ex", come in ":w!". +al comando Ex, come in ":w!". L'opzione \-R implica anche l'opzione \-n (vedere sotto). L'opzione 'readonly' può essere annullata con ":set noro". Vedere ":help 'readonly'". @@ -333,14 +333,14 @@ Vedere ":help 'readonly'". Lista file di swap, assieme a dati utili per un recupero. .TP \-r {file} -Modalità "Recovery". +Modo Recovery (ripristino). Il file di swap è usato per recuperare una sessione di edit finita male. Il file di swap è un file con lo stesso nome file del file di testo editato, col suffisso ".swp". Vedere ":help recovery". .TP \-s -Modalità silenziosa. Solo quando invocato come "Ex" o quando l'opzione +Modo silenzioso. Solo quando invocato come "Ex" o quando l'opzione "\-e" è stata data prima dell'opzione "\-s". .TP \-s {scriptin} @@ -383,7 +383,7 @@ Il valore predefinito \-v Inizia .B Vim -in modalità "Vi", come se il programma eseguibile fosse "vi". Questo ha +in Modo Vi, come se il programma eseguibile fosse "vi". Questo ha effetto solo quando Vim viene invocato con il nome "ex". .TP \-w {scriptout} @@ -408,14 +408,14 @@ ma il titolo della finestra e la clipboard non sono disponibili. \-y Eseguire .B Vim -in modalità "Facile" (semplificata), come se l'eseguibile invocato +in Modo Easy (semplificata), come se l'eseguibile invocato sia "evim" o "eview". Fa sì che .B Vim si comporti come un editor che usa solo il mouse e i caratteri. .TP \-Z -Modalità "Ristretta". Vim si comporta come se invocato con un nome +Modo ristretto. Vim si comporta come se invocato con un nome che inizia per "r". .TP \-\- @@ -430,8 +430,8 @@ Solo con GUI GTK: Visualizza Window ID su "stdout". Vim dà un messaggio ed esce, come con l'argomento "\-h". .TP \-\-literal -Considera i nomi passati come argomenti letterai, senza espandere -metacaratteri. Non necessario in Unix, lo shell espande i metacaratteri. +Considera i nomi passati come argomenti letterali, senza espandere +metacaratteri. Non necessario in Unix, la shell espande i metacaratteri. .TP \-\-noplugin Non caricare plugin. Implicito se si specifica \-u NONE. @@ -442,7 +442,7 @@ argomenti. Se non si trova un server viene dato un messaggio e i file sono editati nel Vim corrente. .TP \-\-remote\-expr {expr} -Connettersi a un server Vim, valutare ivi {expr} e stampare il risultatoi +Connettersi a un server Vim, valutare ivi {expr} e stampare il risultato su "stdout". .TP \-\-remote\-send {chiavi} @@ -521,7 +521,7 @@ Script Vim usato dal comando ":options", un modo semplice per visualizzare e impostare opzioni. .TP /usr/local/lib/vim/menu.vim -Inzializzazioni del menu gvim a livello di sistema. +Inizializzazioni del menù gvim a livello di sistema. .TP /usr/local/lib/vim/bugreport.vim Script Vim per generare una segnalazione di errore. Vedere ":help bugs". diff --git a/runtime/doc/vim-it.UTF-8.1 b/runtime/doc/vim-it.UTF-8.1 index 0d9a0692e8..51e7e043da 100644 --- a/runtime/doc/vim-it.UTF-8.1 +++ b/runtime/doc/vim-it.UTF-8.1 @@ -38,7 +38,7 @@ Particolarmente utile per editare programmi. Ci sono parecchi miglioramenti rispetto a Vi: undo multipli, finestre e buffer multipli, evidenziazione sintattica, possibilità di modificare la linea di comando, completamento nomi file, help -in linea, selezione testi in modalità visuale, etc.. +in linea, selezione testi in Modo Visual, etc.. Vedere ":help vi_diff.txt" per un sommario delle differenze fra .B Vim e Vi. @@ -52,7 +52,7 @@ Quasi sempre .B Vim viene invocato, per modificare un file, col comando .PP - vim file + vim nome_file .PP Più in generale .B Vim @@ -64,7 +64,7 @@ Se lista_file non è presente, l'editor inizia aprendo un buffer vuoto. Altrimenti, una e una sola delle quattro maniere indicate qui sotto può essere usata per scegliere uno o più file da modificare. .TP 12 -file .. +nome_file .. Una lista di nomi di file. Il primo di questi sarà il file corrente, e verrà letto nel buffer. Il cursore sarà posizionato sulla prima linea del buffer. @@ -74,22 +74,22 @@ lista_file. .TP \- Il file da editare è letto dallo "stdin" [di solito, ma non -necessriamente, il terminale \- NdT]. I comandi sono letti da "stderr", +necessariamente, il terminale \- NdT]. I comandi sono letti da "stderr", che dovrebbe essere un terminale [tty]. .TP \-t {tag} Il file da editare e la posizione iniziale del cursore dipendono da "tag", una specie di "etichetta" a cui saltare. -{tag} viene cercata nel file tags, ed il file ad essa associato diventa +{tag} viene cercata nel file "tags", ed il file ad essa associato diventa quello corrente, ed il comando ad essa associato viene eseguito. Di solito si usa per programmi C, nel qual caso {tag} potrebbe essere un nome di funzione. L'effetto è che il file contenente quella funzione diventa il file corrente e il cursore è posizionato all'inizio della funzione. -Vedere ":help tag-commands". +Vedere ":help tag\-commands". .TP \-q [file_errori] -Inizia nella modalità quickFix [correzione veloce]. +Inizia in Modo QuickFix [correzione veloce]. Il file [file_errori] è letto e il primo errore è visualizzato. Se [file_errori] non è indicato, il suo nome è ottenuto dal valore dell'opzione 'errorfile' (che, se non specificata, vale "AztecC.Err" @@ -102,35 +102,35 @@ si comporta in modo diverso se invocato con nomi differenti (il programma eseguibile "sottostante" può essere sempre lo stesso). .TP 10 vim -Modalità "Normal", comportamento normale. +Modo Normal, comportamento normale. .TP ex -Inizia in modalità "Ex". -Si può passare in modalità "Normal" col comandi ":vi". -Si può invocare la modalità "Ex" anche con l'argomento "\-e". +Inizia in Modo "Ex". +Si può passare in Modo Normal col comando ":vi". +Si può invocare il Modo "Ex" anche con l'argomento "\-e". .TP view -Inizia in modalità "Sola Lettura". Non potete modificare i file. -Si può invocare la modalità "Sola Lettura" anche con l'argomento "\-R". +Inizia in Modo Read-only (Sola Lettura). Non potete modificare i file. +Si può invocare il Modo Read-only anche con l'argomento "\-R". .TP gvim gview La versione GUI [Graphical User Interface]. Apre una nuova finestra. -Si può invocare la modalità "GUI" anche con l'argomento "\-g". +Si può invocare il Modo GUI anche con l'argomento "\-g". .TP evim eview -La versione GUI in modalità "Facile" (semplificata). +La versione GUI in Modo Easy (semplificata). Apre una nuova finestra. -Si può invocare la modalità "Facile" anche con l'argomento "\-y". +Si può invocare il Modo Easy anche con l'argomento "\-y". .TP rvim rview rgvim rgview -Come sopra, ma con restrizioni ai comandi. Non si potrnno eseguire comandi -dello shell o sospendere +Come sopra, ma con restrizioni ai comandi. Non si potranno eseguire comandi +della shell o sospendere .B Vim. -Si può invocare la modalità "Ristretta" anche con l'argomento "\-Z". +Si può chiedere la stessa cosa anche con l'argomento "\-Z". .SH OPZIONI Le opzioni possono essere in un ordine qualsiasi, prima o dopo i nomi di -file. Opzioni che non necessitano un argomento possono essere raggruppate +file. Opzioni che non necessitano un argomento possono essere specificate dietro a un solo "\-". .TP 12 +[numero] @@ -140,7 +140,7 @@ Se "numero" manca, il cursore sarà posizionato sull'ultima linea del file. +/{espressione} Per il primo file il cursore sarà posizionato alla prima occorrenza di {espressione}. -Vedere ":help search-pattern" per come specificare l'espressione. +Vedere ":help search\-pattern" per come specificare l'espressione. .TP +{comando} .TP @@ -149,7 +149,7 @@ Vedere ":help search-pattern" per come specificare l'espressione. primo file è stato letto. {comando} è interpretato come un comando Ex. Se il {comando} contiene spazi deve essere incluso fra doppi apici -(o altro delimitatore, a seconda dello shell che si sta usando). +(o altro delimitatore, a seconda della shell che si sta usando). Esempio: Vim "+set si" main.c .br Note: Si possono avere fino a 10 comandi "+" o "\-c". @@ -170,16 +170,16 @@ Si possono usare fino a 10 di questi comandi, indipendentemente dai comandi \-A Se .B Vim -è stato compilato con supporto ARABIC per editare file con orientamento +è stato compilato con supporto Arabic per editare file con orientamento destra-sinistra e tastiera con mappatura Araba, questa opzione inizia .B Vim -in modalità "Arabic", cioè impostando 'arabic'. +in Modo Arabic, cioè impostando 'arabic'. Altrimenti viene dato un messaggio di errore e .B Vim termina in modo anormale. .TP \-b -Modalità "Binaria". +Modo Binary (binario). Vengono impostate alcune opzioni che permettono di modificare un file binario o un programma eseguibile. .TP @@ -188,11 +188,11 @@ Compatibile. Imposta l'opzione 'compatible'. In questo modo .B Vim ha quasi lo stesso comportamento di Vi, anche in presenza di un file -di configurazione .vimrc [proprio di Vim \- NdT]. +di configurazione .vimrc [proprio di Vim, vi usa .exrc \- Ndt]. .TP \-d -Inizia in modalità "Diff" [differenze]. -Dovrebbero esserci come argomenti due o tre nomi di file. +Inizia in Modo Diff [differenze]. +Dovrebbero esserci come argomenti due o tre o quattro nomi di file. .B Vim aprirà tutti i file evidenziando le differenze fra gli stessi. Funziona come vimdiff(1). @@ -204,23 +204,23 @@ Esempio: "\-d con:20/30/600/150". .TP \-D -Debugging. Vim si mette in modalità "debugging" a partire +Debugging. Vim si mette in Modo "debugging" a partire dall'esecuzione del primo comando da uno script. .TP \-e Eseguire .B Vim -in modalità "Ex", come se il programma eseguito sia "ex". +in Modo Ex, come se il programma eseguito sia "ex". .TP \-E Eseguire .B Vim -in modalità "Ex" migliorata, come se il programma eseguito sia "exim". +in Modo Ex migliorato, come se il programma eseguito sia "exim". .TP \-f Direttamente [Foreground]. Per la versione GUI, .B Vim -non crea [fork] una nuova finestra, indipendente dallo shell di invocazione. +non crea [fork] una nuova finestra, indipendente dalla shell di invocazione. Per l'Amiga, .B Vim non è fatto ripartire per aprire una nuova finestra. @@ -233,7 +233,7 @@ Sull'Amiga i comandi ":sh" e ":!" non sono disponibili. \-\-nofork Direttamente [Foreground]. Per la versione GUI, .B Vim -non crea [fork] una nuova finestra, indipendente dallo shell di invocazione. +non crea [fork] una nuova finestra, indipendente dalla shell di invocazione. .TP \-F Se @@ -241,7 +241,7 @@ Se è stato compilato con supporto FKMAP per editare file con orientamento destra-sinistra e tastiera con mappatura Farsi, questa opzione inizia .B Vim -in modalità "Farsi", cioè impostando 'fkmap' e 'rightleft'. +in Modo Farsi, cioè impostando 'fkmap' e 'rightleft'. Altrimenti viene dato un messaggio di errore e .B Vim termina in modo anormale. @@ -266,7 +266,7 @@ Se è stato compilato col supporto RIGHTLEFT per editare file con orientamento destra-sinistra e tastiera con mappatura Ebraica, questa opzione inizia .B Vim -in modalità "Ebraica", cioè impostando 'hkmap' e 'rightleft'. +in Modo Ebraico, cioè impostando 'hkmap' e 'rightleft'. Altrimenti viene dato un messaggio di errore e .B Vim termina in modo anormale. @@ -280,13 +280,13 @@ Si può anche evitare l'uso di un file .viminfo, dando come nome "NONE". Equivalente a \-r. .TP \-l -Modalità Lisp. -Imposta le opzini 'lisp' e 'showmatch'. +Modo Lisp. +Imposta le opzioni 'lisp' e 'showmatch'. .TP \-m Inibisce modifica file. Annulla l'opzione 'write'. -E' ancora possibile modificare un buffer [in memoria \- Ndt], ma non scriverlo. +È ancora possibile modificare un buffer [in memoria \- Ndt], ma non scriverlo. .TP \-M Modifiche non permesse. Le opzioni 'modifiable' e 'write' sono annullate, @@ -294,7 +294,7 @@ in modo da impedire sia modifiche che riscritture. Da notare che queste opzioni possono essere abilitate in seguito, permettendo così modifiche. .TP \-N -Modalità "Non-compatibile". Annulla l'opzione 'compatible'. +Modo "Non-compatibile". Annulla l'opzione 'compatible'. Così .B Vim va un po' meglio, ma è meno compatibile con Vi, anche in assenza di un @@ -319,12 +319,12 @@ Apri N finestre, in verticale. Se N manca, apri una finestra per ciascun file. .TP \-R -Modalità "Sola Lettura". +Modo Read-only (Sola Lettura). Imposta l'opzione 'readonly'. Si può ancora modificare il buffer, ma siete protetti da una riscrittura involontaria. Se volete davvero riscrivere il file, aggiungete un punto esclamativo -al comando "Ex", come in ":w!". +al comando Ex, come in ":w!". L'opzione \-R implica anche l'opzione \-n (vedere sotto). L'opzione 'readonly' può essere annullata con ":set noro". Vedere ":help 'readonly'". @@ -333,14 +333,14 @@ Vedere ":help 'readonly'". Lista file di swap, assieme a dati utili per un recupero. .TP \-r {file} -Modalità "Recovery". +Modo Recovery (ripristino). Il file di swap è usato per recuperare una sessione di edit finita male. Il file di swap è un file con lo stesso nome file del file di testo editato, col suffisso ".swp". Vedere ":help recovery". .TP \-s -Modalità silenziosa. Solo quando invocato come "Ex" o quando l'opzione +Modo silenzioso. Solo quando invocato come "Ex" o quando l'opzione "\-e" è stata data prima dell'opzione "\-s". .TP \-s {scriptin} @@ -383,7 +383,7 @@ Il valore predefinito è 10. \-v Inizia .B Vim -in modalità "Vi", come se il programma eseguibile fosse "vi". Questo ha +in Modo Vi, come se il programma eseguibile fosse "vi". Questo ha effetto solo quando Vim viene invocato con il nome "ex". .TP \-w {scriptout} @@ -408,14 +408,14 @@ ma il titolo della finestra e la clipboard non sono disponibili. \-y Eseguire .B Vim -in modalità "Facile" (semplificata), come se l'eseguibile invocato +in Modo Easy (semplificata), come se l'eseguibile invocato sia "evim" o "eview". Fa sì che .B Vim si comporti come un editor che usa solo il mouse e i caratteri. .TP \-Z -Modalità "Ristretta". Vim si comporta come se invocato con un nome +Modo ristretto. Vim si comporta come se invocato con un nome che inizia per "r". .TP \-\- @@ -430,8 +430,8 @@ Solo con GUI GTK: Visualizza Window ID su "stdout". Vim dà un messaggio ed esce, come con l'argomento "\-h". .TP \-\-literal -Considera i nomi passati come argomenti letterai, senza espandere -metacaratteri. Non necessario in Unix, lo shell espande i metacaratteri. +Considera i nomi passati come argomenti letterali, senza espandere +metacaratteri. Non necessario in Unix, la shell espande i metacaratteri. .TP \-\-noplugin Non caricare plugin. Implicito se si specifica \-u NONE. @@ -442,7 +442,7 @@ argomenti. Se non si trova un server viene dato un messaggio e i file sono editati nel Vim corrente. .TP \-\-remote\-expr {expr} -Connettersi a un server Vim, valutare ivi {expr} e stampare il risultatoi +Connettersi a un server Vim, valutare ivi {expr} e stampare il risultato su "stdout". .TP \-\-remote\-send {chiavi} @@ -521,7 +521,7 @@ Script Vim usato dal comando ":options", un modo semplice per visualizzare e impostare opzioni. .TP /usr/local/lib/vim/menu.vim -Inzializzazioni del menu gvim a livello di sistema. +Inizializzazioni del menù gvim a livello di sistema. .TP /usr/local/lib/vim/bugreport.vim Script Vim per generare una segnalazione di errore. Vedere ":help bugs". diff --git a/runtime/doc/vimdiff-it.1 b/runtime/doc/vimdiff-it.1 index 8d812283d1..2203877acf 100755 --- a/runtime/doc/vimdiff-it.1 +++ b/runtime/doc/vimdiff-it.1 @@ -1,21 +1,21 @@ .TH VIMDIFF 1 "30 marzo 2001" .SH NOME -vimdiff \- modifica due o tre versioni di un file con Vim, visualizzando le -differenze +vimdiff \- modifica due, tre o quattro versioni di un file con Vim, +visualizzando le differenze .SH SINTASSI .br .B vimdiff -[opzioni] file1 file2 [file3] +[opzioni] file1 file2 [file3 [file4]] .PP .B gvimdiff .SH DESCRIZIONE .B Vimdiff inizia .B Vim -per due (o tre) file. +per due (o tre o quattro) file. Ogni file ha una sua finestra. Le differenze fra file sono evidenziate. -E' una maniera elegante per controllare modifiche e portare modifiche +È una maniera elegante per controllare modifiche e portare modifiche verso un'altra versione dello stesso file. .PP Vedere vim(1) per dettagli su Vim in generale. diff --git a/runtime/doc/vimdiff-it.UTF-8.1 b/runtime/doc/vimdiff-it.UTF-8.1 index e71e774e8b..090892fa93 100644 --- a/runtime/doc/vimdiff-it.UTF-8.1 +++ b/runtime/doc/vimdiff-it.UTF-8.1 @@ -1,21 +1,21 @@ .TH VIMDIFF 1 "30 marzo 2001" .SH NOME -vimdiff \- modifica due o tre versioni di un file con Vim, visualizzando le -differenze +vimdiff \- modifica due, tre o quattro versioni di un file con Vim, +visualizzando le differenze .SH SINTASSI .br .B vimdiff -[opzioni] file1 file2 [file3] +[opzioni] file1 file2 [file3 [file4]] .PP .B gvimdiff .SH DESCRIZIONE .B Vimdiff inizia .B Vim -per due (o tre) file. +per due (o tre o quattro) file. Ogni file ha una sua finestra. Le differenze fra file sono evidenziate. -E' una maniera elegante per controllare modifiche e portare modifiche +È una maniera elegante per controllare modifiche e portare modifiche verso un'altra versione dello stesso file. .PP Vedere vim(1) per dettagli su Vim in generale. diff --git a/runtime/doc/vimtutor-it.1 b/runtime/doc/vimtutor-it.1 index 9adaa722c1..b5c1e61e01 100755 --- a/runtime/doc/vimtutor-it.1 +++ b/runtime/doc/vimtutor-it.1 @@ -1,43 +1,47 @@ -.TH VIMTUTOR 1 "2001 April 2" +.TH VIMTUTOR 1 "2 aprile 2001" .SH NOME -vimtutor \- the Vim tutor +vimtutor \- Un breve corso per imparare Vim .SH SINTASSI .br -.B vimtutor [lingua] +.B vimtutor [\-g] [lingua] .SH DESCRIZIONE .B Vimtutor inizia il .B Vim -tutor. -It copies the tutor file first, so that it can be modified without changing -the original file. +tutor (una breve corso per imparare Vim). +Per prima cosa viene creata una copia del file di lavoro, che può così essere +modificato senza alterare il file usato come modello. .PP -The +Il comando .B Vimtutor -is useful for people that want to learn their first +è utile a chi voglia imparare i primi comandi .B Vim -commands. +. .PP -The optional [language] argument is the two\-letter name of a language, like -"it" or "es". -If the [language] argument is missing, the language of the current locale will -be used. -If a tutor in this language is available, it will be used. -Otherwise the English version will be used. +L'argomento opzionale \-g inizia vimtutor usando gvim invece che vim, se la +versione GUI di vim è disponibile. oppure utilizza vim, se gvim non è +disponibile. +.PP +L'arogmento opzionale [lingua] è l'abbreviazione di due lettere del nome +di una lingua, per esempio "it" oppure "es". +se L'argomento [lingua] non viene specificato, si utilizza la lingua "locale" +del computer. +Se la versione in quella lingua del "tutor" è disponibile, sarà usata. +Altrimenti sarà usata la versione inglese. .PP .B Vim -is always started in Vi compatible mode. +è sempre iniziato in Modo compatibile con vi. .SH FILE .TP 15 /usr/local/lib/vim/tutor/tutor[.language] -The +Il/I file di testo per .B Vimtutor -text file(s). + .TP 15 /usr/local/lib/vim/tutor/tutor.vim -The Vim script used to copy the +Lo script di Vim usato per copiare il file di testo .B Vimtutor -text file. +. .SH AUTORE The .B Vimtutor @@ -46,7 +50,7 @@ Colorado School of Mines, usando idee fornite da Charles Smith, Colorado State University. E\-mail: bware@mines.colorado.edu. .br -E' stato modificato per +È stato modificato per .B Vim da Bram Moolenaar. Per i nomi dei traduttori, vedere i file usati nelle rispettive lingue. diff --git a/runtime/doc/vimtutor-it.UTF-8.1 b/runtime/doc/vimtutor-it.UTF-8.1 index 2b65c3c031..a33dcb00b0 100644 --- a/runtime/doc/vimtutor-it.UTF-8.1 +++ b/runtime/doc/vimtutor-it.UTF-8.1 @@ -1,43 +1,47 @@ -.TH VIMTUTOR 1 "2001 April 2" +.TH VIMTUTOR 1 "2 aprile 2001" .SH NOME -vimtutor \- the Vim tutor +vimtutor \- Un breve corso per imparare Vim .SH SINTASSI .br -.B vimtutor [lingua] +.B vimtutor [\-g] [lingua] .SH DESCRIZIONE .B Vimtutor inizia il .B Vim -tutor. -It copies the tutor file first, so that it can be modified without changing -the original file. +tutor (una breve corso per imparare Vim). +Per prima cosa viene creata una copia del file di lavoro, che può così essere +modificato senza alterare il file usato come modello. .PP -The +Il comando .B Vimtutor -is useful for people that want to learn their first +è utile a chi voglia imparare i primi comandi .B Vim -commands. +. .PP -The optional [language] argument is the two\-letter name of a language, like -"it" or "es". -If the [language] argument is missing, the language of the current locale will -be used. -If a tutor in this language is available, it will be used. -Otherwise the English version will be used. +L'argomento opzionale \-g inizia vimtutor usando gvim invece che vim, se la +versione GUI di vim è disponibile. oppure utilizza vim, se gvim non è +disponibile. +.PP +L'arogmento opzionale [lingua] è l'abbreviazione di due lettere del nome +di una lingua, per esempio "it" oppure "es". +se L'argomento [lingua] non viene specificato, si utilizza la lingua "locale" +del computer. +Se la versione in quella lingua del "tutor" è disponibile, sarà usata. +Altrimenti sarà usata la versione inglese. .PP .B Vim -is always started in Vi compatible mode. +è sempre iniziato in Modo compatibile con vi. .SH FILE .TP 15 /usr/local/lib/vim/tutor/tutor[.language] -The +Il/I file di testo per .B Vimtutor -text file(s). + .TP 15 /usr/local/lib/vim/tutor/tutor.vim -The Vim script used to copy the +Lo script di Vim usato per copiare il file di testo .B Vimtutor -text file. +. .SH AUTORE The .B Vimtutor @@ -46,7 +50,7 @@ Colorado School of Mines, usando idee fornite da Charles Smith, Colorado State University. E\-mail: bware@mines.colorado.edu. .br -E' stato modificato per +È stato modificato per .B Vim da Bram Moolenaar. Per i nomi dei traduttori, vedere i file usati nelle rispettive lingue. diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt index 837a1284d6..d5499a4a8f 100644 --- a/runtime/doc/visual.txt +++ b/runtime/doc/visual.txt @@ -1,4 +1,4 @@ -*visual.txt* For Vim version 7.3c. Last change: 2010 Feb 17 +*visual.txt* For Vim version 7.3d. Last change: 2010 Feb 17 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index 6c08082fc1..b2ede0b9b7 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -1,4 +1,4 @@ -*windows.txt* For Vim version 7.3c. Last change: 2010 Apr 12 +*windows.txt* For Vim version 7.3d. Last change: 2010 Apr 12 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/workshop.txt b/runtime/doc/workshop.txt index 6b2cbaf195..b3430779ab 100644 --- a/runtime/doc/workshop.txt +++ b/runtime/doc/workshop.txt @@ -1,4 +1,4 @@ -*workshop.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*workshop.txt* For Vim version 7.3d. Last change: 2010 Jul 20 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/doc/xxd-it.1 b/runtime/doc/xxd-it.1 index 41298495a0..3d8dabb950 100755 --- a/runtime/doc/xxd-it.1 +++ b/runtime/doc/xxd-it.1 @@ -24,7 +24,7 @@ Come .BR uuencode (1) e .BR uudecode (1) -permette di trasmettere dati binari in una rapresentazione ASCII "a prova +permette di trasmettere dati binari in una rappresentazione ASCII "a prova di email", ma ha anche il vantaggio di poter decodificare sullo "standard output". Inoltre, può essere usato per effettuare delle modifiche (patch) a file binari. @@ -61,7 +61,7 @@ sono notazioni equivalenti fra loro. .TP .IR \-a " | " \-autoskip Richiesta di autoskip: Un singolo '*' rimpiazza linee di zeri binari. -Valore predefinito: off. +Valore di default: off. .TP .IR \-b " | " \-bits Richiesta di una immagine binaria (cifre binarie), invece che esadecimale. @@ -74,7 +74,7 @@ linea comando \-r, \-p, \-i non funzionano in questo modo. .IR "\-c colonne " | " \-cols colonne" In ogni linea sono formattate .RI < colonne > -colonne. Valore predefinito 16 (\-i: 12, \-ps: 30, \-b: 6). +colonne. Valore di default 16 (\-i: 12, \-ps: 30, \-b: 6). Valore massimo 256. .TP .IR \-E " | " \-EBCDIC @@ -82,15 +82,15 @@ Cambia la codifica della colonna di destra da ASCII a EBCDIC. Questo non modifica la rappresentazione esadecimale. Non ha senso specificare questa opzione in combinazione con \-r, \-p o \-i. .TP -.IR "\-g bytes " | " \-groupsize bytes" +.IR "\-g numero_byte " | " \-groupsize numero_byte" Inserisci ogni -.RI < bytes > -bytes di output (di due caratteri esadecimali o otto numeri binari ognuno) +.RI < numero_byte > +byte di output (di due caratteri esadecimali o otto numeri binari ognuno) uno spazio bianco. Specificando .I \-g 0 -i bytes di output non sono separati da alcuno spazio. -.RI < Bytes "> ha come valore predefinito " 2 +i byte di output non sono separati da alcuno spazio. +.RI < numero_byte > ha come valore di default " 2 in modalità normale [esadecimale] e \fI1\fP in modalità binaria. Il raggruppamento non si applica agli stili "PostScript" e "include". .TP @@ -103,10 +103,10 @@ L'output definizione completa di un "array" [vettore], dandogli il nome del file di input), tranne che nel caso in cui xxd legga dallo "standard input". .TP -.IR "\-l lunghezza " | " \-len lunghezza" +.IR "\-l numero " | " \-len numero" Il programma esce dopo aver scritto -.RI < lunghezza > -bytes. +.RI < numero > +byte. .TP .IR \-p " | " \-ps " | " \-postscript " | " \-plain L'output è nello stile di un dump continuo sotto postscript. @@ -120,7 +120,7 @@ in maniera continua, senza interruzioni. Usare la combinazione .I \-r \-p per leggere dump in stile esadecimale semplice [plain], senza l'informazione di numero di linea e senza un particolare tracciato di colonna. Degli spazi -o delle linee vuote possono essere inserite a piacere [e vengono ingorate]. +o delle linee vuote possono essere inserite a piacere [e vengono ignorate]. .TP .I \-seek distanza Usato con l'opzione @@ -133,17 +133,17 @@ esadecimale. .I \-s [+][\-]seek Inizia a .RI < seek > -bytes assoluti (o relativi) di distanza all'interno di input_file. +byte assoluti (o relativi) di distanza all'interno di input_file. \fI+ \fRindica che il "seek" è relativo alla posizione corrente nel file "standard input" (non significativa quando non si legge da "standard input"). \fI\- \fRindica che il "seek" dovrebbe posizionarsi ad quel numero di caratteri dalla fine dell'input (o se in combinazione con \fI+ \fR: prime della posizione corrente nel file "standard input"). -Se non si specifica una opzione \-s option, xxd inizia alla posizione +Se non si specifica una opzione \-s, xxd inizia alla posizione corrente all'interno del file. .TP .I \-u -usa lettere esadecimali maiuscole. Il valore predefinito è di usare +usa lettere esadecimali maiuscole. Il valore di default è di usare lettere minuscole. .TP .IR \-v " | " \-version @@ -169,7 +169,7 @@ salta il resto della linea, dopo aver letto abbastanza caratteri contenenti dati esadecimali (vedere opzione \-c). Ciò implica pure che le modifiche alle colonne di caratteri stampabili ascii (o ebcdic) sono sempre ignorate. La ricostruzione da un file immagine esadecimale in stile semplice -(postscript) con xxd \-r \-p non dipende dal numero corrretto di colonne. +(postscript) con xxd \-r \-p non dipende dal numero corretto di colonne. IN questo caso, qualsiasi cosa assomigli a una coppia di cifre esadecimali è interpretata [e utilizzata]. .PP @@ -185,7 +185,7 @@ e può comportarsi in modo diverso da .IR "xxd \-s seek" , perché lseek(2) è usata per tornare indietro nel file di input. Il '+' -fa differenza se il file di input è lo "standard input", e se la pozione nel +fa differenza se il file di input è lo "standard input", e se la posizione nel file di "standard input" non è all'inizio del file quando xxd è eseguito, con questo input. I seguenti esempi possono contribuire a chiarire il concetto @@ -204,29 +204,29 @@ si aggiunge a 1k (1024) dove `dd' si era fermato. .PP Immagine esadecimale dalla posizione 0x100 ( = 1024\-768 ) del file in avanti. .br -\fI% sh \-c 'dd of=normale bs=1k count=1; xxd \-s +-768 > esadecimale' < file +\fI% sh \-c 'dd of=normale bs=1k count=1; xxd \-s +\-768 > esadecimale' < file .PP -Comunque, questo capita raramente, e l'uso del `+' di rado. +Comunque, questo capita raramente, e l'uso del `+' non serve quasi mai. L'autore preferisce monitorare il comportamento di xxd con strace(1) o truss(1), quando si usa l'opzione \-s. .SH ESEMPI .PP .br -Stampa tutto tranne le prime tre linee (0x30 bytes esadecimali) di +Stampa tutto tranne le prime tre linee (0x30 byte esadecimali) di .B file \. .br \fI% xxd \-s 0x30 file .PP .br -Stampa 3 linee (0x30 bytes esadecimali) alla fine di +Stampa 3 linee (0x30 byte esadecimali) alla fine di .B file \. .br \fI% xxd \-s \-0x30 file .PP .br -Stampa 120 bytes come immagine esadecimale continua con 20 bytes per linea. +Stampa 120 byte come immagine esadecimale continua con 20 byte per linea. .br \fI% xxd \-l 120 \-ps \-c 20 xxd.1\fR @@ -245,7 +245,7 @@ Stampa 120 bytes come immagine esadecimale continua con 20 bytes per linea. .br .br -Stampa i primi 120 bytes della pagina di manuale vim.1 a 12 bytes per linea. +Stampa i primi 120 byte della pagina di manuale vim.1 a 12 byte per linea. .br \fI% xxd \-l 120 \-c 12 xxd.1\fR @@ -283,7 +283,7 @@ Copiare .B input_file su .B output_file -premettendogli 100 bytes a 0x00. +premettendogli 100 byte a 0x00. .br \fI% xxd input_file | xxd \-r \-s 100 \> output_file\fR .br @@ -298,7 +298,7 @@ Modificare (patch) la data nel file xxd.1 0000036: 3235 7468 204d 6179 2031 3939 36 25th May 1996 .PP .br -Creare un file di 65537 tutto a 0x00, +Creare un file di 65537 byte tutto a 0x00, tranne che l'ultimo carattere che è una 'A' (esadecimale 0x41). .br \fI% echo '010000: 41' | xxd \-r \> file\fR @@ -316,21 +316,21 @@ Stampa una immagine esadecimale del file di cui sopra con opzione autoskip. .PP Crea un file di 1 byte che contiene il solo carattere 'A'. Il numero dopo '\-r \-s' viene aggiunto a quello trovato nel file; -in pratica, i bytes precedenti non sono stampati. +in pratica, i byte precedenti non sono stampati. .br \fI% echo '010000: 41' | xxd \-r \-s \-0x10000 \> file\fR .PP -Usare xxd come filtro all'interno di un editor come +Usa xxd come filtro all'interno di un editor come .B vim(1) per ottenere una immagine esadecimale di una parte di file -delimitata dai mark `a' e `z'. +delimitata dai marcatori `a' e `z'. .br \fI:'a,'z!xxd\fR .PP Usare xxd come filtro all'interno di un editor come .B vim(1) per ricostruire un pezzo di file binario da una immagine esadecimale -delimitata dai mark `a' e `z'. +delimitata dai marcatori `a' e `z'. .br \fI:'a,'z!xxd \-r\fR .PP @@ -341,7 +341,7 @@ Portare il cursore sopra la linea e battere: .br \fI!!xxd \-r\fR .PP -Per leggere singoli charatteri da una linea seriale +Per leggere singoli caratteri da una linea seriale .br \fI% xxd \-c1 < /dev/term/b &\fR .br @@ -385,7 +385,7 @@ Questa pagina di manuale documenta la versione 1.7 di xxd. .br (c) 1990-1997 Juergen Weigert .br - + .LP Distribuite liberamente ed attribuitemi il credito, .br diff --git a/runtime/doc/xxd-it.UTF-8.1 b/runtime/doc/xxd-it.UTF-8.1 index 613b0b2746..b6ccabd2e3 100644 --- a/runtime/doc/xxd-it.UTF-8.1 +++ b/runtime/doc/xxd-it.UTF-8.1 @@ -24,7 +24,7 @@ Come .BR uuencode (1) e .BR uudecode (1) -permette di trasmettere dati binari in una rapresentazione ASCII "a prova +permette di trasmettere dati binari in una rappresentazione ASCII "a prova di email", ma ha anche il vantaggio di poter decodificare sullo "standard output". Inoltre, può essere usato per effettuare delle modifiche (patch) a file binari. @@ -61,7 +61,7 @@ sono notazioni equivalenti fra loro. .TP .IR \-a " | " \-autoskip Richiesta di autoskip: Un singolo '*' rimpiazza linee di zeri binari. -Valore predefinito: off. +Valore di default: off. .TP .IR \-b " | " \-bits Richiesta di una immagine binaria (cifre binarie), invece che esadecimale. @@ -74,7 +74,7 @@ linea comando \-r, \-p, \-i non funzionano in questo modo. .IR "\-c colonne " | " \-cols colonne" In ogni linea sono formattate .RI < colonne > -colonne. Valore predefinito 16 (\-i: 12, \-ps: 30, \-b: 6). +colonne. Valore di default 16 (\-i: 12, \-ps: 30, \-b: 6). Valore massimo 256. .TP .IR \-E " | " \-EBCDIC @@ -82,15 +82,15 @@ Cambia la codifica della colonna di destra da ASCII a EBCDIC. Questo non modifica la rappresentazione esadecimale. Non ha senso specificare questa opzione in combinazione con \-r, \-p o \-i. .TP -.IR "\-g bytes " | " \-groupsize bytes" +.IR "\-g numero_byte " | " \-groupsize numero_byte" Inserisci ogni -.RI < bytes > -bytes di output (di due caratteri esadecimali o otto numeri binari ognuno) +.RI < numero_byte > +byte di output (di due caratteri esadecimali o otto numeri binari ognuno) uno spazio bianco. Specificando .I \-g 0 -i bytes di output non sono separati da alcuno spazio. -.RI < Bytes "> ha come valore predefinito " 2 +i byte di output non sono separati da alcuno spazio. +.RI < numero_byte > ha come valore di default " 2 in modalità normale [esadecimale] e \fI1\fP in modalità binaria. Il raggruppamento non si applica agli stili "PostScript" e "include". .TP @@ -103,10 +103,10 @@ L'output è nello stile dei file "include" in C. Viene preparata la definizione completa di un "array" [vettore], dandogli il nome del file di input), tranne che nel caso in cui xxd legga dallo "standard input". .TP -.IR "\-l lunghezza " | " \-len lunghezza" +.IR "\-l numero " | " \-len numero" Il programma esce dopo aver scritto -.RI < lunghezza > -bytes. +.RI < numero > +byte. .TP .IR \-p " | " \-ps " | " \-postscript " | " \-plain L'output è nello stile di un dump continuo sotto postscript. @@ -120,7 +120,7 @@ in maniera continua, senza interruzioni. Usare la combinazione .I \-r \-p per leggere dump in stile esadecimale semplice [plain], senza l'informazione di numero di linea e senza un particolare tracciato di colonna. Degli spazi -o delle linee vuote possono essere inserite a piacere [e vengono ingorate]. +o delle linee vuote possono essere inserite a piacere [e vengono ignorate]. .TP .I \-seek distanza Usato con l'opzione @@ -133,17 +133,17 @@ esadecimale. .I \-s [+][\-]seek Inizia a .RI < seek > -bytes assoluti (o relativi) di distanza all'interno di input_file. +byte assoluti (o relativi) di distanza all'interno di input_file. \fI+ \fRindica che il "seek" è relativo alla posizione corrente nel file "standard input" (non significativa quando non si legge da "standard input"). \fI\- \fRindica che il "seek" dovrebbe posizionarsi ad quel numero di caratteri dalla fine dell'input (o se in combinazione con \fI+ \fR: prime della posizione corrente nel file "standard input"). -Se non si specifica una opzione \-s option, xxd inizia alla posizione +Se non si specifica una opzione \-s, xxd inizia alla posizione corrente all'interno del file. .TP .I \-u -usa lettere esadecimali maiuscole. Il valore predefinito è di usare +usa lettere esadecimali maiuscole. Il valore di default è di usare lettere minuscole. .TP .IR \-v " | " \-version @@ -169,7 +169,7 @@ salta il resto della linea, dopo aver letto abbastanza caratteri contenenti dati esadecimali (vedere opzione \-c). Ciò implica pure che le modifiche alle colonne di caratteri stampabili ascii (o ebcdic) sono sempre ignorate. La ricostruzione da un file immagine esadecimale in stile semplice -(postscript) con xxd \-r \-p non dipende dal numero corrretto di colonne. +(postscript) con xxd \-r \-p non dipende dal numero corretto di colonne. IN questo caso, qualsiasi cosa assomigli a una coppia di cifre esadecimali è interpretata [e utilizzata]. .PP @@ -185,7 +185,7 @@ e può comportarsi in modo diverso da .IR "xxd \-s seek" , perché lseek(2) è usata per tornare indietro nel file di input. Il '+' -fa differenza se il file di input è lo "standard input", e se la pozione nel +fa differenza se il file di input è lo "standard input", e se la posizione nel file di "standard input" non è all'inizio del file quando xxd è eseguito, con questo input. I seguenti esempi possono contribuire a chiarire il concetto @@ -204,29 +204,29 @@ si aggiunge a 1k (1024) dove `dd' si era fermato. .PP Immagine esadecimale dalla posizione 0x100 ( = 1024\-768 ) del file in avanti. .br -\fI% sh \-c 'dd of=normale bs=1k count=1; xxd \-s +-768 > esadecimale' < file +\fI% sh \-c 'dd of=normale bs=1k count=1; xxd \-s +\-768 > esadecimale' < file .PP -Comunque, questo capita raramente, e l'uso del `+' di rado. +Comunque, questo capita raramente, e l'uso del `+' non serve quasi mai. L'autore preferisce monitorare il comportamento di xxd con strace(1) o truss(1), quando si usa l'opzione \-s. .SH ESEMPI .PP .br -Stampa tutto tranne le prime tre linee (0x30 bytes esadecimali) di +Stampa tutto tranne le prime tre linee (0x30 byte esadecimali) di .B file \. .br \fI% xxd \-s 0x30 file .PP .br -Stampa 3 linee (0x30 bytes esadecimali) alla fine di +Stampa 3 linee (0x30 byte esadecimali) alla fine di .B file \. .br \fI% xxd \-s \-0x30 file .PP .br -Stampa 120 bytes come immagine esadecimale continua con 20 bytes per linea. +Stampa 120 byte come immagine esadecimale continua con 20 byte per linea. .br \fI% xxd \-l 120 \-ps \-c 20 xxd.1\fR @@ -245,7 +245,7 @@ Stampa 120 bytes come immagine esadecimale continua con 20 bytes per linea. .br .br -Stampa i primi 120 bytes della pagina di manuale vim.1 a 12 bytes per linea. +Stampa i primi 120 byte della pagina di manuale vim.1 a 12 byte per linea. .br \fI% xxd \-l 120 \-c 12 xxd.1\fR @@ -283,7 +283,7 @@ Copiare .B input_file su .B output_file -premettendogli 100 bytes a 0x00. +premettendogli 100 byte a 0x00. .br \fI% xxd input_file | xxd \-r \-s 100 \> output_file\fR .br @@ -298,7 +298,7 @@ Modificare (patch) la data nel file xxd.1 0000036: 3235 7468 204d 6179 2031 3939 36 25th May 1996 .PP .br -Creare un file di 65537 tutto a 0x00, +Creare un file di 65537 byte tutto a 0x00, tranne che l'ultimo carattere che è una 'A' (esadecimale 0x41). .br \fI% echo '010000: 41' | xxd \-r \> file\fR @@ -316,21 +316,21 @@ Stampa una immagine esadecimale del file di cui sopra con opzione autoskip. .PP Crea un file di 1 byte che contiene il solo carattere 'A'. Il numero dopo '\-r \-s' viene aggiunto a quello trovato nel file; -in pratica, i bytes precedenti non sono stampati. +in pratica, i byte precedenti non sono stampati. .br \fI% echo '010000: 41' | xxd \-r \-s \-0x10000 \> file\fR .PP -Usare xxd come filtro all'interno di un editor come +Usa xxd come filtro all'interno di un editor come .B vim(1) per ottenere una immagine esadecimale di una parte di file -delimitata dai mark `a' e `z'. +delimitata dai marcatori `a' e `z'. .br \fI:'a,'z!xxd\fR .PP Usare xxd come filtro all'interno di un editor come .B vim(1) per ricostruire un pezzo di file binario da una immagine esadecimale -delimitata dai mark `a' e `z'. +delimitata dai marcatori `a' e `z'. .br \fI:'a,'z!xxd \-r\fR .PP @@ -341,7 +341,7 @@ Portare il cursore sopra la linea e battere: .br \fI!!xxd \-r\fR .PP -Per leggere singoli charatteri da una linea seriale +Per leggere singoli caratteri da una linea seriale .br \fI% xxd \-c1 < /dev/term/b &\fR .br @@ -385,7 +385,7 @@ Questa pagina di manuale documenta la versione 1.7 di xxd. .br (c) 1990-1997 Juergen Weigert .br - + .LP Distribuite liberamente ed attribuitemi il credito, .br diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 92dfda2468..62652f52bd 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: 2010 May 14 +" Last Change: 2010 Jul 30 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -1285,6 +1285,7 @@ else au BufNewFile,BufRead *.pl call s:FTpl() endif au BufNewFile,BufRead *.plx,*.al setf perl +au BufNewFile,BufRead *.p6,*.pm6 setf perl6 func! s:FTpl() if exists("g:filetype_pl") @@ -1633,6 +1634,9 @@ au BufNewFile,BufRead *.sa setf sather " Scilab au BufNewFile,BufRead *.sci,*.sce setf scilab +" SCSS +au BufNewFile,BufRead *.scss setf scss + " SD: Streaming Descriptors au BufNewFile,BufRead *.sd setf sd @@ -2400,6 +2404,9 @@ au! BufNewFile,BufRead *jarg* " Kconfig au BufNewFile,BufRead Kconfig.* call s:StarSetf('kconfig') +" Logcheck +au BufNewFile,BufRead /etc/logcheck/*.d*/* call s:StarSetf('logcheck') + " Makefile au BufNewFile,BufRead [mM]akefile* call s:StarSetf('make') diff --git a/runtime/ftplugin/AppendMatchGroup.vim b/runtime/ftplugin/AppendMatchGroup.vim deleted file mode 100644 index 34e80b5f83..0000000000 --- a/runtime/ftplugin/AppendMatchGroup.vim +++ /dev/null @@ -1,125 +0,0 @@ -" Vim filetype plugin file utility -" Language: * (various) -" Maintainer: Dave Silvia -" Date: 6/30/2004 - -" The start of match (b:SOM) default is: -" '\<' -" The end of match (b:EOM) default is: -" '\>' -" -" If you want to use some other start/end of match, just assign the -" value to the b:SOM|EOM variable in your filetype script. -" -" SEE: :h pattern.txt -" :h pattern-searches -" :h regular-expression -" :h matchit - -let s:myName=expand(":t") - -" matchit.vim not loaded -- don't do anyting -if !exists("loaded_matchit") - echomsg s:myName.": matchit.vim not loaded -- finishing without loading" - finish -endif - -" already been here -- don't redefine -if exists("*AppendMatchGroup") - finish -endif - -" Function To Build b:match_words -" The following function, 'AppendMatchGroup', helps to increase -" readability of your filetype script if you choose to use matchit. -" It also precludes many construction errors, reducing the -" construction to simply invoking the function with the match words. -" As an example, let's take the ubiquitous if/then/else/endif type -" of construct. This is how the entry in your filetype script would look. -" -" " source the AppendMatchGroup function file -" runtime ftplugin/AppendMatchGroup.vim -" -" " fill b:match_words -" call AppendMatchGroup('if,then,else,endif') -" -" And the b:match_words constructed would look like: -" -" \:\:\:\ -" -" Use of AppendMatchGroup makes your filetype script is a little -" less busy and a lot more readable. Additionally, it -" checks three critical things: -" -" 1) Do you have at least 2 entries in your match group. -" -" 2) Does the buffer variable 'b:match_words' exist? if not, create it. -" -" 3) If the buffer variable 'b:match_words' does exist, is the last -" character a ','? If not, add it before appending. -" -" You should now be able to match 'if/then/else/endif' in succession -" in your source file, in just about any construction you may have -" chosen for them. -" -" To add another group, simply call 'AppendMatchGroup again. E.G.: -" -" call AppendMatchGroup('while,do,endwhile') - -function AppendMatchGroup(mwordList) - let List=a:mwordList - let Comma=match(List,',') - if Comma == -1 || Comma == strlen(List)-1 - echoerr "Must supply a comma separated list of at least 2 entries." - echoerr "Supplied list: <".List.">" - return - endif - let listEntryBegin=0 - let listEntryEnd=Comma - let listEntry=strpart(List,listEntryBegin,listEntryEnd-listEntryBegin) - let List=strpart(List,Comma+1) - let Comma=match(List,',') - " if listEntry is all spaces || List is empty || List is all spaces - if (match(listEntry,'\s\+') == 0 && match(listEntry,'\S\+') == -1) - \ || List == '' || (match(List,'\s\+') == 0 && match(List,'\S\+') == -1) - echoerr "Can't use all spaces for an entry <".listEntry.">" - echoerr "Remaining supplied list: <".List.">" - return - endif - - if !exists("b:SOM") - let b:SOM='\<' - endif - if !exists("b:EOM") - let b:EOM='\>' - endif - if !exists("b:match_words") - let b:match_words='' - endif - if b:match_words != '' && match(b:match_words,',$') == -1 - let b:match_words=b:match_words.',' - endif - " okay, all set add first entry in this list - let b:match_words=b:match_words.b:SOM.listEntry.b:EOM.':' - while Comma != -1 - let listEntryEnd=Comma - let listEntry=strpart(List,listEntryBegin,listEntryEnd-listEntryBegin) - let List=strpart(List,Comma+1) - let Comma=match(List,',') - " if listEntry is all spaces - if match(listEntry,'\s\+') == 0 && match(listEntry,'\S\+') == -1 - echoerr "Can't use all spaces for an entry <".listEntry."> - skipping" - echoerr "Remaining supplied list: <".List.">" - continue - endif - let b:match_words=b:match_words.b:SOM.listEntry.b:EOM.':' - endwhile - let listEntry=List - let b:match_words=b:match_words.b:SOM.listEntry.b:EOM -endfunction - -" TODO: Write a wrapper to handle multiple groups in one function call. -" Don't see a lot of utility in this as it would undoubtedly warrant -" continuation lines in the filetype script and it would be a toss -" up as to which is more readable: individual calls one to a line or -" a single call with continuation lines. I vote for the former. diff --git a/runtime/ftplugin/logcheck.vim b/runtime/ftplugin/logcheck.vim new file mode 100644 index 0000000000..765f6b471e --- /dev/null +++ b/runtime/ftplugin/logcheck.vim @@ -0,0 +1,17 @@ +" Vim filetype plugin file +" Language: Logcheck +" Maintainer: Debian Vim Maintainers +" Last Change: 2010 Jul 29 +" License: GNU GPL, version 2.0 +" URL: http://hg.debian.org/hg/pkg-vim/vim/file/unstable/runtime/ftplugin/logcheck.vim + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +let b:undo_ftplugin = "setl fo<" + +" Do not hard-wrap non-comment lines since each line is a self-contained +" regular expression +setlocal formatoptions-=t diff --git a/runtime/ftplugin/mupad.vim b/runtime/ftplugin/mupad.vim deleted file mode 100644 index ef3a4fe28f..0000000000 --- a/runtime/ftplugin/mupad.vim +++ /dev/null @@ -1,30 +0,0 @@ -" Vim filetype plugin file -" Language: MuPAD source files -" Maintainer: Dave Silvia -" Filenames: *.mu -" Date: 6/30/2004 - -if exists("b:did_ftplugin") | finish | endif -let b:did_ftplugin = 1 - -" Change the :browse e filter to primarily show MuPAD source files. -if has("gui_win32") - let b:browsefilter= - \ "MuPAD source (*.mu)\t*.mu\n" . - \ "All Files (*.*)\t*.*\n" -endif - -" matchit.vim not loaded -- don't do anyting below -if !exists("loaded_matchit") - " echomsg "matchit.vim not loaded -- finishing" - finish -endif - -" source the AppendMatchGroup function file -runtime ftplugin/AppendMatchGroup.vim - -" fill b:match_words for MuPAD -call AppendMatchGroup('domain,end_domain') -call AppendMatchGroup('proc,begin,end_proc') -call AppendMatchGroup('if,then,elif,else,end_if') -call AppendMatchGroup('\%(for\|while\|repeat\|case\),of,do,break,next,until,\%(end_for\|end_while\|end_repeat\|end_case\)') diff --git a/runtime/ftplugin/sass.vim b/runtime/ftplugin/sass.vim index 9a99931731..64232a0894 100644 --- a/runtime/ftplugin/sass.vim +++ b/runtime/ftplugin/sass.vim @@ -1,7 +1,7 @@ " Vim filetype plugin -" Language: Sass -" Maintainer: Tim Pope -" Last Change: 2010 May 21 +" Language: Sass +" Maintainer: Tim Pope +" Last Change: 2010 Jul 26 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -9,11 +9,14 @@ if exists("b:did_ftplugin") endif let b:did_ftplugin = 1 -let b:undo_ftplugin = "setl cms< inc< ofu<" +let b:undo_ftplugin = "setl cms< def< inc< inex< ofu< sua<" setlocal commentstring=//\ %s +setlocal define=^\\s*\\%(@mixin\\\|=\\) +setlocal includeexpr=substitute(v:fname,'\\%(.*/\\\|^\\)\\zs','_','') setlocal omnifunc=csscomplete#CompleteCSS +setlocal suffixesadd=.sass,.scss,.css -let &l:include = '^\s*@import\s\+\%(url(\)\=' +let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\=' " vim:set sw=2: diff --git a/runtime/ftplugin/scss.vim b/runtime/ftplugin/scss.vim new file mode 100644 index 0000000000..981fb1b881 --- /dev/null +++ b/runtime/ftplugin/scss.vim @@ -0,0 +1,12 @@ +" Vim filetype plugin +" Language: SCSS +" Maintainer: Tim Pope +" Last Change: 2010 Jul 26 + +if exists("b:did_ftplugin") + finish +endif + +runtime! ftplugin/sass.vim + +" vim:set sw=2: diff --git a/runtime/ftplugin/sql.vim b/runtime/ftplugin/sql.vim index f41fb5b20a..cbc8dcc9ad 100644 --- a/runtime/ftplugin/sql.vim +++ b/runtime/ftplugin/sql.vim @@ -1,8 +1,8 @@ " SQL filetype plugin file " Language: SQL (Common for Oracle, Microsoft SQL Server, Sybase) -" Version: 6.0 +" Version: 7.0 " Maintainer: David Fishburn -" Last Change: 2009 Aug 04 +" Last Change: 2010 Jun 11 " Download: http://vim.sourceforge.net/script.php?script_id=454 " For more details please use: @@ -36,6 +36,11 @@ " " History " +" Version 7.0 +" +" NF: Calls the sqlcomplete#ResetCacheSyntax() function when calling +" SQLSetType. +" " Version 6.0 " " NF: Adds the command SQLGetType @@ -164,12 +169,26 @@ if !exists("*SQL_SetType") endif let b:sql_type_override = new_sql_type + " Remove any cached SQL since a new sytax will have different + " items and groups + if !exists('g:loaded_sql_completion') || 100 == g:loaded_sql_completion + call sqlcomplete#ResetCacheSyntax() + endif + " Vim will automatically source the correct files if we " change the filetype. You cannot do this with setfiletype " since that command will only execute if a filetype has " not already been set. In this case we want to override " the existing filetype. let &filetype = 'sql' + + if b:sql_compl_savefunc != "" + " We are changing the filetype to SQL from some other filetype + " which had OMNI completion defined. We need to activate the + " SQL completion plugin in order to cache some of the syntax items + " while the syntax rules for SQL are active. + call sqlcomplete#PreCacheSyntax() + endif endfunction command! -nargs=* -complete=custom,SQL_GetList SQLSetType :call SQL_SetType() @@ -463,6 +482,7 @@ if exists('&omnifunc') " which had OMNI completion defined. We need to activate the " SQL completion plugin in order to cache some of the syntax items " while the syntax rules for SQL are active. + call sqlcomplete#ResetCacheSyntax() call sqlcomplete#PreCacheSyntax() endif endif diff --git a/runtime/indent/GenericIndent.vim b/runtime/indent/GenericIndent.vim deleted file mode 100644 index 67afd70ce3..0000000000 --- a/runtime/indent/GenericIndent.vim +++ /dev/null @@ -1,322 +0,0 @@ -" Vim indent file generic utility functions -" Language: * (various) -" Maintainer: Dave Silvia -" Date: 6/30/2004 - -" SUMMARY: To use GenericIndent, indent/.vim would have the -" following general format: -" -" if exists("b:did_indent") | finish | endif -" let b:did_indent = 1 -" runtime indent/GenericIndent.vim -" let b:indentStmts='' -" let b:dedentStmts='' -" let b:allStmts='' -" setlocal indentexpr=GenericIndent() -" setlocal indentkeys= -" call GenericIndentStmts() -" call GenericDedentStmts() -" call GenericAllStmts() -" -" END SUMMARY: - -" NOTE: b:indentStmts, b:dedentStmts, and b:allStmts need to be initialized -" to '' before callin the functions because 'indent.vim' explicitly -" 'unlet's b:did_indent. This means that the lists will compound if -" you change back and forth between buffers. This is true as of -" version 6.3, 6/23/2004. -" -" NOTE: By default, GenericIndent is case sensitive. -" let b:case_insensitive=1 if you want to ignore case, e.g. DOS batch files - -" The function 'GenericIndent' is data driven and handles most all cases of -" indent checking if you first set up the data. To use this function follow -" the example below (taken from the file indent/MuPAD_source.vim) -" -" Before you start, source this file in indent/.vim to have it -" define functions for your use. -" -"runtime indent/GenericIndent.vim -" -" The data is in 5 sets: -" -" First, set the data set 'indentexpr' to GenericIndent(). -" -"setlocal indentexpr=GenericIndent() -" -" Second, set the data set 'indentkeys' to the keywords/expressions that need -" to be checked for 'indenting' _as_ they typed. -" -"setlocal indentkeys==end_proc,=else,=then,=elif,=end_if,=end_case,=until,=end_repeat,=end_domain,=end_for,=end_while,=end,o,O -" -" NOTE: 'o,O' at the end of the previous line says you wish to be called -" whenever a newline is placed in the buffer. This allows the previous line -" to be checked for indentation parameters. -" -" Third, set the data set 'b:indentStmts' to the keywords/expressions that, when -" they are on a line _when_ you _press_ the __ key, -" you wish to have the next line indented. -" -"call GenericIndentStmts('begin,if,then,else,elif,case,repeat,until,domain,do') -" -" Fourth, set the data set 'b:dedentStmts' to the keywords/expressions that, when -" they are on a line you are currently typing, you wish to have that line -" 'dedented' (having already been indented because of the previous line's -" indentation). -" -"call GenericDedentStmts('end_proc,then,else,elif,end_if,end_case,until,end_repeat,end_domain,end_for,end_while,end') -" -" Fifth, set the data set 'b:allStmts' to the concatenation of the third and -" fourth data sets, used for checking when more than one keyword/expression -" is on a line. -" -"call GenericAllStmts() -" -" NOTE: GenericIndentStmts uses two variables: 'b:indentStmtOpen' and -" 'b:indentStmtClose' which default to '\<' and '\>' respectively. You can -" set (let) these to any value you wish before calling GenericIndentStmts with -" your list. Similarly, GenericDedentStmts uses 'b:dedentStmtOpen' and -" 'b:dedentStmtClose'. -" -" NOTE: Patterns may be used in the lists passed to Generic[In|De]dentStmts -" since each element in the list is copied verbatim. -" -" Optionally, you can set the DEBUGGING flag within your script to have the -" debugging messages output. See below for description. This can also be set -" (let) from the command line within your editing buffer. -" -"let b:DEBUGGING=1 -" -" See: -" :h runtime -" :set runtimepath ? -" to familiarize yourself with how this works and where you should have this -" file and your file(s) installed. -" -" For help with setting 'indentkeys' see: -" :h indentkeys -" Also, for some good examples see 'indent/sh.vim' and 'indent/vim.vim' as -" well as files for other languages you may be familiar with. -" -" -" Alternatively, if you'd rather specify yourself, you can enter -" 'b:indentStmts', 'b:dedentStmts', and 'b:allStmts' 'literally': -" -"let b:indentStmts='\\|\\|\\|\\|\\|\\|\\|\\|\\|\' -"let b:dedentStmts='\\|\\|\\|\\|\\|\\|\\|\\|\\|\\|\' -"let b:allStmts=b:indentStmts.'\|'.b:dedentStmts -" -" This is only useful if you have particularly different parameters for -" matching each statement. - -" RECAP: From indent/MuPAD_source.vim -" -"if exists("b:did_indent") | finish | endif -" -"let b:did_indent = 1 -" -"runtime indent/GenericIndent.vim -" -"setlocal indentexpr=GenericIndent() -"setlocal indentkeys==end_proc,=then,=else,=elif,=end_if,=end_case,=until,=end_repeat,=end_domain,=end_for,=end_while,=end,o,O -"call GenericIndentStmts('begin,if,then,else,elif,case,repeat,until,domain,do') -"call GenericDedentStmts('end_proc,then,else,elif,end_if,end_case,until,end_repeat,end_domain,end_for,end_while,end') -"call GenericAllStmts() -" -" END RECAP: - -let s:hit=0 -let s:lastVlnum=0 -let s:myScriptName=expand(":t") - -if exists("*GenericIndent") - finish -endif - -function GenericAllStmts() - let b:allStmts=b:indentStmts.'\|'.b:dedentStmts - call DebugGenericIndent(expand("").": "."b:indentStmts: ".b:indentStmts.", b:dedentStmts: ".b:dedentStmts.", b:allStmts: ".b:allStmts) -endfunction - -function GenericIndentStmts(stmts) - let Stmts=a:stmts - let Comma=match(Stmts,',') - if Comma == -1 || Comma == strlen(Stmts)-1 - echoerr "Must supply a comma separated list of at least 2 entries." - echoerr "Supplied list: <".Stmts.">" - return - endif - - if !exists("b:indentStmtOpen") - let b:indentStmtOpen='\<' - endif - if !exists("b:indentStmtClose") - let b:indentStmtClose='\>' - endif - if !exists("b:indentStmts") - let b:indentStmts='' - endif - if b:indentStmts != '' - let b:indentStmts=b:indentStmts.'\|' - endif - call DebugGenericIndent(expand("").": "."b:indentStmtOpen: ".b:indentStmtOpen.", b:indentStmtClose: ".b:indentStmtClose.", b:indentStmts: ".b:indentStmts.", Stmts: ".Stmts) - let stmtEntryBegin=0 - let stmtEntryEnd=Comma - let stmtEntry=strpart(Stmts,stmtEntryBegin,stmtEntryEnd-stmtEntryBegin) - let Stmts=strpart(Stmts,Comma+1) - let Comma=match(Stmts,',') - let b:indentStmts=b:indentStmts.b:indentStmtOpen.stmtEntry.b:indentStmtClose - while Comma != -1 - let stmtEntryEnd=Comma - let stmtEntry=strpart(Stmts,stmtEntryBegin,stmtEntryEnd-stmtEntryBegin) - let Stmts=strpart(Stmts,Comma+1) - let Comma=match(Stmts,',') - let b:indentStmts=b:indentStmts.'\|'.b:indentStmtOpen.stmtEntry.b:indentStmtClose - endwhile - let stmtEntry=Stmts - let b:indentStmts=b:indentStmts.'\|'.b:indentStmtOpen.stmtEntry.b:indentStmtClose -endfunction - -function GenericDedentStmts(stmts) - let Stmts=a:stmts - let Comma=match(Stmts,',') - if Comma == -1 || Comma == strlen(Stmts)-1 - echoerr "Must supply a comma separated list of at least 2 entries." - echoerr "Supplied list: <".Stmts.">" - return - endif - - if !exists("b:dedentStmtOpen") - let b:dedentStmtOpen='\<' - endif - if !exists("b:dedentStmtClose") - let b:dedentStmtClose='\>' - endif - if !exists("b:dedentStmts") - let b:dedentStmts='' - endif - if b:dedentStmts != '' - let b:dedentStmts=b:dedentStmts.'\|' - endif - call DebugGenericIndent(expand("").": "."b:dedentStmtOpen: ".b:dedentStmtOpen.", b:dedentStmtClose: ".b:dedentStmtClose.", b:dedentStmts: ".b:dedentStmts.", Stmts: ".Stmts) - let stmtEntryBegin=0 - let stmtEntryEnd=Comma - let stmtEntry=strpart(Stmts,stmtEntryBegin,stmtEntryEnd-stmtEntryBegin) - let Stmts=strpart(Stmts,Comma+1) - let Comma=match(Stmts,',') - let b:dedentStmts=b:dedentStmts.b:dedentStmtOpen.stmtEntry.b:dedentStmtClose - while Comma != -1 - let stmtEntryEnd=Comma - let stmtEntry=strpart(Stmts,stmtEntryBegin,stmtEntryEnd-stmtEntryBegin) - let Stmts=strpart(Stmts,Comma+1) - let Comma=match(Stmts,',') - let b:dedentStmts=b:dedentStmts.'\|'.b:dedentStmtOpen.stmtEntry.b:dedentStmtClose - endwhile - let stmtEntry=Stmts - let b:dedentStmts=b:dedentStmts.'\|'.b:dedentStmtOpen.stmtEntry.b:dedentStmtClose -endfunction - -" Debugging function. Displays messages in the command area which can be -" reviewed using ':messages'. To turn it on use ':let b:DEBUGGING=1'. Once -" on, turn off by using ':let b:DEBUGGING=0. If you don't want it at all and -" feel it's slowing down your editing (you must have an _awfully_ slow -" machine!;-> ), you can just comment out the calls to it from 'GenericIndent' -" below. No need to remove the function or the calls, tho', as you never can -" tell when they might come in handy!;-) -function DebugGenericIndent(msg) - if exists("b:DEBUGGING") && b:DEBUGGING - echomsg '['.s:hit.']'.s:myScriptName."::".a:msg - endif -endfunction - -function GenericIndent() - " save ignore case option. Have to set noignorecase for the match - " functions to do their job the way we want them to! - " NOTE: if you add a return to this function be sure you do - " if IgnoreCase | set ignorecase | endif - " before returning. You can just cut and paste from here. - let IgnoreCase=&ignorecase - " let b:case_insensitive=1 if you want to ignore case, e.g. DOS batch files - if !exists("b:case_insensitive") - set noignorecase - endif - " this is used to let DebugGenericIndent display which invocation of the - " function goes with which messages. - let s:hit=s:hit+1 - let lnum=v:lnum - let cline=getline(lnum) - let lnum=prevnonblank(lnum) - if lnum==0 | if IgnoreCase | set ignorecase | endif | return 0 | endif - let pline=getline(lnum) - let ndnt=indent(lnum) - if !exists("b:allStmts") - call GenericAllStmts() - endif - - call DebugGenericIndent(expand("").": "."cline=<".cline.">, pline=<".pline.">, lnum=".lnum.", v:lnum=".v:lnum.", ndnt=".ndnt) - if lnum==v:lnum - " current line, only check dedent - " - " just dedented this line, don't need to do it again. - " another dedentStmts was added or an end%[_*] was completed. - if s:lastVlnum==v:lnum - if IgnoreCase | set ignorecase | endif - return ndnt - endif - let s:lastVlnum=v:lnum - call DebugGenericIndent(expand("").": "."Checking dedent") - let srcStr=cline - let dedentKeyBegin=match(srcStr,b:dedentStmts) - if dedentKeyBegin != -1 - let dedentKeyEnd=matchend(srcStr,b:dedentStmts) - let dedentKeyStr=strpart(srcStr,dedentKeyBegin,dedentKeyEnd-dedentKeyBegin) - "only dedent if it's the beginning of the line - if match(srcStr,'^\s*\<'.dedentKeyStr.'\>') != -1 - call DebugGenericIndent(expand("").": "."It's the beginning of the line, dedent") - let ndnt=ndnt-&shiftwidth - endif - endif - call DebugGenericIndent(expand("").": "."dedent - returning ndnt=".ndnt) - else - " previous line, only check indent - call DebugGenericIndent(expand("").": "."Checking indent") - let srcStr=pline - let indentKeyBegin=match(srcStr,b:indentStmts) - if indentKeyBegin != -1 - " only indent if it's the last indentStmts in the line - let allKeyBegin=match(srcStr,b:allStmts) - let allKeyEnd=matchend(srcStr,b:allStmts) - let allKeyStr=strpart(srcStr,allKeyBegin,allKeyEnd-allKeyBegin) - let srcStr=strpart(srcStr,allKeyEnd) - let allKeyBegin=match(srcStr,b:allStmts) - if allKeyBegin != -1 - " not the end of the line, check what is and only indent if - " it's an indentStmts - call DebugGenericIndent(expand("").": "."Multiple words in line, checking if last is indent") - while allKeyBegin != -1 - let allKeyEnd=matchend(srcStr,b:allStmts) - let allKeyStr=strpart(srcStr,allKeyBegin,allKeyEnd-allKeyBegin) - let srcStr=strpart(srcStr,allKeyEnd) - let allKeyBegin=match(srcStr,b:allStmts) - endwhile - if match(b:indentStmts,allKeyStr) != -1 - call DebugGenericIndent(expand("").": "."Last word in line is indent") - let ndnt=ndnt+&shiftwidth - endif - else - " it's the last indentStmts in the line, go ahead and indent - let ndnt=ndnt+&shiftwidth - endif - endif - call DebugGenericIndent(expand("").": "."indent - returning ndnt=".ndnt) - endif - if IgnoreCase | set ignorecase | endif - return ndnt -endfunction - - -" TODO: I'm open! -" -" BUGS: You tell me! Probably. I just haven't found one yet or haven't been -" told about one. -" diff --git a/runtime/indent/haml.vim b/runtime/indent/haml.vim index 079bd0513b..58c0307204 100644 --- a/runtime/indent/haml.vim +++ b/runtime/indent/haml.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Haml " Maintainer: Tim Pope -" Last Change: 2008 Sep 11 +" Last Change: 2010 May 21 if exists("b:did_indent") finish diff --git a/runtime/indent/mupad.vim b/runtime/indent/mupad.vim deleted file mode 100644 index 307aaf047f..0000000000 --- a/runtime/indent/mupad.vim +++ /dev/null @@ -1,35 +0,0 @@ -" Vim indent file -" Language: MuPAD source files -" Maintainer: Dave Silvia -" Filenames: *.mu -" Date: 6/30/2004 - -if exists("b:did_indent") - finish -endif - -let b:did_indent = 1 - -runtime indent/GenericIndent.vim - -let b:indentStmts='' -let b:dedentStmts='' -let b:allStmts='' -" NOTE: b:indentStmts, b:dedentStmts, and b:allStmts need to be initialized -" to '' before callin the functions because 'indent.vim' explicitly -" 'unlet's b:did_indent. This means that the lists will compound if -" you change back and forth between buffers. This is true as of -" version 6.3, 6/23/2004. -setlocal indentexpr=GenericIndent() -setlocal indentkeys==end_proc,=then,=else,=elif,=end_if,=end_case,=until,=end_repeat,=end_domain,=end_for,=end_while,=end,o,O - -call GenericIndentStmts('begin,if,then,else,elif,case,repeat,until,domain,do') -call GenericDedentStmts('end_proc,then,else,elif,end_if,end_case,until,end_repeat,end_domain,end_for,end_while,end') -call GenericAllStmts() - - -" TODO: More comprehensive indentstmt, dedentstmt, and indentkeys values. -" -" BUGS: You tell me! Probably. I just haven't found one yet or haven't been -" told about one. -" diff --git a/runtime/indent/perl.vim b/runtime/indent/perl.vim index b3a9fc0214..0eb95e3afb 100644 --- a/runtime/indent/perl.vim +++ b/runtime/indent/perl.vim @@ -2,11 +2,12 @@ " Language: Perl " Author: Rafael Garcia-Suarez " URL: http://rgarciasuarez.free.fr/vim/indent/perl.vim -" Last Change: 2005 Sep 07 +" Last Change: 2010 Jul 28 " Suggestions and improvements by : " Aaron J. Sherman (use syntax for hints) " Artem Chuprina (play nice with folding) +" Benjamin R. Haskell (fold syntax group fix) " TODO things that are not or not properly indented (yet) : " - Continued statements @@ -133,7 +134,7 @@ function GetPerlIndent() \ || synid == "perlMatchStartEnd" \ || synid == "perlHereDoc" \ || synid =~ "^perlFiledescStatement" - \ || synid =~ '^perl\(Sub\|BEGINEND\|If\)Fold' + \ || synid =~ '^perl\(Sub\|Block\)Fold' let brace = strpart(line, bracepos, 1) if brace == '(' || brace == '{' let ind = ind + &sw @@ -148,7 +149,7 @@ function GetPerlIndent() let synid = synIDattr(synID(v:lnum, bracepos, 0), "name") if synid == "" \ || synid == "perlMatchStartEnd" - \ || synid =~ '^perl\(Sub\|BEGINEND\|If\)Fold' + \ || synid =~ '^perl\(Sub\|Block\)Fold' let ind = ind - &sw endif endif diff --git a/runtime/indent/php.vim b/runtime/indent/php.vim index 9f1a1ed9d3..bc196ed3c4 100644 --- a/runtime/indent/php.vim +++ b/runtime/indent/php.vim @@ -2,12 +2,13 @@ " Language: PHP " Author: John Wellesz " URL: http://www.2072productions.com/vim/indent/php.vim -" Last Change: 2008 November 22nd -" Newsletter: http://www.2072productions.com/?to=php-indent-for-vim-newsletter.php -" Version: 1.30 +" Last Change: 2010 Jully 26th +" Newsletter: http://www.2072productions.com/?to=php-indent-for-vim-newsletter.php +" Version: 1.33 " " -" If you find a bug, please e-mail me at John.wellesz (AT) teaser (DOT) fr +" If you find a bug, please report it on GitHub: +" http://github.com/2072/PHP-Indenting-for-VIm/issues " with an example of code that breaks the algorithm. " " @@ -15,7 +16,7 @@ " " " NOTE: This script must be used with PHP syntax ON and with the php syntax -" script by Lutz Eymers (http://www.isp.de/data/php.vim ) or with the +" script by Lutz Eymers (http://www.ipdienste.net/data/php.vim ) or with the " script by Peter Hodge (http://www.vim.org/scripts/script.php?script_id=1571 ) " the later is bunbdled by default with Vim 7. " @@ -68,8 +69,15 @@ else let b:PHP_autoformatcomment = 1 endif -if exists("PHP_vintage_case_default_indent") - let b:PHP_vintage_case_default_indent = PHP_vintage_case_default_indent +if exists("PHP_outdentphpescape") + let b:PHP_outdentphpescape = PHP_outdentphpescape +else + let b:PHP_outdentphpescape = 1 +endif + + +if exists("PHP_vintage_case_default_indent") && PHP_vintage_case_default_indent + let b:PHP_vintage_case_default_indent = 1 else let b:PHP_vintage_case_default_indent = 0 endif @@ -108,12 +116,11 @@ endif if exists("*GetPhpIndent") call ResetPhpOptions() - finish " XXX + finish endif let s:endline= '\s*\%(//.*\|#.*\|/\*.*\*/\s*\)\=$' let s:PHP_startindenttag = '\)\@!\|]*>\%(.*<\/script>\)\@!' -"setlocal debug=msg " XXX function! GetLastRealCodeLNum(startline) " {{{ @@ -164,8 +171,8 @@ function! GetLastRealCodeLNum(startline) " {{{ endif - elseif lastline =~? '^\a\w*;\=$' && lastline !~? s:notPhpHereDoc " XXX 0607 - let tofind=substitute( lastline, '\(\a\w*\);\=', '<<<''\\=\1''\\=$', '') " XXX 0607 + elseif lastline =~? '^\a\w*;\=$' && lastline !~? s:notPhpHereDoc + let tofind=substitute( lastline, '\(\a\w*\);\=', '<<<''\\=\1''\\=$', '') while getline(lnum) !~? tofind && lnum > 1 let lnum = lnum - 1 endwhile @@ -174,7 +181,7 @@ function! GetLastRealCodeLNum(startline) " {{{ endif endwhile - if lnum==1 && getline(lnum)!~ '' && beforeelse>1 || s:iftoskip && beforeelse>1 - if s:iftoskip && getline(beforeelse) =~# '^\s*if\>' + if s:iftoskip && getline(beforeelse) =~# '^\s*if\>' let s:iftoskip = s:iftoskip - 1 endif @@ -255,6 +262,36 @@ function! FindTheIfOfAnElse (lnum, StopAfterFirstPrevElse) " {{{ endfunction " }}} +let s:defaultORcase = '^\s*\%(default\|case\).*:' + +function! FindTheSwitchIndent (lnum) " {{{ + + + let test = GetLastRealCodeLNum(a:lnum - 1) + + if test <= 1 + return indent(1) - &sw * b:PHP_vintage_case_default_indent + end + + if getline(test) =~ '^\s*}' + let test = FindOpenBracket(test) + + if getline(test) =~ '^\s*{' + let test = GetLastRealCodeLNum(GetLastRealCodeLNum(test - 1) - 1) + endif + endif + + if getline(test) =~# '^\s*switch\>' + return indent(test) + elseif getline(test) =~# s:defaultORcase + return indent(test) - &sw * b:PHP_vintage_case_default_indent + else + return FindTheSwitchIndent(test) + endif + +endfunction "}}} + + function! IslinePHP (lnum, tofind) " {{{ let cline = getline(a:lnum) @@ -278,7 +315,7 @@ function! IslinePHP (lnum, tofind) " {{{ endfunction " }}} let s:notPhpHereDoc = '\%(break\|return\|continue\|exit\|else\)' -let s:blockstart = '\%(\%(\%(}\s*\)\=else\%(\s\+\)\=\)\=if\>\|else\>\|while\>\|switch\>\|for\%(each\)\=\>\|declare\>\|class\>\|interface\>\|abstract\>\|try\>\|catch\>\)' +let s:blockstart = '\%(\%(\%(}\s*\)\=else\%(\s\+\)\=\)\=if\>\|else\>\|while\>\|switch\>\|case\>\|default\>\|for\%(each\)\=\>\|declare\>\|class\>\|interface\>\|abstract\>\|try\>\|catch\>\)' let s:autoresetoptions = 0 if ! s:autoresetoptions @@ -286,7 +323,7 @@ if ! s:autoresetoptions endif function! ResetPhpOptions() - if ! b:optionsset && &filetype == "php" + if ! b:optionsset && &filetype == "php" if b:PHP_autoformatcomment setlocal comments=s1:/*,mb:*,ex:*/,://,:# @@ -324,7 +361,7 @@ function! GetPhpIndent() if !b:PHP_indentinghuge && b:PHP_lastindented > b:PHP_indentbeforelast if b:PHP_indentbeforelast let b:PHP_indentinghuge = 1 - echom 'Large indenting detected, speed optimizations engaged (v1.30)' + echom 'Large indenting detected, speed optimizations engaged (v1.33)' endif let b:PHP_indentbeforelast = b:PHP_lastindented endif @@ -383,7 +420,7 @@ function! GetPhpIndent() let lnum = lnum - 1 endwhile - let b:InPHPcode_tofind = substitute( getline(lnum), '^.*<<<''\=\(\a\w*\)''\=$', '^\\s*\1;\\=$', '') " XXX 0607 + let b:InPHPcode_tofind = substitute( getline(lnum), '^.*<<<''\=\(\a\w*\)''\=$', '^\\s*\1;\\=$', '') endif else let b:InPHPcode = 0 @@ -399,7 +436,7 @@ function! GetPhpIndent() if b:InPHPcode_tofind!="" if cline =~? b:InPHPcode_tofind - let b:InPHPcode = 1 + let b:InPHPcode = 1 let b:InPHPcode_tofind = "" let b:UserIsTypingComment = 0 if cline =~ '\*/' @@ -436,9 +473,9 @@ function! GetPhpIndent() let b:InPHPcode_and_script = 1 endif - elseif last_line =~? '<<<''\=\a\w*''\=$' " XXX 0607 + elseif last_line =~? '<<<''\=\a\w*''\=$' let b:InPHPcode = 0 - let b:InPHPcode_tofind = substitute( last_line, '^.*<<<''\=\(\a\w*\)''\=$', '^\\s*\1;\\=$', '') " XXX 0607 + let b:InPHPcode_tofind = substitute( last_line, '^.*<<<''\=\(\a\w*\)''\=$', '^\\s*\1;\\=$', '') elseif !UserIsEditing && cline =~ '^\s*/\*\%(.*\*/\)\@!' && getline(v:lnum + 1) !~ '^\s*\*' let b:InPHPcode = 0 @@ -488,15 +525,15 @@ function! GetPhpIndent() " Things always indented at col 1 (PHP delimiter: , Heredoc end) {{{ - if cline =~# '^\s*' + if cline =~# '^\s*' && b:PHP_outdentphpescape return 0 endif - if cline =~ '^\s*?>' && cline !~# '' && cline !~# '\)\=\|<<<''\=\a\w*''\=$\|^\s*}\)'.endline " XXX 0607 + let terminated = '\%(;\%(\s*?>\)\=\|<<<''\=\a\w*''\=$\|^\s*}\)'.endline let unstated = '\%(^\s*'.s:blockstart.'.*)\|\%(//.*\)\@\)'.endline if ind != b:PHP_default_indenting && cline =~# '^\s*else\%(if\)\=\>' let b:PHP_CurrentIndentLevel = b:PHP_default_indenting return indent(FindTheIfOfAnElse(v:lnum, 1)) + elseif cline =~# s:defaultORcase + return FindTheSwitchIndent(v:lnum) + &sw * b:PHP_vintage_case_default_indent elseif cline =~ '^\s*)\=\s*{' let previous_line = last_line let last_line_num = lnum @@ -580,10 +618,10 @@ function! GetPhpIndent() endwhile elseif last_line =~# unstated && cline !~ '^\s*);\='.endline - let ind = ind + &sw " we indent one level further when the preceding line is not stated + let ind = ind + &sw return ind - elseif (ind != b:PHP_default_indenting || last_line =~ '^)' ) && last_line =~ terminated " Added || last_line =~ '^)' on 2007-12-30 (array indenting [rpblem broke other things) + elseif (ind != b:PHP_default_indenting || last_line =~ '^)' ) && last_line =~ terminated let previous_line = last_line let last_line_num = lnum let LastLineClosed = 1 @@ -616,7 +654,7 @@ function! GetPhpIndent() let previous_line = getline(last_line_num) - if previous_line =~# defaultORcase.'\|{'.endline + if previous_line =~# s:defaultORcase.'\|{'.endline break endif @@ -636,15 +674,12 @@ function! GetPhpIndent() let ind = indent(last_match) let b:PHP_CurrentIndentLevel = b:PHP_default_indenting - if cline =~# defaultORcase - let ind = ind - &sw - endif return ind endif endif let plinnum = GetLastRealCodeLNum(lnum - 1) - let pline = getline(plinnum) + let AntepenultimateLine = getline(plinnum) let last_line = substitute(last_line,"\\(//\\|#\\)\\(\\(\\([^\"']*\\([\"']\\)[^\"']*\\5\\)\\+[^\"']*$\\)\\|\\([^\"']*$\\)\\)",'','') @@ -658,13 +693,13 @@ function! GetPhpIndent() if !LastLineClosed - if last_line =~# '[{(]'.endline || last_line =~? '\h\w*\s*(.*,$' && pline !~ '[,(]'.endline + if last_line =~# '[{(]'.endline || last_line =~? '\h\w*\s*(.*,$' && AntepenultimateLine !~ '[,(]'.endline if !b:PHP_BracesAtCodeLevel || last_line !~# '^\s*{' let ind = ind + &sw endif - if b:PHP_BracesAtCodeLevel || b:PHP_vintage_case_default_indent == 1 || cline !~# defaultORcase + if b:PHP_BracesAtCodeLevel || b:PHP_vintage_case_default_indent == 1 let b:PHP_CurrentIndentLevel = ind return ind @@ -677,15 +712,13 @@ function! GetPhpIndent() if openedparent != lnum let ind = indent(openedparent) endif + elseif last_line =~ '^\s*'.s:blockstart let ind = ind + &sw - elseif last_line =~# defaultORcase && cline !~# defaultORcase - let ind = ind + &sw - elseif pline =~ '\%(;\%(\s*?>\)\=\|<<<''\=\a\w*''\=$\|^\s*}\|{\)'.endline . '\|' . defaultORcase && cline !~# defaultORcase - + elseif AntepenultimateLine =~ '\%(;\%(\s*?>\)\=\|<<<''\=\a\w*''\=$\|^\s*}\|{\)'.endline . '\|' . s:defaultORcase let ind = ind + &sw endif @@ -693,9 +726,6 @@ function! GetPhpIndent() if cline =~ '^\s*);\=' let ind = ind - &sw - elseif cline =~# defaultORcase && last_line !~# defaultORcase - let ind = ind - &sw - endif let b:PHP_CurrentIndentLevel = ind diff --git a/runtime/indent/scss.vim b/runtime/indent/scss.vim new file mode 100644 index 0000000000..82bba4920b --- /dev/null +++ b/runtime/indent/scss.vim @@ -0,0 +1,12 @@ +" Vim indent file +" Language: SCSS +" Maintainer: Tim Pope +" Last Change: 2010 Jul 26 + +if exists("b:did_indent") + finish +endif + +runtime! indent/css.vim + +" vim:set sw=2: diff --git a/runtime/indent/vb.vim b/runtime/indent/vb.vim index 85021bd7d9..55a8ea302a 100644 --- a/runtime/indent/vb.vim +++ b/runtime/indent/vb.vim @@ -2,6 +2,7 @@ " Language: VisualBasic (ft=vb) / Basic (ft=basic) / SaxBasic (ft=vb) " Author: Johannes Zellner " Last Change: Fri, 18 Jun 2004 07:22:42 CEST +" Small update 2010 Jul 28 by Maxim Kim if exists("b:did_indent") finish @@ -47,7 +48,7 @@ fun! VbGetIndent(lnum) let ind = indent(lnum) " Add - if previous_line =~? '^\s*\<\(begin\|\%(\%(private\|public\|friend\)\s\+\)\=\%(function\|sub\|property\)\|select\|case\|default\|if\>.\{-}\\s*$\|else\|elseif\|do\|for\|while\|enum\|with\)\>' + if previous_line =~? '^\s*\<\(begin\|\%(\%(private\|public\|friend\)\s\+\)\=\%(function\|sub\|property\)\|select\|case\|default\|if\|else\|elseif\|do\|for\|while\|enum\|with\)\>' let ind = ind + &sw endif @@ -63,7 +64,7 @@ fun! VbGetIndent(lnum) " end select let ind = ind - &sw endif - elseif this_line =~? '^\s*\<\(end\|else\|until\|loop\|next\|wend\)\>' + elseif this_line =~? '^\s*\<\(end\|else\|elseif\|until\|loop\|next\|wend\)\>' let ind = ind - &sw elseif this_line =~? '^\s*\<\(case\|default\)\>' if previous_line !~? '^\s*\' @@ -73,3 +74,5 @@ fun! VbGetIndent(lnum) return ind endfun + +" vim:sw=4 diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim index d728f77cbf..5b6f6d379f 100644 --- a/runtime/makemenu.vim +++ b/runtime/makemenu.vim @@ -1,6 +1,6 @@ " Script to define the syntax menu in synmenu.vim " Maintainer: Bram Moolenaar -" Last Change: 2008 Jul 13 +" Last Change: 2010 Jul 26 " This is used by "make menu" in the src directory. edit :p:h/synmenu.vim @@ -443,6 +443,7 @@ SynMenu S-Sm.Sather:sather SynMenu S-Sm.Scheme:scheme SynMenu S-Sm.Scilab:scilab SynMenu S-Sm.Screen\ RC:screen +SynMenu S-Sm.SCSS:scss SynMenu S-Sm.SDC\ Synopsys\ Design\ Constraints:sdc SynMenu S-Sm.SDL:sdl SynMenu S-Sm.Sed:sed diff --git a/runtime/plugin/netrwPlugin.vim b/runtime/plugin/netrwPlugin.vim index f968964950..3ce710b0ad 100644 --- a/runtime/plugin/netrwPlugin.vim +++ b/runtime/plugin/netrwPlugin.vim @@ -1,6 +1,6 @@ " netrwPlugin.vim: Handles file transfer and remote directory listing across a network " PLUGIN SECTION -" Date: Aug 10, 2008 +" Date: Jul 27, 2010 " Maintainer: Charles E Campbell, Jr " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim " Copyright: Copyright (C) 1999-2008 Charles E. Campbell, Jr. {{{1 @@ -20,7 +20,7 @@ if &cp || exists("g:loaded_netrwPlugin") finish endif -let g:loaded_netrwPlugin = "v138" +let g:loaded_netrwPlugin = "v140" if v:version < 702 echohl WarningMsg | echo "***netrw*** you need vim version 7.2 for this version of netrw" | echohl None finish @@ -81,7 +81,7 @@ com! -nargs=0 NetrwSettings call netrwSettings#NetrwSettings() com! -bang NetrwClean call netrw#NetrwClean(0) " Maps: -if !exists("g:netrw_nogx") && maparg('g','n') == "" +if !exists("g:netrw_nogx") && maparg('gx','n') == "" if !hasmapto('NetrwBrowseX') nmap gx NetrwBrowseX endif @@ -112,8 +112,9 @@ endfun " --------------------------------------------------------------------- " s:VimEnter: {{{2 fun! s:VimEnter(dirname) + let curwin= winnr() windo if a:dirname != expand("%")|call s:LocalBrowse(expand("%:p"))|endif - 1wincmd w + exe curwin."wincmd w" endfun " --------------------------------------------------------------------- diff --git a/runtime/plugin/tarPlugin.vim b/runtime/plugin/tarPlugin.vim index 8232b46d56..42d6f4fc13 100644 --- a/runtime/plugin/tarPlugin.vim +++ b/runtime/plugin/tarPlugin.vim @@ -14,7 +14,7 @@ if &cp || exists("g:loaded_tarPlugin") finish endif -let g:loaded_tarPlugin = "v24" +let g:loaded_tarPlugin = "v25" let s:keepcpo = &cpo set cpo&vim @@ -41,6 +41,8 @@ augroup tar au BufReadCmd *.tar.Z call tar#Browse(expand("")) au BufReadCmd *.tgz call tar#Browse(expand("")) au BufReadCmd *.tar.lzma call tar#Browse(expand("")) + au BufReadCmd *.tar.xz call tar#Browse(expand("")) + au BufReadCmd *.txz call tar#Browse(expand("")) augroup END com! -nargs=? -complete=file Vimuntar call tar#Vimuntar() diff --git a/runtime/plugin/tohtml.vim b/runtime/plugin/tohtml.vim index 867b85d40d..5ef59ca5ad 100644 --- a/runtime/plugin/tohtml.vim +++ b/runtime/plugin/tohtml.vim @@ -1,14 +1,22 @@ " Vim plugin for converting a syntax highlighted file to HTML. " Maintainer: Ben Fritz -" Last Change: 2010 July 24 +" Last Change: 2010 Jul 28 " " The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and " $VIMRUNTIME/syntax/2html.vim +" +" TODO: +" * Diff mode with xhtml gives invalid markup +" * Diff mode does not determine encoding +" * Line number column has one character too few on empty lines +" without CSS. +" * Add extra meta info (generation time, etc.) +" * TODO comments for code cleanup scattered throughout if exists('g:loaded_2html_plugin') finish endif -let g:loaded_2html_plugin = 'vim7.3_v1' +let g:loaded_2html_plugin = 'vim7.3_v2' " Define the :TOhtml command when: " - 'compatible' is not set diff --git a/runtime/scripts.vim b/runtime/scripts.vim index 0b3b135798..e30b5c43fb 100644 --- a/runtime/scripts.vim +++ b/runtime/scripts.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types in scripts " " Maintainer: Bram Moolenaar -" Last change: 2009 Dec 24 +" Last change: 2010 Jul 29 " This file is called by an autocommand for every file that has just been " loaded into a buffer. It checks if the type of file can be recognized by @@ -100,6 +100,10 @@ if s:line1 =~ "^#!" elseif s:name =~ 'lua' set ft=lua + " Perl 6 + elseif s:name =~ 'perl6' + set ft=perl6 + " Perl elseif s:name =~ 'perl' set ft=perl diff --git a/runtime/spell/README_en.txt b/runtime/spell/README_en.txt index f8513286ab..52c27440d0 100644 --- a/runtime/spell/README_en.txt +++ b/runtime/spell/README_en.txt @@ -174,8 +174,8 @@ Inflections database, is under the following copyright: any associated documentation shall at all times remain with Princeton University and LICENSEE agrees to preserve same. -The 50 level includes Brian's frequency class 1, words words appearing -in at least 5 of 12 of the dictionaries as indicated in the 12Dicts +The 50 level includes Brian's frequency class 1, words appearing in +at least 5 of 12 of the dictionaries as indicated in the 12Dicts package, and uppercase words in at least 4 of the previous 12 dictionaries. A decent number of proper names is also included: The top 1000 male, female, and Last names from the 1990 Census report; a @@ -217,7 +217,7 @@ list has the following copyright statement: (NO-)WARRANTY DISCLAIMER These files, like the original wordlists on which they are based, - are still very incomplete, uneven, and inconsitent, and probably + are still very incomplete, uneven, and inconsistent, and probably contain many errors. They are offered "as is" without any warranty of correctness or fitness for any particular purpose. Neither I nor my employer can be held responsible for any losses or damages that @@ -336,9 +336,8 @@ Accent information was taken from UKACD. My VARCON package was used to create the American, British, and Canadian word list. -Since the original word lists used used in the -VARCON package came from the Ispell distribution they are under the -Ispell copyright. +Since the original word lists used in the VARCON package came from +the Ispell distribution they are under the Ispell copyright. The variant word lists were created from a list of variants found in the 12dicts supplement package as well as a list of variants I created diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim index cebac66327..6c42ba4058 100644 --- a/runtime/synmenu.vim +++ b/runtime/synmenu.vim @@ -2,7 +2,7 @@ " This file is normally sourced from menu.vim. " " Maintainer: Bram Moolenaar -" Last Change: 2006 Apr 27 +" Last Change: 2010 Jul 26 " Define the SetSyn function, used for the Syntax menu entries. " Set 'filetype' and also 'syntax' if it is manually selected. @@ -417,41 +417,42 @@ an 50.110.140 &Syntax.S-Sm.Sather :cal SetSyn("sather") an 50.110.150 &Syntax.S-Sm.Scheme :cal SetSyn("scheme") an 50.110.160 &Syntax.S-Sm.Scilab :cal SetSyn("scilab") an 50.110.170 &Syntax.S-Sm.Screen\ RC :cal SetSyn("screen") -an 50.110.180 &Syntax.S-Sm.SDC\ Synopsys\ Design\ Constraints :cal SetSyn("sdc") -an 50.110.190 &Syntax.S-Sm.SDL :cal SetSyn("sdl") -an 50.110.200 &Syntax.S-Sm.Sed :cal SetSyn("sed") -an 50.110.210 &Syntax.S-Sm.Sendmail\.cf :cal SetSyn("sm") -an 50.110.220 &Syntax.S-Sm.Send-pr :cal SetSyn("sendpr") -an 50.110.230 &Syntax.S-Sm.Sensors\.conf :cal SetSyn("sensors") -an 50.110.240 &Syntax.S-Sm.Service\ Location\ config :cal SetSyn("slpconf") -an 50.110.250 &Syntax.S-Sm.Service\ Location\ registration :cal SetSyn("slpreg") -an 50.110.260 &Syntax.S-Sm.Service\ Location\ SPI :cal SetSyn("slpspi") -an 50.110.270 &Syntax.S-Sm.Services :cal SetSyn("services") -an 50.110.280 &Syntax.S-Sm.Setserial\ config :cal SetSyn("setserial") -an 50.110.290 &Syntax.S-Sm.SGML.SGML\ catalog :cal SetSyn("catalog") -an 50.110.300 &Syntax.S-Sm.SGML.SGML\ DTD :cal SetSyn("sgml") -an 50.110.310 &Syntax.S-Sm.SGML.SGML\ Declaration :cal SetSyn("sgmldecl") -an 50.110.320 &Syntax.S-Sm.SGML.SGML-linuxdoc :cal SetSyn("sgmllnx") -an 50.110.330 &Syntax.S-Sm.Shell\ script.sh\ and\ ksh :cal SetSyn("sh") -an 50.110.340 &Syntax.S-Sm.Shell\ script.csh :cal SetSyn("csh") -an 50.110.350 &Syntax.S-Sm.Shell\ script.tcsh :cal SetSyn("tcsh") -an 50.110.360 &Syntax.S-Sm.Shell\ script.zsh :cal SetSyn("zsh") -an 50.110.370 &Syntax.S-Sm.SiCAD :cal SetSyn("sicad") -an 50.110.380 &Syntax.S-Sm.Sieve :cal SetSyn("sieve") -an 50.110.390 &Syntax.S-Sm.Simula :cal SetSyn("simula") -an 50.110.400 &Syntax.S-Sm.Sinda.Sinda\ compare :cal SetSyn("sindacmp") -an 50.110.410 &Syntax.S-Sm.Sinda.Sinda\ input :cal SetSyn("sinda") -an 50.110.420 &Syntax.S-Sm.Sinda.Sinda\ output :cal SetSyn("sindaout") -an 50.110.430 &Syntax.S-Sm.SiSU :cal SetSyn("sisu") -an 50.110.440 &Syntax.S-Sm.SKILL.SKILL :cal SetSyn("skill") -an 50.110.450 &Syntax.S-Sm.SKILL.SKILL\ for\ Diva :cal SetSyn("diva") -an 50.110.460 &Syntax.S-Sm.Slice :cal SetSyn("slice") -an 50.110.470 &Syntax.S-Sm.SLRN.Slrn\ rc :cal SetSyn("slrnrc") -an 50.110.480 &Syntax.S-Sm.SLRN.Slrn\ score :cal SetSyn("slrnsc") -an 50.110.490 &Syntax.S-Sm.SmallTalk :cal SetSyn("st") -an 50.110.500 &Syntax.S-Sm.Smarty\ Templates :cal SetSyn("smarty") -an 50.110.510 &Syntax.S-Sm.SMIL :cal SetSyn("smil") -an 50.110.520 &Syntax.S-Sm.SMITH :cal SetSyn("smith") +an 50.110.180 &Syntax.S-Sm.SCSS :cal SetSyn("scss") +an 50.110.190 &Syntax.S-Sm.SDC\ Synopsys\ Design\ Constraints :cal SetSyn("sdc") +an 50.110.200 &Syntax.S-Sm.SDL :cal SetSyn("sdl") +an 50.110.210 &Syntax.S-Sm.Sed :cal SetSyn("sed") +an 50.110.220 &Syntax.S-Sm.Sendmail\.cf :cal SetSyn("sm") +an 50.110.230 &Syntax.S-Sm.Send-pr :cal SetSyn("sendpr") +an 50.110.240 &Syntax.S-Sm.Sensors\.conf :cal SetSyn("sensors") +an 50.110.250 &Syntax.S-Sm.Service\ Location\ config :cal SetSyn("slpconf") +an 50.110.260 &Syntax.S-Sm.Service\ Location\ registration :cal SetSyn("slpreg") +an 50.110.270 &Syntax.S-Sm.Service\ Location\ SPI :cal SetSyn("slpspi") +an 50.110.280 &Syntax.S-Sm.Services :cal SetSyn("services") +an 50.110.290 &Syntax.S-Sm.Setserial\ config :cal SetSyn("setserial") +an 50.110.300 &Syntax.S-Sm.SGML.SGML\ catalog :cal SetSyn("catalog") +an 50.110.310 &Syntax.S-Sm.SGML.SGML\ DTD :cal SetSyn("sgml") +an 50.110.320 &Syntax.S-Sm.SGML.SGML\ Declaration :cal SetSyn("sgmldecl") +an 50.110.330 &Syntax.S-Sm.SGML.SGML-linuxdoc :cal SetSyn("sgmllnx") +an 50.110.340 &Syntax.S-Sm.Shell\ script.sh\ and\ ksh :cal SetSyn("sh") +an 50.110.350 &Syntax.S-Sm.Shell\ script.csh :cal SetSyn("csh") +an 50.110.360 &Syntax.S-Sm.Shell\ script.tcsh :cal SetSyn("tcsh") +an 50.110.370 &Syntax.S-Sm.Shell\ script.zsh :cal SetSyn("zsh") +an 50.110.380 &Syntax.S-Sm.SiCAD :cal SetSyn("sicad") +an 50.110.390 &Syntax.S-Sm.Sieve :cal SetSyn("sieve") +an 50.110.400 &Syntax.S-Sm.Simula :cal SetSyn("simula") +an 50.110.410 &Syntax.S-Sm.Sinda.Sinda\ compare :cal SetSyn("sindacmp") +an 50.110.420 &Syntax.S-Sm.Sinda.Sinda\ input :cal SetSyn("sinda") +an 50.110.430 &Syntax.S-Sm.Sinda.Sinda\ output :cal SetSyn("sindaout") +an 50.110.440 &Syntax.S-Sm.SiSU :cal SetSyn("sisu") +an 50.110.450 &Syntax.S-Sm.SKILL.SKILL :cal SetSyn("skill") +an 50.110.460 &Syntax.S-Sm.SKILL.SKILL\ for\ Diva :cal SetSyn("diva") +an 50.110.470 &Syntax.S-Sm.Slice :cal SetSyn("slice") +an 50.110.480 &Syntax.S-Sm.SLRN.Slrn\ rc :cal SetSyn("slrnrc") +an 50.110.490 &Syntax.S-Sm.SLRN.Slrn\ score :cal SetSyn("slrnsc") +an 50.110.500 &Syntax.S-Sm.SmallTalk :cal SetSyn("st") +an 50.110.510 &Syntax.S-Sm.Smarty\ Templates :cal SetSyn("smarty") +an 50.110.520 &Syntax.S-Sm.SMIL :cal SetSyn("smil") +an 50.110.530 &Syntax.S-Sm.SMITH :cal SetSyn("smith") an 50.120.100 &Syntax.Sn-Sy.SNMP\ MIB :cal SetSyn("mib") an 50.120.110 &Syntax.Sn-Sy.SNNS.SNNS\ network :cal SetSyn("snnsnet") an 50.120.120 &Syntax.Sn-Sy.SNNS.SNNS\ pattern :cal SetSyn("snnspat") diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim index 5094433cd6..cf4620e9e0 100644 --- a/runtime/syntax/2html.vim +++ b/runtime/syntax/2html.vim @@ -1,6 +1,6 @@ " Vim syntax support file " Maintainer: Ben Fritz -" Last Change: 2010 July 24 +" Last Change: 2010 Jul 28 " " Additional contributors: " @@ -129,10 +129,14 @@ endif " Return HTML valid characters enclosed in a span of class style_name with " unprintable characters expanded and double spaces replaced as necessary. -function! s:HtmlFormat(text, style_name) +function! s:HtmlFormat(text, style_name, diff_style_name) " Replace unprintable characters let formatted = strtrans(a:text) + " separate the two classes by a space to apply them both if there is a diff + " style name + let l:style_name = a:style_name . (a:diff_style_name == '' ? '' : ' ') . a:diff_style_name + " Replace the reserved html characters let formatted = substitute(substitute(substitute(substitute(substitute(formatted, '&', '\&', 'g'), '<', '\<', 'g'), '>', '\>', 'g'), '"', '\"', 'g'), "\x0c", '
', 'g') @@ -143,12 +147,26 @@ function! s:HtmlFormat(text, style_name) endif " Enclose in a span of class style_name - let formatted = '' . formatted . '' + let formatted = '' . formatted . '' - " Add the class to class list if it's not there yet + " Add the class to class list if it's not there yet. + " Add normal groups to the beginning so diff groups can override them. let s:id = hlID(a:style_name) - if stridx(s:idlist, "," . s:id . ",") == -1 - let s:idlist = s:idlist . s:id . "," + if index(s:idlist, s:id ) == -1 + if a:style_name =~ 'Diff\%(Add\|Change\|Delete\|Text\)' + call add(s:idlist, s:id) + else + call insert(s:idlist, s:id) + endif + endif + + " Add the diff highlight class to class list if used and it's not there yet. + " Add diff groups to the end so they override the other highlighting. + if a:diff_style_name != "" + let s:diff_id = hlID(a:diff_style_name) + if index(s:idlist, s:diff_id) == -1 + call add(s:idlist, s:diff_id) + endif endif return formatted @@ -437,7 +455,7 @@ endif exe s:orgwin . "wincmd w" " List of all id's -let s:idlist = "," +let s:idlist = [] " set up progress bar in the status line if !s:html_no_progress && has("statusline") @@ -702,7 +720,7 @@ while s:lnum <= s:end let s:new = s:new . repeat(s:difffillchar, 3) endif - let s:new = s:HtmlFormat(s:new, "DiffDelete") + let s:new = s:HtmlFormat(s:new, "DiffDelete", "") if s:numblines " Indent if line numbering is on; must be after escaping. let s:new = repeat(s:LeadingSpace, s:margin) . s:new @@ -734,7 +752,7 @@ while s:lnum <= s:end let s:new = s:new . repeat(s:foldfillchar, &columns - strlen(s:new)) endif - let s:new = s:HtmlFormat(s:new, "Folded") + let s:new = s:HtmlFormat(s:new, "Folded", "") " Skip to the end of the fold let s:new_lnum = foldclosedend(s:lnum) @@ -807,7 +825,7 @@ while s:lnum <= s:end " add fold text, moving the span ending to the next line so collapsing " of folds works correctly - let s:new = s:new . substitute(s:HtmlFormat(s:numcol . foldtextresult(s:lnum), "Folded"), '', s:HtmlEndline.'\n\0', '') + let s:new = s:new . substitute(s:HtmlFormat(s:numcol . foldtextresult(s:lnum), "Folded", ""), '', s:HtmlEndline.'\n\0', '') let s:new = s:new . "" " open the fold now that we have the fold text to allow retrieval of @@ -827,7 +845,7 @@ while s:lnum <= s:end " add the empty foldcolumn for unfolded lines if there is a fold " column at all if s:foldcolumn > 0 - let s:new = s:new . s:HtmlFormat(repeat(' ', s:foldcolumn), "FoldColumn") + let s:new = s:new . s:HtmlFormat(repeat(' ', s:foldcolumn), "FoldColumn", "") endif else " add the fold column for folds not on the opening line @@ -842,7 +860,8 @@ while s:lnum <= s:end " Now continue with the unfolded line text if s:numblines - let s:new = s:new . s:HtmlFormat(s:numcol, "lnr") + " TODO: why not use the real highlight name here? + let s:new = s:new . s:HtmlFormat(s:numcol, "lnr", "") endif " Get the diff attribute, if any. @@ -853,6 +872,11 @@ while s:lnum <= s:end " Loop over each character in the line let s:col = 1 + + " most of the time we won't use the diff_id, initialize to zero + let s:diff_id = 0 + let s:diff_id_name = "" + while s:col <= s:len || (s:col == 1 && s:diffattr) let s:startcol = s:col " The start column for processing text if !exists('g:html_ignore_conceal') && has('conceal') @@ -866,13 +890,18 @@ while s:lnum <= s:end " characters. while s:col <= s:len && s:concealinfo == synconcealed(s:lnum, s:col) | let s:col = s:col + 1 | endwhile elseif s:diffattr - let s:id = diff_hlID(s:lnum, s:col) + let s:diff_id = diff_hlID(s:lnum, s:col) + let s:id = synID(s:lnum, s:col, 1) let s:col = s:col + 1 " Speed loop (it's small - that's the trick) " Go along till we find a change in hlID - while s:col <= s:len && s:id == diff_hlID(s:lnum, s:col) | let s:col = s:col + 1 | endwhile + while s:col <= s:len && s:id == synID(s:lnum, s:col, 1) + \ && s:diff_id == diff_hlID(s:lnum, s:col) | + \ let s:col = s:col + 1 | + \ endwhile if s:len < &columns && !exists("g:html_no_pre") - " Add spaces at the end to mark the changed line. + " Add spaces at the end of the raw text line to extend the changed + " line to the full width. let s:line = s:line . repeat(' ', &columns - virtcol([s:lnum, s:len]) - s:margin) let s:len = &columns endif @@ -913,6 +942,9 @@ while s:lnum <= s:end " get the highlight group name to use let s:id = synIDtrans(s:id) let s:id_name = synIDattr(s:id, "name", s:whatterm) + if s:diff_id + let s:diff_id_name = synIDattr(s:diff_id, "name", s:whatterm) + endif else " use Conceal highlighting for concealed text let s:id_name = 'Conceal' @@ -920,9 +952,9 @@ while s:lnum <= s:end endif " Output the text with the same synID, with class set to {s:id_name}, - " unless it has been concealed completely. Always output empty lines. + " unless it has been concealed completely. if strlen(s:expandedtab) > 0 - let s:new = s:new . s:HtmlFormat(s:expandedtab, s:id_name) + let s:new = s:new . s:HtmlFormat(s:expandedtab, s:id_name, s:diff_id_name) endif endwhile endif @@ -948,18 +980,18 @@ if exists("g:html_dynamic_folds") " add fold column to the style list if not already there let s:id = hlID('FoldColumn') - if stridx(s:idlist, "," . s:id . ",") == -1 - let s:idlist = s:idlist . s:id . "," + if index(s:idlist, s:id) == -1 + call insert(s:idlist, s:id) endif endif -" Close off the font tag that encapsulates the whole -if !exists("g:html_use_css") - let s:lines[-1].="" -endif - if exists("g:html_no_pre") - call extend(s:lines, ["", ""]) + if !exists("g:html_use_css") + " Close off the font tag that encapsulates the whole + call extend(s:lines, ["", ""]) + else + call extend(s:lines, ["", ""]) + endif else call extend(s:lines, ["", "", ""]) endif @@ -1009,9 +1041,6 @@ if s:numblines endif " Gather attributes for all other classes -let s:idlist_str = s:idlist -unlet s:idlist -let s:idlist = split(s:idlist_str, ',') if !s:html_no_progress && !empty(s:idlist) let s:pgb = s:ProgressBar("Processing classes:", len(s:idlist),s:newwin) endif @@ -1027,12 +1056,18 @@ while !empty(s:idlist) if exists("g:html_use_css") execute "normal! A\n." . s:id_name . " { " . s:attr . "}" else - execute '%s+\([^<]*\)+' . s:HtmlOpening(s:id) . '\1' . s:HtmlClosing(s:id) . '+g' + " replace spans of just this class name with non-CSS style markup + execute '%s+\([^<]*\)+' . s:HtmlOpening(s:id) . '\1' . s:HtmlClosing(s:id) . '+ge' + " Replace spans of this class name AND a diff class with non-CSS style + " markup surrounding a span of just the diff class. The diff class will + " be handled later because we know that information is at the end. + execute '%s+\([^<]*\)+' . s:HtmlOpening(s:id) . '\2' . s:HtmlClosing(s:id) . '+ge' endif else execute '%s+\([^<]*\)+\1+ge' + execute '%s+\([^<]*\)+\2+ge' if exists("g:html_use_css") - 1;/