diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2012-02-23 19:02:55 +0100 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2012-02-23 19:02:55 +0100 |
| commit | a055466194af82ea617ab8e265806e68a3856247 (patch) | |
| tree | d81327737846f72ac23b8bc847e32185052e18ec | |
| parent | 1c7cc1c8293a2243d9f41a03f2401e793bf1a4f2 (diff) | |
| parent | 83beee5ef2194f472c4c827641039bec886f654f (diff) | |
| download | dotfiles-a055466194af82ea617ab8e265806e68a3856247.tar.gz dotfiles-a055466194af82ea617ab8e265806e68a3856247.tar.bz2 dotfiles-a055466194af82ea617ab8e265806e68a3856247.zip | |
Merge branch 'master' of necoro.eu:dotfiles
Diffstat (limited to '')
| -rw-r--r-- | .vim/syntax/mako.vim | 4 | ||||
| -rw-r--r-- | .vimrc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.vim/syntax/mako.vim b/.vim/syntax/mako.vim index 474fa63..799dfa1 100644 --- a/.vim/syntax/mako.vim +++ b/.vim/syntax/mako.vim @@ -54,8 +54,8 @@ syn region makoAttributeValue containedin=makoTag contained start=/"/ skip=/\\"/ syn region makoAttributeValue containedin=MakoTag contained start=/'/ skip=/\\'/ end=/'/ " Tags -syn region makoTag matchgroup=makoDelim start="<%\(def\|call\|page\|include\|namespace\|inherit\|\(\w\+:\w\+\)\)\>" end="/\?>" -syn match makoDelim "</%\(def\|call\|namespace\|\(\w\+:\w\+\)\)>" +syn region makoTag matchgroup=makoDelim start="<%\(def\|block\|call\|page\|include\|namespace\|inherit\|\(\w\+:\w\+\)\)\>" end="/\?>" +syn match makoDelim "</%\(def\|block\|call\|namespace\|\(\w\+:\w\+\)\)>" " Newline Escapes syn match makoEscape "\\$" @@ -106,7 +106,6 @@ let NERDTreeWinPos = 0 "have it on the right site let g:autotagCtagsCmd="ctags --c++-kinds=+p --fields=+iaS --extra=+q" " stuff for gentoo syntax -let g:ebuild_error_on_trailing_whitespace=1 " show trailing whitespaces let g:bugsummary_browser="firefox %s" " for toggling in python @@ -122,7 +121,8 @@ let g:tex_conceal = "" " haskell stuff au BufEnter *.hs compiler ghc -let g:haddock_browser = "firefox" +let g:haddock_browser = "/home/necoro/bin/openlink" +let g:haddock_indexfiledir = "/home/necoro/.cache/vim/" " ======================================================= " FINAL |