2 files changed, 23 insertions, 2 deletions
diff --git a/Master/texmf-dist/doc/context/third/vim/vim.txt b/Master/texmf-dist/doc/context/third/vim/vim.txt
index fe2f115bc90..5079c3058a1 100644
--- a/Master/texmf-dist/doc/context/third/vim/vim.txt
+++ b/Master/texmf-dist/doc/context/third/vim/vim.txt
@@ -353,6 +353,24 @@ set
 
 The default value of `strip` is `no`.
 
+Adding left margin
+------------------
+
+By default, a `<vimtyping>` environment resets the left skip to `0pt`, so each
+line is aligned to the left edge. Use the `margin` key to change the left skip
+of each line:
+
+    \definevimtyping
+        [...]
+        [...
+         margin=<dimen>,
+         ...]
+
+where `<dimen>` is a valid TeX dimension.
+
+    
+
+
 Wrapping lines
 ---------------
 
diff --git a/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv b/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv
index caf5d56a6fd..a9888bffffc 100644
--- a/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv
+++ b/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=t-syntax-highlight,
-%D      version=2012.06.09,
+%D      version=2012.08.01,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Code syntax highlighting,
 %D       author=Aditya Mahajan,
@@ -9,7 +9,7 @@
 %D        email=adityam <at> ieee <dot> org,
 %D      license=Simplified BSD License]
 
-\writestatus{loading}{Code syntax highlighting (ver: 2012.06.09)}
+\writestatus{loading}{Code syntax highlighting (ver: 2012.08.01)}
 
 \startmodule    [syntax-highlight]
 \usemodule      [syntax-groups]
@@ -89,6 +89,8 @@
   \doifinset{\externalfilterparameter\c!option}{\v!packed}
       {\setupwhitespace[\v!none,\v!flexible]}%
 
+  \doadaptleftskip{\externalfilterparameter\c!margin}%
+
   \doifnotinset{\externalfilterparameter\c!option}{\v!hyphenated}
       {\language\minusone}%
 
@@ -141,6 +143,7 @@
   [\c!tab=4,
    \c!space=\v!off,
    \c!lines=\v!fixed,
+   \c!margin=\zeropoint,
    \c!start=1,
    \c!stop=0,
    % \c!syntax=context,