1
0
mirror of https://github.com/gryf/.vim.git synced 2025-12-17 19:40:29 +01:00

Removed old windows related stuff, corrections for git repositories

This commit is contained in:
2013-03-12 15:54:23 +01:00
parent a8f1365f18
commit 3263cd0c8f
8 changed files with 4 additions and 481 deletions

4
.hgsub
View File

@@ -4,7 +4,7 @@ bundle/git_gundo = [git]https://github.com/sjl/gundo.vim.git
bundle/doc_git_py2stdlib = [git]https://github.com/vim-scripts/Python-2.x-Standard-Library-Reference.git bundle/doc_git_py2stdlib = [git]https://github.com/vim-scripts/Python-2.x-Standard-Library-Reference.git
bundle/ft_git_pyflakes-vim = [git]https://github.com/kevinw/pyflakes-vim.git bundle/ft_git_pyflakes-vim = [git]https://github.com/kevinw/pyflakes-vim.git
bundle/ft_git_pydoc = [git]https://github.com/fs111/pydoc.vim.git bundle/ft_git_pydoc = [git]https://github.com/fs111/pydoc.vim.git
bundle/git_vcscommand = [git]git://repo.or.cz/vcscommand.git bundle/git_vcscommand = [git]http://repo.or.cz/r/vcscommand.git
bundle/git_tagbar = [git]https://github.com/majutsushi/tagbar.git bundle/git_tagbar = [git]https://github.com/majutsushi/tagbar.git
bundle/git_surround = [git]https://github.com/tpope/vim-surround.git bundle/git_surround = [git]https://github.com/tpope/vim-surround.git
bundle/git_snipmate = [git]https://github.com/msanders/snipmate.vim.git bundle/git_snipmate = [git]https://github.com/msanders/snipmate.vim.git
@@ -13,6 +13,6 @@ bundle/git_nerdcommenter = [git]https://github.com/scrooloose/nerdcommenter.git
bundle/git_ctrlp = [git]https://github.com/kien/ctrlp.vim.git bundle/git_ctrlp = [git]https://github.com/kien/ctrlp.vim.git
bundle/git_syntastic = [git]https://github.com/scrooloose/syntastic.git bundle/git_syntastic = [git]https://github.com/scrooloose/syntastic.git
bundle/git_taglisttoo = [git]https://github.com/ervandew/taglisttoo.git bundle/git_taglisttoo = [git]https://github.com/ervandew/taglisttoo.git
bundle/git_gitgutter = [git]git://github.com/airblade/vim-gitgutter.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-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_vim-nodejs-complete = [git]https://github.com/myhere/vim-nodejs-complete.git

View File

@@ -1,12 +0,0 @@
" Vim compiler file for Python
" Compiler: Static code checking tool for Python
" Maintainer: Roman 'gryf' Dobosz
" Last Change: 2010-09-12
" Version: 1.0
if exists("current_compiler")
finish
endif
let current_compiler = "autopylint"
CompilerSet makeprg=$VIM\\bin\\autopylint.py\ -p8\ %:p
CompilerSet efm=%f\|\ %t\|\ %l\|\ %c\|\ %m,%f\|\ %t\|\ %l\|\ %m

View File

@@ -1,69 +0,0 @@
setlocal cinkeys-=0#
setlocal indentkeys-=0#
setlocal expandtab
setlocal foldlevel=100
setlocal foldmethod=indent
setlocal list
setlocal noautoindent
setlocal smartindent
setlocal cinwords=if,elif,else,for,while,try,except,finally,def,class,with
setlocal smarttab
setlocal textwidth=78
setlocal colorcolumn=+1
" overwrite status line
setlocal statusline=%<%F\ %{TagInStatusLine()}\ %h%m%r%=%(%l,%c%V%)\ %3p%%
set wildignore+=*.pyc
inoremap # X<BS>#
"set ofu=syntaxcomplete#Complete
"autocmd FileType python setlocal omnifunc=pysmell#Complete
let python_highlight_all=1
"I don't want to have pyflakes errors in qfix, it interfering with Pep8/Pylint
let g:pyflakes_use_quickfix = 0
"Load views for py files
autocmd BufWinLeave *.py mkview
autocmd BufWinEnter *.py silent loadview
compiler autopylint
if !exists('*<SID>PyLintBuf')
function <SID>PyLintBuf(save_and_close)
echohl Statement
echo "Running pylint (ctrl-c to cancel) ..."
echohl Normal
let filename = expand('%:p')
let cmd = expand('$VIM') . '\bin\autopylint.py -8 "' . filename . '"'
if has('win32') || has('win64')
let cmd = 'cmd /c ' . cmd
endif
exec "bel silent new " . filename . ".lint"
exec "silent! read! " . cmd
if a:save_and_close != 0
exec "w!"
exec "bd"
endif
endfunction
command -bang -nargs=? PyLintBuf call <SID>PyLintBuf(<bang>0)
endif
map <F6> :PyLintBuf<cr>
finish "end here. all below is just for the record.
" Pylint function, which can be optionally mapped to some keys. Currently
" not used.
if !exists('*<SID>runPyLint')
function <SID>runPyLint()
echohl Statement
echo "Running pylint (ctrl-c to cancel) ..."
echohl Normal
:Pylint
endfunction
endif

View File

@@ -1,55 +0,0 @@
if exists("b:did_pdpep8_functions")
finish " only load once
else
let b:did_pdpep8_functions = 1
endif
if !exists('*s:pdPep8')
function s:pdPep8()
set lazyredraw
" Close any existing cwindows.
cclose
let l:grepformat_save = &grepformat
let l:grepprogram_save = &grepprg
set grepformat&vim
set grepformat&vim
let &grepformat = '%f:%l:%m'
let &grepprg = 'c:\\Python27\\Scripts\\pep8.exe --repeat --ignore=E111'
if &readonly == 0 | update | endif
silent! grep! %
let &grepformat = l:grepformat_save
let &grepprg = l:grepprogram_save
let l:mod_total = 0
let l:win_count = 1
" Determine correct window height
windo let l:win_count = l:win_count + 1
if l:win_count <= 2 | let l:win_count = 4 | endif
windo let l:mod_total = l:mod_total + winheight(0)/l:win_count |
\ execute 'resize +'.l:mod_total
" Open cwindow
execute 'belowright copen '.l:mod_total
nnoremap <buffer> <silent> c :cclose<CR>
set nolazyredraw
redraw!
endfunction
command! Pep8 call s:pdPep8()
endif
if !exists('*s:pdPep8Buf')
function s:pdPep8Buf()
echohl Statement
echo "Running pep8 (ctrl-c to cancel) ..."
echohl Normal
let file = expand('%:p')
"let cmd = 'pylint --reports=n --output-format=text "' . file . '"'
let cmd = 'c:\\Python26\\Scripts\\pep8.exe "' . file . '"'
if has('win32') || has('win64')
let cmd = 'cmd /c "' . cmd . '"'
endif
exec "bel silent new " . file . ".lint"
exec "silent! read! " . cmd
endfunction
command! Pep8buf call s:pdPep8Buf()
endif

View File

@@ -1,44 +0,0 @@
setlocal cinkeys-=0#
setlocal indentkeys-=0#
setlocal expandtab
setlocal foldlevel=100
setlocal foldmethod=indent
setlocal list
setlocal noautoindent
setlocal smartindent
setlocal cinwords=if,elif,else,for,while,try,except,finally,def,class,with
setlocal smarttab
setlocal textwidth=78
setlocal colorcolumn=+1
" overwrite status line
setlocal statusline=%<%F\ %{TagInStatusLine()}\ %h%m%r%=%(%l,%c%V%)\ %3p%%
set wildignore+=*.pyc
inoremap # X<BS>#
"set ofu=syntaxcomplete#Complete
"autocmd FileType python setlocal omnifunc=pysmell#Complete
let python_highlight_all=1
"I don't want to have pyflakes errors in qfix, it interfering with Pep8/Pylint
let g:pyflakes_use_quickfix = 0
"Load views for py files
autocmd BufWinLeave *.py mkview
autocmd BufWinEnter *.py silent loadview
finish "end here. all below is just for the record.
" Pylint function, which can be optionally mapped to some keys. Currently
" not used.
if !exists('*<SID>runPyLint')
function <SID>runPyLint()
echohl Statement
echo "Running pylint (ctrl-c to cancel) ..."
echohl Normal
:Pylint
endfunction
endif

View File

@@ -1,55 +0,0 @@
if exists("b:did_pdpep8_functions")
finish " only load once
else
let b:did_pdpep8_functions = 1
endif
if !exists('*s:pdPep8')
function s:pdPep8()
set lazyredraw
" Close any existing cwindows.
cclose
let l:grepformat_save = &grepformat
let l:grepprogram_save = &grepprg
set grepformat&vim
set grepformat&vim
let &grepformat = '%f:%l:%m'
let &grepprg = 'c:\\Python27\\Scripts\\pep8.exe --repeat --ignore=E111'
if &readonly == 0 | update | endif
silent! grep! %
let &grepformat = l:grepformat_save
let &grepprg = l:grepprogram_save
let l:mod_total = 0
let l:win_count = 1
" Determine correct window height
windo let l:win_count = l:win_count + 1
if l:win_count <= 2 | let l:win_count = 4 | endif
windo let l:mod_total = l:mod_total + winheight(0)/l:win_count |
\ execute 'resize +'.l:mod_total
" Open cwindow
execute 'belowright copen '.l:mod_total
nnoremap <buffer> <silent> c :cclose<CR>
set nolazyredraw
redraw!
endfunction
command! Pep8 call s:pdPep8()
endif
if !exists('*s:pdPep8Buf')
function s:pdPep8Buf()
echohl Statement
echo "Running pep8 (ctrl-c to cancel) ..."
echohl Normal
let file = expand('%:p')
"let cmd = 'pylint --reports=n --output-format=text "' . file . '"'
let cmd = 'c:\\Python26\\Scripts\\pep8.exe "' . file . '"'
if has('win32') || has('win64')
let cmd = 'cmd /c "' . cmd . '"'
endif
exec "bel silent new " . file . ".lint"
exec "silent! read! " . cmd
endfunction
command! Pep8buf call s:pdPep8Buf()
endif

205
pmxrc.vim
View File

@@ -1,205 +0,0 @@
set fileencoding=utf-8
set runtimepath+=$VIM/vimfiles/bundle_pmx
set viewoptions=cursor
"set guifont=Consolas:h10:cEASTEUROPE
set guifont=DejaVu_Sans_Mono:h9:cEASTEUROPE
set shiftwidth=2
set softtabstop=2
set tabstop=2
set listchars=tab:>-,trail:.
set guioptions=ceg
set mouse=a
set enc=utf-8
set printoptions=number:y
set pfn=Consolas:h10:cEASTEUROPE
let Tlist_Ctags_Cmd = expand('$VIM/bin/ctags.exe')
let g:tagbar_ctags_bin = expand('$VIM/bin/ctags.exe')
let g:browser = '"c:\Program Files\Mozilla Firefox\firefox.exe"'
autocmd BufWritePre *.spy :StripTrailingWhitespaces
autocmd BufWritePre *.spi :StripTrailingWhitespaces
autocmd BufWritePre *.opl :StripTrailingWhitespaces
autocmd BufRead *.opl set filetype=pd_opl
"CTRL-P
" Don't rely on VCS system, just do stuff relative to current dir. PMX sources
" are too huge
let g:ctrlp_working_path_mode = 0
"Grep
" Note: xargs from GnuWin32 package are unusable with this plugin - it refuses
" to pass find output to the grep. Fortunately, cygwin version (which is
" newer in fact) is working just fine. The only thing that is needed to
" set is to quote arguments passed to find:
let Grep_Shell_Quote_Char='"'
" If for some reason it is needed to use tools from GnuWin32 project, comment
" out following line:
let Grep_Cygwin_Find=1
" and uncomment one below:
"let Grep_Find_Use_Xargs=0
" Note: without xargs processing of the output will be much more slower than
" with it.
if has("gui_running")
highlight SpellBad term=underline gui=undercurl guisp=Orange
endif
"maximize window
au GUIEnter * simalt ~x
function GuiTabLabel()
" add the tab number
let label = '' "'['.tabpagenr()
" count number of open windows in the tab
"let wincount = tabpagewinnr(v:lnum, '$')
"if wincount > 1
" let label .= ', '.wincount
"endif
"let label .= '] '
let buflist = tabpagebuflist(v:lnum)
" add the file name without path information
let n = bufname(buflist[tabpagewinnr(v:lnum) - 1])
let label .= fnamemodify(n, ':t')
" modified since the last save?
for bufnr in buflist
if getbufvar(bufnr, '&modified')
let label .= ' *'
break
endif
endfor
return label
endfunction
set guitablabel=%{GuiTabLabel()}
"PMX: {{{
if exists("g:vim_bin_path")
finish
endif
let g:vim_bin_path = expand($VIM) . '/bin'
let $REF_DRIVE='R:'
let $LOCAL_DRIVE='L:'
let $PMXOS='WINNT'
let $PDMODE='RELEASE'
let $SOLUTION='mes'
let $OUIDICTPATH='../genR.WIN'
let $PATH='c:\Python23;' . $PATH
let $USE_HG_REPO='Y'
if !exists("g:pmx_path")
let g:pmx_path = "L:"
endif
if !has("python")
finish
endif
" Switch between HG and CVS in vcscommand plugin
function <SID>VCSSwitch()
echohl Statement
if exists("g:VCSTypeOverride")
if g:VCSTypeOverride == "HG"
let g:VCSTypeOverride = "CVS"
echo "Switched to CVS"
else
let g:VCSTypeOverride = "HG"
echo "Switched to HG"
endif
else
let g:VCSTypeOverride = "HG"
echo "Switched to HG"
endif
echohl Normal
endfunction
map <F3> :call <SID>VCSSwitch()<cr>
" stupid hard-coded way to add paths to let VIm know where to look for the
" files, yet it is not perfect.
python << EOF
import os
import vim
pmx_path = vim.eval("g:pmx_path")
pmx_path = pmx_path.replace("\\", "/")
if not pmx_path.endswith("/"):
pmx_path += "/"
vim.command("set tags+=" + pmx_path + ".vim_cache/tags")
pyothers = ["runtime/System/BIN.Win/others/python/Lib/PIL",
"runtime/System/BIN.Win/others/python/Lib/coverage",
"runtime/System/BIN.Win/others/python/Lib/ctypes",
"runtime/System/BIN.Win/others/python/Lib/pyPdf"]
pyfiles = ["runtime/System/pylib",
"runtime/System/pylib/PythonWin",
"runtime/System/pylib/pdgui",
"runtime/System/pylib/pdoracle",
"runtime/System/pylib/pdpersis",
"runtime/System/pylib/pdunittest",
"runtime/System/pylib/pdtest",
"runtime/System/pylib/pdutil",
"runtime/System/pylib/spyce",
"runtime/System/pylib/std",
"runtime/System/pylib/std/lib-old",
"runtime/System/pylib/std/lib-tk",
"runtime/System/pylib/win32/lib"]
for i in pyfiles:
vim.command("set path+=" + pmx_path + i)
for i in pyothers:
vim.command("set path+=" + pmx_path + i)
def map_drive_L(path):
assert os.path.exists(path)
path = os.path.abspath(path)
if os.path.exists("L:"):
os.system("subst L: /D")
os.system("subst L: " + path)
def update_tags():
assert os.path.exists(pmx_path)
opl_cfg = os.path.normpath(os.path.join(vim.eval("$VIM"),
"bin",
"ctags_opl.cnf"))
opl_path = os.path.normpath(os.path.join(pmx_path, "opl"))
pylib_path = os.path.join(pmx_path, "runtime", "system", "pylib")
pylib_path = os.path.normpath(pylib_path)
pylib_path += " " + os.path.normpath(pmx_path + \
'runtime/System/BIN.Win/others/python/Lib')
tag_dir = os.path.join(pmx_path, ".vim_cache")
tag_path = os.path.normpath(os.path.join(tag_dir, "tags"))
if not os.path.exists(tag_dir):
os.mkdir(tag_dir)
# find tags for python files and tags for OPL files if exists
ctags = os.path.join(vim.eval("$VIM"), "bin", "ctags.exe")
ctags = os.path.normpath(ctags)
cmd = 'start cmd /c '
cmd += ctags + ' -R --python-kinds=-i'
if os.path.exists(opl_path) and os.path.exists(opl_cfg):
cmd += ' --options=' + opl_cfg
cmd += ' -f ' + tag_path + ' ' + pylib_path
if os.path.exists(opl_path) and os.path.exists(opl_cfg):
cmd += ' ' + opl_path
print cmd
os.system(cmd)
EOF
command -nargs=1 -complete=dir MapDriveL py map_drive_L(<f-args>)
command UpdateTags py update_tags()
"}}}
" vim:ts=4:sw=4:wrap:fdm=marker:

View File

@@ -1,17 +1,11 @@
set fileencoding=utf-8 set fileencoding=utf-8
set runtimepath+=$VIM/vimfiles/bundle_win
set viewoptions=cursor
"set guifont=Consolas:h10:cEASTEUROPE
set guifont=DejaVu_Sans_Mono:h9:cEASTEUROPE set guifont=DejaVu_Sans_Mono:h9:cEASTEUROPE
set listchars=tab:>-,trail:. set listchars=tab:>-,trail:.
set guioptions=ceg set guioptions=ceg
set mouse=a
set enc=utf-8 set enc=utf-8
set printoptions=number:y
set pfn=Consolas:h10:cEASTEUROPE
let Tlist_Ctags_Cmd = expand('$VIM/bin/ctags.exe') " assuming all useful tools are in $VIM/bin directory
let g:tagbar_ctags_bin = expand('$VIM/bin/ctags.exe') let $PATH .= ";".expand('$VIM/bin')
let g:browser = '"c:\Program Files\Mozilla Firefox\firefox.exe"' let g:browser = '"c:\Program Files\Mozilla Firefox\firefox.exe"'
autocmd BufWritePre *.spy :StripTrailingWhitespaces autocmd BufWritePre *.spy :StripTrailingWhitespaces
@@ -20,11 +14,6 @@ autocmd BufWritePre *.opl :StripTrailingWhitespaces
autocmd BufRead *.opl set filetype=pd_opl autocmd BufRead *.opl set filetype=pd_opl
autocmd BufRead *.py set filetype=python autocmd BufRead *.py set filetype=python
"CTRL-P
" Don't rely on VCS system, just do stuff relative to current dir. PMX sources
" are too huge
let g:ctrlp_working_path_mode = 0
"Grep "Grep
" Note: xargs from GnuWin32 package are unusable with this plugin - it refuses " Note: xargs from GnuWin32 package are unusable with this plugin - it refuses
" to pass find output to the grep. Fortunately, cygwin version (which is " to pass find output to the grep. Fortunately, cygwin version (which is
@@ -50,13 +39,6 @@ function GuiTabLabel()
" add the tab number " add the tab number
let label = '' "'['.tabpagenr() let label = '' "'['.tabpagenr()
" count number of open windows in the tab
"let wincount = tabpagewinnr(v:lnum, '$')
"if wincount > 1
" let label .= ', '.wincount
"endif
"let label .= '] '
let buflist = tabpagebuflist(v:lnum) let buflist = tabpagebuflist(v:lnum)
" add the file name without path information " add the file name without path information
@@ -80,23 +62,4 @@ if exists("g:vim_bin_path")
endif endif
let g:vim_bin_path = expand($VIM) . '/bin' let g:vim_bin_path = expand($VIM) . '/bin'
" Switch between HG and CVS in vcscommand plugin
function <SID>VCSSwitch()
echohl Statement
if exists("g:VCSTypeOverride")
if g:VCSTypeOverride == "HG"
let g:VCSTypeOverride = "CVS"
echo "Switched to CVS"
else
let g:VCSTypeOverride = "HG"
echo "Switched to HG"
endif
else
let g:VCSTypeOverride = "HG"
echo "Switched to HG"
endif
echohl Normal
endfunction
map <F3> :call <SID>VCSSwitch()<cr>
" vim:ts=4:sw=4:wrap:fdm=marker: " vim:ts=4:sw=4:wrap:fdm=marker: