summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.vim/syntax/mako.vim4
-rw-r--r--.vimrc4
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 "\\$"
diff --git a/.vimrc b/.vimrc
index 2af8adf..dfa846c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -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