context-vim (7feb11)

git-svn-id: svn://tug.org/texlive/trunk@21337 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 21 insertions, 17 deletions

diff --git a/Master/texmf-dist/tex/context/third/vim/2context.vim b/Master/texmf-dist/tex/context/third/vim/2context.vim
index 533a116983e..a90fc0719c4 100644
--- a/Master/texmf-dist/tex/context/third/vim/2context.vim
+++ b/Master/texmf-dist/tex/context/third/vim/2context.vim
@@ -3,21 +3,24 @@
 " license   : Simplified BSD License
 
 " This script is part of the t-vim module for ConTeXt. It is based on 2html.vim.  
-" It assumes that two buffers are open. The first buffer is the output buffer,
-" and the second buffer is the input buffer.
+" It assumes that two buffers are open. The first buffer is the input buffer,
+" and the second buffer is the output buffer.
 
 " We move back and forth between the buffers, 
 
+" Split and go to the last buffer
+sblast 
+
 " Make sure that the buffer is modifiable
 set modifiable
 
 " ... and empty
 %d 
 
-" Go to the last buffer
-sblast 
-
 " Loop over all lines in the original text.
+
+wincmd p
+
 " Use contextstartline and contextstopline if they are set.
 
 if exists("contextstartline")
diff --git a/Master/texmf-dist/tex/context/third/vim/t-vim.tex b/Master/texmf-dist/tex/context/third/vim/t-vim.tex
index 81bad980536..bdb5c30cd2e 100644
--- a/Master/texmf-dist/tex/context/third/vim/t-vim.tex
+++ b/Master/texmf-dist/tex/context/third/vim/t-vim.tex
@@ -40,15 +40,15 @@
   }
 
 \startsetups[vimsetup]
-  \edef\currentvimtyping{\currentexternalfilter}
-  \edef\currentvimalternative{\vimtypingparameter\c!alternative}
+  \edef\currentvimtyping{\currentexternalfilter}%
+  \edef\currentvimalternative{\externalfilterparameter\c!alternative}%
   \let\SYN\vimsyntax
-  \def\NL{\strut} % TODO: Add line numbering
+  \def\NL{\strut}% TODO: Add line numbering
   \def\tab##1%
-    {\dorecurse{\vimtypingparameter\c!tab}
-    {\space}}
-  \doifinset{\vimtypingparameter\c!option}{\v!packed}
-    {\setupwhitespace[\v!none,\v!flexible]}
+    {\dorecurse{\externalfilterparameter\c!tab}
+    {\space}}%
+  \doifinset{\externalfilterparameter\c!option}{\v!packed}
+    {\setupwhitespace[\v!none,\v!flexible]}%
   \setcatcodetable\externalfilterwritecatcodes
 \stopsetups
 
@@ -58,15 +58,15 @@
        -s % silent
        -C % set compatible
        -n % no swap file
-       -c "set tabstop=\vimtypingparameter\c!tab" %
+       -c "set tabstop=\externalfilterparameter\c!tab" %
        -c "syntax on" %
-       -c "set syntax=\vimtypingparameter\c!syntax" %
+       -c "set syntax=\externalfilterparameter\c!syntax" %
        -c "let contextstartline=\externalfilterparameter\c!start" %
        -c "let  contextstopline=\externalfilterparameter\c!stop" %
-       -c "source 2context.vim" %
+       -c "source kpse:2context.vim" %
        -c "qa" %
-       \externalfilteroutputfile\space
-       \externalfilterinputfile}
+       \externalfilterinputfile\space
+       \externalfilteroutputfile}
 
 \def\startvimalternative
   {\dosingleargument\dostartvimalternative}
@@ -196,6 +196,7 @@
    \c!output=\externalfilterbasefile.vimout,
    \c!setups=vimsetup,
    \c!option=\v!packed, % Could be a list
+   \s!parent=\????externalfilter,
   ]
 
 \protect