diff --git a/.hgsub b/.hgsub index 0173df1..eb83de2 100644 --- a/.hgsub +++ b/.hgsub @@ -14,9 +14,9 @@ bundle/git_nerdcommenter = [git]https://github.com/scrooloose/nerdcommenter.git bundle/git_ctrlp = [git]https://github.com/kien/ctrlp.vim.git bundle/git_syntastic = [git]https://github.com/scrooloose/syntastic.git bundle/git_taglisttoo = [git]https://github.com/ervandew/taglisttoo.git -bundle/git_gitgutter = [git]https://github.com/airblade/vim-gitgutter.git bundle/git_vim-javascript = [git]https://github.com/pangloss/vim-javascript.git bundle/git_vim-nodejs-complete = [git]https://github.com/myhere/vim-nodejs-complete.git bundle/git_fugitive = [git]https://github.com/tpope/vim-fugitive.git bundle/git_markdown = [git]https://github.com/hallison/vim-markdown.git bundle/git_riv = [git]https://github.com/Rykka/riv.vim.git +bundle/git_zoom = [git]https://github.com/gryf/zoom.vim.git diff --git a/.hgsubstate b/.hgsubstate index 7ae8a70..1763af8 100644 --- a/.hgsubstate +++ b/.hgsubstate @@ -5,17 +5,17 @@ f183a345a0c10caed7684d07dabae33e007c7590 bundle/git_ack 0284450ee16dfab2300f6b68c68b9e718f4f98bd bundle/git_calendar b5d3fe66a58a13d2ff8b6391f4387608496a030f bundle/git_ctrlp 124550cfee33a1bb9a227e78ccc709317a89dae9 bundle/git_fugitive -ff031d022f2123353bc93a3aa97290287c10a287 bundle/git_gitgutter 3975ac871565115e3769dc69c06bc88ddc1369af bundle/git_gundo 10073c3a3c363c34681c2e37ae29e9675e2cde90 bundle/git_markdown 0b3d928dce8262dedfc2f83b9aeb59a94e4f0ae4 bundle/git_nerdcommenter a81bef76031ca1c71766b516417480caeb01c932 bundle/git_repeat -4c6759b16eebd79ac73f3ea01f29c2968b16e211 bundle/git_riv -02199ea0080d744ec76b79d74ce56d51d25cf7ae bundle/git_surround -a4fa3234f78bbae839b271b516cc9f624d428aa2 bundle/git_syntastic -57ee79bd4ce99ae247c939a3e429dfa5163f5673 bundle/git_tagbar +43b1d37479af91cac00d01d4e20b7b7e1b94adfb bundle/git_riv +9bf527af3ae7338346ca9f0657dc077722d517f7 bundle/git_surround +3a03fee48c24d0116c529769664750a43a206ee7 bundle/git_syntastic +97d7b04bdd10cae424f8cb6be50ae7893b106ff4 bundle/git_tagbar e2987a0c9fe17237e7ed1a5c2ecc69f64f9a5fea bundle/git_taglisttoo -4a1e5e60ff44c99e2145eceaa8f8405874d34777 bundle/git_ultisnips +88645f03eac697a660a5dce1293812b2a8aa2906 bundle/git_ultisnips c0d27010dd0c96884cfd34c3af621ae009109c69 bundle/git_vcscommand -1ab789c640d22f9036e918a10ae77d96dbeed958 bundle/git_vim-javascript +932b675412e28149d00ba3e0f0669c5a73d181b3 bundle/git_vim-javascript 1e2f98f4366c6dec27fa8df72971fa9fa33e9f07 bundle/git_vim-nodejs-complete +69a6175be2afd9f391c965c40ea8ccf5261ccae9 bundle/git_zoom diff --git a/.vimrc b/.vimrc index 5e257ae..a549963 100644 --- a/.vimrc +++ b/.vimrc @@ -402,13 +402,13 @@ if has('gui_running') " I like this font, but it looks like crap on linux "set guifont=Consolas\ 12 " at least, some ttf font that looks good - "set guifont=DejaVu\ Sans\ Mono\ 12 + set guifont=DejaVu\ Sans\ Mono\ 12 " Unfortunately there is a problem with TTF fonts in my gvim instance. " After editing a while there are some leaving trash appearing on the " buffer. Refreshing the screen helps, but is kinda annoying. It is " probably my X11 setup, because on other similar workstations and setup I " didn't noticed such behavior. Fallback to fixed-misc for a while. - set guifont=Fixed\ 14 + "set guifont=Fixed\ 13 set mouse=a "Enable mouse support " No toolbar, menu, scrollbars, draw simple text tabs. This would keep " window in one place, and also this will conserve space. Tabs are huge diff --git a/bundle/indent_javascript/indent/html.vim b/bundle/indent_javascript/indent/html.vim index ada5cc3..72593b4 100644 --- a/bundle/indent_javascript/indent/html.vim +++ b/bundle/indent_javascript/indent/html.vim @@ -105,6 +105,40 @@ call HtmlIndentPush('u') call HtmlIndentPush('ul') call HtmlIndentPush('var') +" html5 tags +call HtmlIndentPush('article') +call HtmlIndentPush('aside') +call HtmlIndentPush('audio') +call HtmlIndentPush('bdi') +call HtmlIndentPush('canvas') +call HtmlIndentPush('command') +call HtmlIndentPush('datagrid') +call HtmlIndentPush('datalist') +call HtmlIndentPush('details') +call HtmlIndentPush('dialog') +call HtmlIndentPush('embed') +call HtmlIndentPush('figcaption') +call HtmlIndentPush('figure') +call HtmlIndentPush('footer') +call HtmlIndentPush('header') +call HtmlIndentPush('hgroup') +call HtmlIndentPush('keygen') +call HtmlIndentPush('mark') +call HtmlIndentPush('meter') +call HtmlIndentPush('nav') +call HtmlIndentPush('output') +call HtmlIndentPush('progress') +call HtmlIndentPush('rp') +call HtmlIndentPush('rt') +call HtmlIndentPush('ruby') +call HtmlIndentPush('section') +call HtmlIndentPush('source') +call HtmlIndentPush('summary') +call HtmlIndentPush('time') +call HtmlIndentPush('track') +call HtmlIndentPush('video') +call HtmlIndentPush('wbr') + " [-- --] if !exists('g:html_indent_strict')