From e8692558f8e4dfc5a4edcc6a1fcf1f823a3ddf72 Mon Sep 17 00:00:00 2001 From: gryf Date: Sun, 29 Jun 2014 18:00:26 +0200 Subject: [PATCH] Added matchtagalways and snippets --- .hgsub | 2 ++ .hgsubstate | 24 +++++++++++++----------- .vimrc | 9 ++++++++- UltiSnips/python.snippets | 2 +- UltiSnips/rst.snippets | 2 +- bundle/ft_rst/ftplugin/rst/commons.vim | 9 --------- bundle/jsbeautify/plugin/jsbeautify.vim | 3 ++- winrc.vim | 5 +++-- 8 files changed, 30 insertions(+), 26 deletions(-) diff --git a/.hgsub b/.hgsub index 216531c..fb094db 100644 --- a/.hgsub +++ b/.hgsub @@ -22,3 +22,5 @@ bundle/git_riv = [git]https://github.com/Rykka/riv.vim.git bundle/git_zoom = [git]https://github.com/gryf/zoom.vim.git bundle/git_nerdtree = [git]https://github.com/scrooloose/nerdtree.git bundle/git_css = [git]https://github.com/skammer/vim-css-color.git +bundle/ft_git_matchtagalways = [git]https://github.com/Valloric/MatchTagAlways.git +bundle/git_vim-snippets = [git]https://github.com/honza/vim-snippets.git diff --git a/.hgsubstate b/.hgsubstate index ee295cb..7b9d934 100644 --- a/.hgsubstate +++ b/.hgsubstate @@ -1,23 +1,25 @@ 305b08a99a6e3e3c4df6f6936869ba69a6b21fcf bundle/doc_git_py2stdlib -03669dcd2f93b9e35b54077d760670c3658db936 bundle/ft_git_pydoc -6dd949d798746a78910a26223102d66b1de0209c bundle/ft_git_pyflakes-vim -f183a345a0c10caed7684d07dabae33e007c7590 bundle/git_ack -b340c438355e70ba3a648ccfc0e2be9b94662808 bundle/git_calendar +8cf9444704091f4babedd757617f03c390bb0f92 bundle/ft_git_matchtagalways +6adcfcd402d34eacb7e6a1dd85c8757bb71e3618 bundle/ft_git_pydoc +92ab1d390d0dbf0d949aba27c9eb1e4ed0abde0e bundle/ft_git_pyflakes-vim +303bceff1c8ab1145d114083582b1aeac9de7a85 bundle/git_ack +186ae21ab46bb1c2830434160a77cc1352646f77 bundle/git_calendar 417eaf8a20a6208e34ff167f5636b20f8f812ed8 bundle/git_css b5d3fe66a58a13d2ff8b6391f4387608496a030f bundle/git_ctrlp -8f0b8edfbd246c0026b7a2388e1d883d579ac7f6 bundle/git_fugitive +0a19a3e78ff01276943294e2b812873552fe3c4b bundle/git_fugitive 3975ac871565115e3769dc69c06bc88ddc1369af bundle/git_gundo 10073c3a3c363c34681c2e37ae29e9675e2cde90 bundle/git_markdown 0b3d928dce8262dedfc2f83b9aeb59a94e4f0ae4 bundle/git_nerdcommenter b0bb781fc73ef40365e4c996a16f04368d64fc9d bundle/git_nerdtree 2a3c5f8e3c26a57b8eb4cfc4be79615a1c508ef6 bundle/git_repeat 43b1d37479af91cac00d01d4e20b7b7e1b94adfb bundle/git_riv -42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a bundle/git_surround -02a04d07665349e3b54e99eaf067c4bfb744cbaa bundle/git_syntastic -836a39af8f9069b0b17e6818e3a44fdadba196d9 bundle/git_tagbar -e2987a0c9fe17237e7ed1a5c2ecc69f64f9a5fea bundle/git_taglisttoo -335663d3c1f0fa783c0ffc119000412220f6e7ab bundle/git_ultisnips +f85cb4e788356f664d033e8519abdd8e1bc26762 bundle/git_surround +3ebdeabf63eb2f093ccd79c1c9f4d8e198488d5b bundle/git_syntastic +9bf4fd99e4b460c547207b0f0bc3557280874b61 bundle/git_tagbar +7b84e352ed1e395fc54f5a3f60faf4aef9da9f41 bundle/git_taglisttoo +e59a60cbeae315218b93ab495954ef2a527a875c bundle/git_ultisnips c0d27010dd0c96884cfd34c3af621ae009109c69 bundle/git_vcscommand -7e28dbd4e06fafb023ac8934d3937be1afbb222e bundle/git_vim-javascript +f8122fd1caca68b2592553e43dad45b3dc445a06 bundle/git_vim-javascript 1e2f98f4366c6dec27fa8df72971fa9fa33e9f07 bundle/git_vim-nodejs-complete +fa45583c4dc16d3b7e3d25a749ce5f50927bf4d5 bundle/git_vim-snippets 757f513c621a48cf34d5b343ddb405ae731b3e38 bundle/git_zoom diff --git a/.vimrc b/.vimrc index ea2be9d..e8a767a 100644 --- a/.vimrc +++ b/.vimrc @@ -190,7 +190,7 @@ let g:NERDSpaceDelims=1 let g:python_version_2=1 "}}} "LanguageTool {{{ -let g:languagetool_jar='/opt/LanguageTool/LanguageTool.jar' +let g:languagetool_jar='/opt/LanguageTool/languagetool-commandline.jar' "let g:languagetool_lang=pl "}}} "Jedi {{{ @@ -218,6 +218,8 @@ map :bn map :call Make() +map :echom CreateScratch() + "QuickFix jumps map :cp map :cn @@ -404,6 +406,11 @@ function ToggleHex() let &modifiable=l:oldmodifiable endfunction +function CreateScratch() + new|setl bt=nofile bh=wipe nobl + return "" +endfunction + "Toggle "}}} " GUI: detect graphics mode, set colorscheme {{{ diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets index 0d3a56f..a5e5f86 100644 --- a/UltiSnips/python.snippets +++ b/UltiSnips/python.snippets @@ -24,7 +24,7 @@ snippet pywin "PyWin debugger" import pywin.debugger; pywin.debugger.set_trace() endsnippet -snippet winpdb "Winpdb rpdb2 debugger" +snippet rpdb "Winpdb/rpdb2 debugger" import rpdb2; rpdb2.start_embedded_debugger("foo") endsnippet diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets index 9913ad5..eaf0f79 100644 --- a/UltiSnips/rst.snippets +++ b/UltiSnips/rst.snippets @@ -95,7 +95,7 @@ snippet subject endsnippet snippet code -.. sourcecode:: ${1:python} +.. code:: ${1:python} :cssclass: ${2:wombat} ${3::linenos:} ${4:1} diff --git a/bundle/ft_rst/ftplugin/rst/commons.vim b/bundle/ft_rst/ftplugin/rst/commons.vim index 00582c5..5e09d9b 100644 --- a/bundle/ft_rst/ftplugin/rst/commons.vim +++ b/bundle/ft_rst/ftplugin/rst/commons.vim @@ -5,12 +5,3 @@ setlocal spell setlocal smartindent setlocal autoindent setlocal formatoptions=tcq "set VIms default - -let g:blogger_login="gryf73" -let g:blogger_name="rdobosz" -let g:blogger_browser=1 -let g:blogger_stylesheets=["css/widget_css_2_bundle.css", "css/style_custom.css", "css/style_blogger.css", "css/wombat_pygments.css", "css/lucius_pygments.css"] -let g:blogger_pygments_class="wombat" - -map :PreviewBlogArticle -map :SendBlogArticle diff --git a/bundle/jsbeautify/plugin/jsbeautify.vim b/bundle/jsbeautify/plugin/jsbeautify.vim index 2512aa1..a3231c5 100644 --- a/bundle/jsbeautify/plugin/jsbeautify.vim +++ b/bundle/jsbeautify/plugin/jsbeautify.vim @@ -280,7 +280,8 @@ function! s:get_next_token() endfunction function! s:is_js() - return expand("%:e") == "js" + " return expand("%:e") == "js" + return &filetype == "javascript" endfunction "function! g:Jsbeautify(js_source_text, options) diff --git a/winrc.vim b/winrc.vim index 8a7837c..a13f252 100644 --- a/winrc.vim +++ b/winrc.vim @@ -65,6 +65,7 @@ let g:vim_bin_path = expand($VIM) . '/bin' " Make the interface speaks english set langmenu=en_US let $LANG = 'en_US.UTF-8' -source $VIMRUNTIME/delmenu.vim -source $VIMRUNTIME/menu.vi +" Those two are optional, usable only for those who actually use menu bar +"source $VIMRUNTIME/delmenu.vim +"source $VIMRUNTIME/menu.vi " vim:ts=4:sw=4:wrap:fdm=marker: