From ad9a205b7988d074b982bd1acf8c78c2b42501cc Mon Sep 17 00:00:00 2001 From: gryf Date: Thu, 21 Jul 2011 18:09:52 +0200 Subject: [PATCH] vimrc cleanup, change mapping for class selection in python ft plugin --- .vimrc | 16 +++++++++------- ftplugin/python/python_fn.vim | 3 ++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.vimrc b/.vimrc index 08571b5..7a57b90 100644 --- a/.vimrc +++ b/.vimrc @@ -18,7 +18,9 @@ set hidden "Keep hidden windows set history=1000 "Keep 1000 lines of command line history set laststatus=2 "Always show statusbar set lazyredraw "Don't update screen while executing macros -set listchars=tab:▸―,trail:· "Strings to use in 'list' mode. list is off by default. +if !has('win32') + set listchars=tab:▸―,trail:· "Strings to use in 'list' mode. list is off by default. +endif set number "show line numbers " Show ruler and set format of statusline @@ -43,7 +45,7 @@ set softtabstop=4 "spell options set spelllang=pl,en -set spellfile=/home/gryf/.vim/pol.utf8.add +let &spellfile=expand('$HOME/.vim/pol.utf8.add') set splitbelow "Create new window below current one set swapfile "Use swap file @@ -109,7 +111,7 @@ if $TERM == 'linux' && !has("gui_running") endif "}}} "PLUGINS: {{{ -" eclim buffers {{{ +" eclim buffers {{{2 map b :Buffers " }}} "VimWIKI {{{2 @@ -128,7 +130,7 @@ let g:fuf_file_exclude = '\v\~$|\.(o|bak|swp|pyc|pyo|pyd)$|(^|[/\\])\.(hg|git|bz let g:showmarks_ignore_type = "hqprm" let g:showmarks_include = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" "}}} -"jsbeautify {{{3 +"jsbeautify {{{2 nnoremap ff :call g:Jsbeautify():retab! "}}} "TagListToo {{{2 @@ -154,7 +156,7 @@ nmap T :TagbarToggle "Pydoc {{{2 let g:pydoc_cmd = "/usr/bin/pydoc" "}}} -"mark {{{ +"mark {{{2 " addidtional colors -- fun! s:CustomHighlightings() highlight def MarkWord7 ctermbg=White ctermfg=Black guibg=#E8E8E8 guifg=Black @@ -165,7 +167,7 @@ endfun autocmd ColorScheme * call CustomHighlightings() "}}} -" DirDiff{{{ +" DirDiff {{{2 let g:DirDiffExcludes = "CVS,*.class,*.exe,.*.swp,*.pyc,*.pyo" " Make use of cursor keys nmap [c @@ -173,7 +175,7 @@ nmap ]c nmap \dk nmap \dj " }}} -" Buffergator {{{ +" Buffergator {{{2 let g:buffergator_split_size=10 let g:buffergator_viewport_split_policy='B' let g:buffergator_suppress_keymaps=1 diff --git a/ftplugin/python/python_fn.vim b/ftplugin/python/python_fn.vim index 7c7cf21..18cf71a 100644 --- a/ftplugin/python/python_fn.vim +++ b/ftplugin/python/python_fn.vim @@ -61,7 +61,8 @@ vmap ]# :call PythonCommentSelection() map ]u :call PythonUncommentSelection() vmap ]u :call PythonUncommentSelection() -map ]c :call PythonSelectObject("class") +" gryf: change mapping for class selection +map ]C :call PythonSelectObject("class") map ]d :call PythonSelectObject("function") map ] :call PythonNextLine(-1)