# HG changeset patch # User Bram Moolenaar # Date 1280333861 -7200 # Node ID e52d87a2bb3e88af81a5e74e216dd88139de651d # Parent b5ee68272ae5f9f608c453fd0870b178dcc0c5d2 More runtime file updates. diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim --- a/runtime/autoload/netrw.vim +++ b/runtime/autoload/netrw.vim @@ -1,7 +1,7 @@ " netrw.vim: Handles file transfer and remote directory listing across " AUTOLOAD SECTION " Date: Jul 27, 2010 -" Version: 139 +" Version: 140 " Maintainer: Charles E Campbell, Jr " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim " Copyright: Copyright (C) 1999-2010 Charles E. Campbell, Jr. {{{1 @@ -22,7 +22,7 @@ if &cp || exists("g:loaded_netrw") finish endif -let g:loaded_netrw = "v139" +let g:loaded_netrw = "v140" if v:version < 702 echohl WarningMsg echo "***warning*** this version of netrw needs vim 7.2" diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim --- 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. @@ -388,17 +397,22 @@ fun! tar#Write(fname) 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/doc/options.txt b/runtime/doc/options.txt --- 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.3c. Last change: 2010 Jul 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1741,12 +1741,15 @@ A jump table for the options with a shor 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 diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -2706,6 +2706,7 @@ which is loaded automatically at startup ============================================================================== 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 @@ -2717,11 +2718,11 @@ 12. History *netrw-history* {{{1 * (Britton Kerin) wanted netrw listings to be buflisted; the |g:netrw_bufsettings| option permits that. - * (John Orr) pointed out that the intended maparg + 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. - Jun 18, 2010 * (Jan Steffens) added support for xz compression - Jun 23, 2010 * vimdiff dir1 dir2 now works v138: May 01, 2010 * added the bomb setting to the Save-Set-Restore option handling (for Tony M) May 14, 2010 * (Bram Moolenaar) netrw optionally sets cursorline diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt --- 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.3c. 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 @@ 2. Usage *tar-usage* *tar-manual* 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 @@ 3. Options *tar-options* 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/syntax.txt b/runtime/doc/syntax.txt --- 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 26 +*syntax.txt* For Vim version 7.3c. Last change: 2010 Jul 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2703,12 +2703,15 @@ always accept such use of @. *tex-cchar* *tex-cole* *tex-conceal* Taking Advantage of Conceal Mode~ -If you have |'conceallevel'| set to 1 and if your encoding is utf-8, then a -number of character sequences will be translated (ie. better visualized) using -|syn-cchar|, 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. +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/tags b/runtime/doc/tags --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -1819,10 +1819,10 @@ 90.5 usr_90.txt /*90.5* :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* @@ -5732,6 +5732,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* @@ -7902,6 +7903,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/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -30,12 +30,6 @@ be worked on, but only if you sponsor Vi *known-bugs* -------------------- Known bugs and current work ----------------------- -Problem with concealends in v50 of tex.vim? (Charles Campbell, 2010 Jul 26) -Fixed by patch from Vince? Try /tmp/tex.vim - -v140 of netrw. -v25 of tar.vim. - Conceal problem: CTRL-L draws differently than individual line. (Benjamin Fritz, 2010 Jul 27) diff --git a/runtime/plugin/netrwPlugin.vim b/runtime/plugin/netrwPlugin.vim --- a/runtime/plugin/netrwPlugin.vim +++ b/runtime/plugin/netrwPlugin.vim @@ -20,7 +20,7 @@ if &cp || exists("g:loaded_netrwPlugin") finish endif -let g:loaded_netrwPlugin = "v139" +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 @@ -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 --- 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()