Permalink
Browse files

Merge branch 'master' of github.com:locojay/locovim

  • Loading branch information...
2 parents 10721d7 + 3e00263 commit d5f1c447fe6f617901db7d990213ca7841bf7481 locojay committed Feb 14, 2013
Showing with 9 additions and 2 deletions.
  1. +9 −2 vimrc
View
@@ -448,6 +448,11 @@ let g:ipy_perform_mappings = 0
autocmd FileType python map<silent>K :py get_doc_buffer()<CR>
autocmd FileType python map<silent><C-i> :python run_this_line()<CR>
autocmd FileType python vmap <silent> <C-i> :python run_these_lines()<CR>
+function! IPythonShell()
+ :py if update_subchannel_msgs(force=True): echo("vim-ipython shell updated",'Operator')
+endfunction
+
+command! IPythonShell call IPythonShell()
"make green plugin
@@ -811,8 +816,8 @@ au FileType scons setlocal commentstring=#\ %s
if executable("tmux")
"Bundle 'vim-scripts/Screen-vim---gnu-screentmux'
Bundle 'xaviershay/tslime.vim.git'
- Bundle 'acustodioo/vim-tmux'
- Bundle 'benmills/vimux'
+ " Bundle 'acustodioo/vim-tmux'
+ " Bundle 'benmills/vimux'
"change pane number at runtime by setting
@@ -992,6 +997,8 @@ Bundle "derekwyatt/vim-scala"
Bundle "AndrewRadev/linediff.vim"
+Bundle "goldfeld/vim-seek"
+
" }}}

0 comments on commit d5f1c44

Please sign in to comment.