merge

sources_non_forked/vim-less/README.md

@@ -24,7 +24,13 @@ in `after/syntax/css.vim` or `after/syntax/css/*.vim`.
 
 - OR use [vundle](https://github.com/gmarik/vundle), adding this line to your `~/.vimrc`:
 
-        Bundle 'groenewege/vim-less'
+        Plugin 'groenewege/vim-less'
+        
+
+- OR use [neobundle](https://github.com/Shougo/neobundle.vim), adding this line to your `~/.vimrc`:
+
+        NeoBundle 'groenewege/vim-less'
+        
 
 - OR use git submodules:
 

sources_non_forked/vim-less/ftplugin/less.vim

@@ -13,12 +13,13 @@ let b:did_ftplugin = 1
 let b:undo_ftplugin = "setl cms< def< inc< inex< ofu< sua<"
 
 setlocal iskeyword+=-
-setlocal commentstring=//\ %s
+setlocal commentstring=//%s
 setlocal define=^\\s*\\%(@mixin\\\|=\\)
 setlocal includeexpr=substitute(v:fname,'\\%(.*/\\\|^\\)\\zs','_','')
 setlocal omnifunc=csscomplete#CompleteCSS
 setlocal suffixesadd=.less
-setlocal comments=s1:/*,mb:*,ex:*/
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,://
+setlocal fo=croql
 
 let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\='