latest nerd_(tree|snippets|commenter)

Author: Martin Grenfell

doc/NERD_commenter.txt

@@ -802,6 +802,8 @@ if your face looked like a toaster and a t-rex put together? :(
     - add support for dhcpd, limits, ntp, resolv, rgb, sysctl, udevconf and
       udevrules. Thanks to Thilo Six.
     - match filetypes case insensitively
+    - add support for mp (metapost), thanks to Andrey Skvortsov.
+    - add support for htmlcheetah, thanks to Simon Hengel.
 
 2.2.1
     - add support for newlisp and clojure, thanks to Matthew Lee Hinman.
@@ -1062,7 +1064,8 @@ Stefan Walk                         sieve
 Adam Thorsen                        objj
 Thilo Six                           dhcpd, limits, ntp, resolv, rgb, sysctl,
                                     udevconf, udevrules
-
+Andrey Skvortsov                    mp
+Simon Hengel                        htmlcheetah
 ==============================================================================
 9. License                                                    *NERDComLicense*
 

plugin/NERDSnippets.vim

@@ -43,9 +43,9 @@ let s:snippets = {}
 let s:snippets['_'] = {}
 
 function! s:enableMaps()
-    exec "inoremap ".g:NERDSnippets_key." <c-r>=NERDSnippets_ExpandSnippet()<cr><c-r>=NERDSnippets_SwitchRegion(1)<cr>"
-    exec "nnoremap ".g:NERDSnippets_key." i<c-r>=NERDSnippets_SwitchRegion(0)<cr>"
-    exec "snoremap ".g:NERDSnippets_key." <esc>i<c-r>=NERDSnippets_SwitchRegion(0)<cr>"
+    exec "inoremap ".g:NERDSnippets_key." <c-r>=NERDSnippets_ExpandSnippet()<cr><c-g>u<c-r>=NERDSnippets_SwitchRegion(1)<cr>"
+    exec "nnoremap ".g:NERDSnippets_key." i<c-g>u<c-r>=NERDSnippets_SwitchRegion(0)<cr>"
+    exec "snoremap ".g:NERDSnippets_key." <esc>i<c-g>u<c-r>=NERDSnippets_SwitchRegion(0)<cr>"
 endfunction
 command! -nargs=0 NERDSnippetsEnable call <SID>enableMaps()
 call s:enableMaps()

plugin/NERD_commenter.vim

@@ -403,6 +403,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('#', '')
     elseif a:filetype ==? "html"
         call s:MapDelimitersWithAlternative('<!--','-->', '//', '')
+    elseif a:filetype ==? "htmlcheetah"
+        call s:MapDelimiters('##','')
     elseif a:filetype ==? "htmldjango"
         call s:MapDelimitersWithAlternative('<!--','-->', '{#', '#}')
     elseif a:filetype ==? "htmlos"
@@ -539,6 +541,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('(*','*)')
     elseif a:filetype ==? "monk"
         call s:MapDelimiters(';', '')
+    elseif a:filetype ==? "mp"
+        call s:MapDelimiters('%', '')
     elseif a:filetype ==? "mplayerconf"
         call s:MapDelimiters('#', '')
     elseif a:filetype ==? "mrxvtrc"
@@ -708,7 +712,7 @@ function s:SetUpForNewFiletype(filetype, forceReset)
     elseif a:filetype ==? "sas"
         call s:MapDelimiters('/*','*/')
     elseif a:filetype ==? "sass"
-        call s:MapDelimitersWithAlternative('//','', '/*', '')
+        call s:MapDelimitersWithAlternative('//','', '/*', '*/')
     elseif a:filetype ==? "sather"
         call s:MapDelimiters('--', '')
     elseif a:filetype ==? "scala"

plugin/NERD_tree.vim

@@ -2690,7 +2690,7 @@ function! s:setupSyntaxHighlighting()
     syn match treeHelp  #^".*# contains=treeHelpKey,treeHelpTitle,treeFlag,treeToggleOff,treeToggleOn,treeHelpCommand
 
     "highlighting for readonly files
-    syn match treeRO #[\/0-9a-zA-Z]\+.*\[RO\]# contains=treeFlag,treeBookmark
+    syn match treeRO #.*\[RO\]#hs=s+2 contains=treeFlag,treeBookmark,treePart,treePartFile
 
     "highlighting for sym links
     syn match treeLink #[^-| `].* -> # contains=treeBookmark,treeOpenable,treeClosable,treeDirSlash