Merge branch 'master' of /home/mathieu/GitProject/config

This commit is contained in:
Mathieu Maret 2010-10-04 17:47:52 +02:00
commit 824d5d6256
2 changed files with 24 additions and 11 deletions

24
.vimrc
View File

@ -197,11 +197,11 @@ if has("autocmd")
autocmd BufRead,BufNewFile *.py syntax on autocmd BufRead,BufNewFile *.py syntax on
autocmd BufRead,BufNewFile *.py set ai autocmd BufRead,BufNewFile *.py set ai
autocmd BufRead,BufNewFile *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class autocmd BufRead,BufNewFile *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class
set tabstop=4 autocmd BufRead,BufNewFile *.py set tabstop=4
set expandtab autocmd BufRead,BufNewFile *.py set expandtab
set shiftwidth=4 autocmd BufRead,BufNewFile *.py set shiftwidth=4
set softtabstop=4 autocmd BufRead,BufNewFile *.py set softtabstop=4
set modeline autocmd BufRead,BufNewFile *.py set modeline
endif endif
" define whitespaces at end of line as bad whitespaces " define whitespaces at end of line as bad whitespaces
@ -255,7 +255,7 @@ let Tlist_Display_Prototype = 0
let Tlist_Display_Tag_Scope = 0 let Tlist_Display_Tag_Scope = 0
let Tlist_Show_One_File = 1 let Tlist_Show_One_File = 1
let Tlist_Compact_Format = 1 let Tlist_Compact_Format = 1
let Tlist_Enable_Fold_Column = 1 let Tlist_Enable_Fold_Column = 0
"let Tlist_File_Fold_Auto_Close = 1 "let Tlist_File_Fold_Auto_Close = 1
let Tlist_Inc_Winwidth = 0 let Tlist_Inc_Winwidth = 0
"let Tlist_Use_Horiz_Window = 1 "let Tlist_Use_Horiz_Window = 1
@ -430,8 +430,8 @@ nmap <S-F2> :split <C-R>=expand("%:h") . "/"<CR>
" allow embedded man page " allow embedded man page
runtime! ftplugin/man.vim runtime! ftplugin/man.vim
" show vimrc with shift+F1 " show vimrc with shift+F1
nmap <silent> <S-F1> :sview ~/.vimrc<CR>gg "nmap <silent> <S-F1> :sview ~/.vimrc<CR>gg
imap <F1> <Esc><S-F1> "imap <F1> <Esc><S-F1>
" show contextual help with F1 " show contextual help with F1
function Help() function Help()
try try
@ -441,7 +441,7 @@ function Help()
endtry endtry
endfunction endfunction
nmap <silent> <F1> :call Help()<CR> nmap <silent> <F1> :call Help()<CR>
imap <S-F1> <Esc><F1> imap <F1> <Esc><F1>
" show VIM help with alt+shift+F1 " show VIM help with alt+shift+F1
nmap <silent> <M-S-F1> :help <C-R>=expand("<cword>")<CR><CR> nmap <silent> <M-S-F1> :help <C-R>=expand("<cword>")<CR><CR>
imap <M-S-F1> <Esc><M-S-F1> imap <M-S-F1> <Esc><M-S-F1>
@ -479,7 +479,10 @@ endif
nmap <F10> zfa{<CR><CR> nmap <F10> zfa{<CR><CR>
" unfold or use End " unfold or use End
nmap <S-F10> zo<CR><CR> nmap <S-F10> zo<CR><CR>
" Autosave folding
"au BufWinLeave * mkview
" Autoload folding
"au BufWinEnter * silent loadview
"""""""""""""""""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""""""""""""""""
"Omni-completion par CTRL-X_CTRL-O "Omni-completion par CTRL-X_CTRL-O
@ -509,6 +512,7 @@ set tags=tags
"for when programming in build dir "for when programming in build dir
set tags+=../tags set tags+=../tags
set tags+=~/.vim/qttags set tags+=~/.vim/qttags
set tags+=~/.vim/qtembedded
" Affichage du prototype d'une fonction sur le " Affichage du prototype d'une fonction sur le
" plugin echofunc " plugin echofunc

View File

@ -1,4 +1,13 @@
ctags -f ~/.vim/qt4tags -R /usr/include/qt4/ ctags -f ~/.vim/qt4tags -R /usr/include/qt4/
ou si on a pas de .ctags
ctags -R --sort=yes --c++-kinds=+p --fields=+iaS --extra=+q --language-force=C++ -f gl /usr/include/GL/ # for OpenGL
ctags -R --sort=yes --c++-kinds=+p --fields=+iaS --extra=+q --language-force=C++ -f sdl /usr/include/SDL/ # for SDL
ctags -R --sort=yes --c++-kinds=+p --fields=+iaS --extra=+q --language-force=C++ -f qt4 /usr/include/qt4/ # for QT4
in .vimrc in .vimrc
set tags+=~/vim/st4tags set tags+=~/vim/qt4tags
" configure tags - add additional tags here or comment out not-used ones
set tags+=~/.vim/tags/gl
set tags+=~/.vim/tags/sdl
set tags+=~/.vim/tags/qt4