From 92ae62f4db11ccbfc41bc9f24fe3859aef456f34 Mon Sep 17 00:00:00 2001 From: Audric Schiltknecht Date: Wed, 23 Jan 2013 21:22:24 +0100 Subject: Little clean-up Easier (I think...) directory layout --- vim/.vim/autoload/pathogen.vim | 230 ---------------------------------- vim/.vim/bundle/after/plugin | 1 - vim/.vim/bundle/fugitive | 1 - vim/.vim/bundle/nerdtree | 1 - vim/.vim/bundle/sbt | 1 - vim/.vim/bundle/syntastic | 1 - vim/.vim/bundle/vim-scala | 1 - vim/.vim/memory.txt | 50 -------- vim/.vim/shortkeys.vim | 68 ---------- vim/.vim/specific/cpp.vim | 28 ----- vim/.vim/specific/cxx.vim | 25 ---- vim/.vim/specific/ddl.vim | 1 - vim/.vim/specific/egg.vim | 1 - vim/.vim/specific/html.vim | 1 - vim/.vim/specific/java.vim | 1 - vim/.vim/specific/js.vim | 1 - vim/.vim/specific/mp.vim | 1 - vim/.vim/specific/pro.vim | 1 - vim/.vim/specific/py.vim | 201 ----------------------------- vim/.vim/specific/tex.vim | 10 -- vim/.vim/specific/tla.vim | 2 - vim/.vim/specific/xml.vim | 1 - vim/.vim/templates/autocompletion.vim | 11 -- vim/.vim/templates/c.tpl | 8 -- vim/.vim/templates/cpp.tpl | 8 -- vim/.vim/templates/h.tpl | 14 --- vim/.vim/templates/html.tpl | 11 -- vim/.vim/templates/java.tpl | 11 -- vim/.vim/templates/py.tpl | 4 - 29 files changed, 695 deletions(-) delete mode 100644 vim/.vim/autoload/pathogen.vim delete mode 100644 vim/.vim/bundle/after/plugin delete mode 160000 vim/.vim/bundle/fugitive delete mode 160000 vim/.vim/bundle/nerdtree delete mode 160000 vim/.vim/bundle/sbt delete mode 160000 vim/.vim/bundle/syntastic delete mode 160000 vim/.vim/bundle/vim-scala delete mode 100644 vim/.vim/memory.txt delete mode 100644 vim/.vim/shortkeys.vim delete mode 100644 vim/.vim/specific/cpp.vim delete mode 100644 vim/.vim/specific/cxx.vim delete mode 100644 vim/.vim/specific/ddl.vim delete mode 100644 vim/.vim/specific/egg.vim delete mode 100644 vim/.vim/specific/html.vim delete mode 100644 vim/.vim/specific/java.vim delete mode 100644 vim/.vim/specific/js.vim delete mode 100644 vim/.vim/specific/mp.vim delete mode 100644 vim/.vim/specific/pro.vim delete mode 100644 vim/.vim/specific/py.vim delete mode 100644 vim/.vim/specific/tex.vim delete mode 100644 vim/.vim/specific/tla.vim delete mode 100644 vim/.vim/specific/xml.vim delete mode 100644 vim/.vim/templates/autocompletion.vim delete mode 100644 vim/.vim/templates/c.tpl delete mode 100644 vim/.vim/templates/cpp.tpl delete mode 100644 vim/.vim/templates/h.tpl delete mode 100644 vim/.vim/templates/html.tpl delete mode 100644 vim/.vim/templates/java.tpl delete mode 100644 vim/.vim/templates/py.tpl (limited to 'vim/.vim') diff --git a/vim/.vim/autoload/pathogen.vim b/vim/.vim/autoload/pathogen.vim deleted file mode 100644 index be68389..0000000 --- a/vim/.vim/autoload/pathogen.vim +++ /dev/null @@ -1,230 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope -" Version: 2.0 - -" Install in ~/.vim/autoload (or ~\vimfiles\autoload). -" -" For management of individually installed plugins in ~/.vim/bundle (or -" ~\vimfiles\bundle), adding `call pathogen#infect()` to your .vimrc -" prior to `fileype plugin indent on` is the only other setup necessary. -" -" The API is documented inline below. For maximum ease of reading, -" :set foldmethod=marker - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -" Point of entry for basic default usage. Give a directory name to invoke -" pathogen#runtime_append_all_bundles() (defaults to "bundle"), or a full path -" to invoke pathogen#runtime_prepend_subdirectories(). Afterwards, -" pathogen#cycle_filetype() is invoked. -function! pathogen#infect(...) abort " {{{1 - let source_path = a:0 ? a:1 : 'bundle' - if source_path =~# '[\\/]' - call pathogen#runtime_prepend_subdirectories(source_path) - else - call pathogen#runtime_append_all_bundles(source_path) - endif - call pathogen#cycle_filetype() -endfunction " }}}1 - -" Split a path into a list. -function! pathogen#split(path) abort " {{{1 - if type(a:path) == type([]) | return a:path | endif - let split = split(a:path,'\\\@,'edit',) -command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',) -command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',) -command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',) -command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',) -command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',) -command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',) -command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,'lcd') - -" vim:set ft=vim ts=8 sw=2 sts=2: diff --git a/vim/.vim/bundle/after/plugin b/vim/.vim/bundle/after/plugin deleted file mode 100644 index 075578a..0000000 --- a/vim/.vim/bundle/after/plugin +++ /dev/null @@ -1 +0,0 @@ -au VimLeave * silent py sbt_close() diff --git a/vim/.vim/bundle/fugitive b/vim/.vim/bundle/fugitive deleted file mode 160000 index f64ba46..0000000 --- a/vim/.vim/bundle/fugitive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f64ba46509119810959bd03e8e47348cabf804be diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree deleted file mode 160000 index 1dc3891..0000000 --- a/vim/.vim/bundle/nerdtree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1dc3891f960c25aa3f23aa46f5afc8d41db38233 diff --git a/vim/.vim/bundle/sbt b/vim/.vim/bundle/sbt deleted file mode 160000 index ac2609c..0000000 --- a/vim/.vim/bundle/sbt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ac2609cdb44a0a7504b74a5f6fa7c6fd3d62d5f3 diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic deleted file mode 160000 index ccecbcb..0000000 --- a/vim/.vim/bundle/syntastic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ccecbcb4606ad6a7cfecae5eacb15022ce521b4d diff --git a/vim/.vim/bundle/vim-scala b/vim/.vim/bundle/vim-scala deleted file mode 160000 index e78d6eb..0000000 --- a/vim/.vim/bundle/vim-scala +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e78d6ebbedd89280d1e8696dfb34c6381ecfc7cb diff --git a/vim/.vim/memory.txt b/vim/.vim/memory.txt deleted file mode 100644 index c6c9b48..0000000 --- a/vim/.vim/memory.txt +++ /dev/null @@ -1,50 +0,0 @@ - Aide Mémoire pour VIM - - : Affichage de l'aide - : Compilation - : Passe en mode copie - : A/D gestion de la souris - : Affiche les caractères spéciaux - : Nettoie le fichier - : - : - : Explorateur de fichiers - : Afficher les lignes trop longues - - Onglets : - : Onglet précédent - : Onglet suivant - : Déplace l'onglet à gauche - : Déplace l'onglet à droite - - : Commentaire suivant - : Commentaire précédent - - Folding du code : - : Ouvre/ferme le bloc - : Ferme tous les blocs - : Ouvre tous les blocs - - Compilation : - : Erreur précédente - : Erreur suivante - - Dans l'aide de VIM : - : Suit le lien - : Page précédente - - Templates : - : Saute vers zone compléter - - LaTeX : - : Formattage - - C/C++ : - : Génération des tags - - dd : Supprimer une ligne - -Hexa : -Ouerture fichier : vim -b -Conversion binaire -> hexa : :%!xxd -COnversion hexa -> binaire : :%!xxd -r diff --git a/vim/.vim/shortkeys.vim b/vim/.vim/shortkeys.vim deleted file mode 100644 index f693e2a..0000000 --- a/vim/.vim/shortkeys.vim +++ /dev/null @@ -1,68 +0,0 @@ -" Navigation sur les longues lignes -map gj -map gk -imap gj -imap gk - -" Saut vers les zones à completer lors de l'utilisation des templates -map /<+.\{-1,}+>c/+>e -imap /<+.\{-1,}+>c/+>e - -" Affichage de l'aide -map :call HelpMemory() -imap :call HelpMemory() - -" On compile -map :make - -" Passer en mode Copie -set pastetoggle= - -" Gestion de la souris -map :call ToggleMouseActivate() -imap :call ToggleMouseActivate() - -" Caractères spéciaux -map :call DisplayChar() -imap :call DisplayChar() - -" Nettoyage du fichier -map :call ClearCode() -imap :call ClearCode() - -" Activation/Désactivation de la fenêtre d'exploration des fichiers -map :NERDTreeToggle -imap :NERDTreeToggle - -" Affichage des lignes trop longues -map :call HlTooLarge() -imap :call HlTooLarge() - -" Touches de navigation dans les onglets -map :tabprevious -map :tabnext -map :call MoveTab('left') -map :call MoveTab('right') - -" Accès aux commentaires -map ]/ -map [/ - -"" Gestion des foldings de code -" Alterne ouvert/ferme -nnoremap za -" Ferme tout -nnoremap zm -" Ouvre tout -nnoremap zr - -" Déplacement dans les erreurs d'une compilation via Ctrl-PgUp/Down -map :cprevious -map :cnext - -" Navigation dans l'aide de Vim -"On suit un lien en appuyant sur Return -map -"Retour page précédente avec Backspace -map - diff --git a/vim/.vim/specific/cpp.vim b/vim/.vim/specific/cpp.vim deleted file mode 100644 index 4dfe592..0000000 --- a/vim/.vim/specific/cpp.vim +++ /dev/null @@ -1,28 +0,0 @@ -map :!ctags * --c-types=+p --c++-kinds=+p --fields=+iaS --extra=+q . -set tags+=$HOME/.vim/tags/stdlib.tags -set completeopt=menu -let OmniCpp_SelectFirstItem = 2 - - -" Vim syntax file -" Language: C++ special highlighting for STL classes and methods -" Maintainer: Jean-Francois Guchens (thanks to Nathan Skvirsky) -" Last Change: 2008 May 02 - -syn keyword cppSTL abort abs accumulate acos adjacent_difference adjacent_find adjacent_find_if any append asctime asin assert assign at atan atan2 atexit atof atoi atol back back_inserter bad bad_alloc bad_cast bad_exception bad_typeid badbit beg begin binary_compose binary_negate binary_search bind2nd binder1st binder2nd bitset bsearch c_str calloc capacity ceil cerr cin clear clearerr clock clog close compare compose1 compose2 construct copy copy_backward copy_n cos cosh count count_if cout ctime data destroy difference_type difftime div domain_error empty end endl eof eofbit equal equal_range erase exception exit exp fabs fail failbit failure fclose feof ferror fflush fgetc fgetpos fgets fill fill_n find find_end find_first_not_of find_first_of find_if find_last_not_of find_last_of first flags flip floor flush fmod fopen for_each fprintf fputc fputs fread free freopen frexp front fscanf fseek fsetpos ftell fwrite gcount generate generate_n get get_temporary_buffer getc getchar getenv getline gets gmtime good goodbit greater greater_equal ignore in includes inner_product inplace_merge insert inserter invalid_argument ios ios_base iostate iota is_heap is_open is_sorted isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit iter_swap iterator_category key_comp ldiv length length_error less less_equal lexicographical_compare lexicographical_compare_3way localtime log log10 logic_error logical_and logical_not logical_or longjmp lower_bound make_heap malloc max max_element max_size mem_fun mem_fun1 mem_fun1_ref mem_fun_ref memchr memcpy memmove memset merge min min_element minus mismatch mktime modf modulus multiplies negate next_permutation npos nth_element numeric_limits open out_of_range overflow_error partial_sort partial_sort_copy partial_sum partition peek perror plus pop pop_back pop_front pop_heap pow power precision prev_permutation printf ptr_fun push push_back push_front push_heap put putback putc putchar puts qsort raise rand random_sample random_sample_n random_shuffle range_error rbegin rdbuf rdstate read realloc reference remove remove_copy remove_copy_if remove_if rename rend replace replace_copy replace_copy_if replace_if reserve reset resize return_temporary_buffer reverse reverse_copy rewind rfind rotate rotate_copy runtime_error scanf search search_n second seekg seekp set_difference set_intersection set_symmetric_difference set_union setbuf setf setjmp setlocale setvbuf signal sin sinh size size_t size_type sort sort_heap splice sprintf sqrt srand sscanf stable_partition stable_sort std str strcat strchr strcmp strcoll strcpy strcspn strerror strftime string strlen strncat strncmp strncpy strpbrk strrchr strspn strstr strtod strtok strtol strtoul strxfrm substr swap swap_ranges sync_with_stdio system tan tanh tellg tellp test time time_t tmpfile tmpnam to_string to_ulong tolower top toupper transform unary_compose unary_negate underflow_error unget ungetc uninitialized_copy uninitialized_copy_n uninitialized_fill uninitialized_fill_n unique unique_copy unsetf upper_bound va_arg value_comp value_type vfprintf vprintf vsprintf width write - -syn keyword cppSTLtype istreambuf_iterator filebuf string ofstream ifstream stream istream_iterator istringstream ostream ostream_iterator ostringstream fstream auto_ptr pointer pointer_to_binary_function pointer_to_unary_function basic_string bit_vector bitset char_producer deque hash hash_map hash_multimap hash_multiset hash_set list map multimap multiset queue priority_queue rope set stack vector back_insert_iterator iterator bidirectional_iterator bidirectional_iterator_tag forward_iterator forward_iterator_tag front_insert_iterator input_iterator input_iterator_tag insert_iterator istream_iterator iterator_traits ostream_iterator output_iterator output_iterator_tag random_access_iterator random_access_iterator_tag raw_storage_iterator reverse_bidirectional_iterator reverse_iterator sequence_buffer binary_compose binary_function binary_negate binder1st binder2nd divides equal_to unary_compose unary_function unary_negate pair char_traits const_iterator reverse_iterator temporary_buffer - -" Default highlighting -if version >= 508 || !exists("did_cpp_syntax_inits") - if version < 508 - let did_cpp_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - HiLink cppSTL Identifier - HiLink cppSTLtype Type - delcommand HiLink -endif - diff --git a/vim/.vim/specific/cxx.vim b/vim/.vim/specific/cxx.vim deleted file mode 100644 index 6aada59..0000000 --- a/vim/.vim/specific/cxx.vim +++ /dev/null @@ -1,25 +0,0 @@ -set completeopt=menu -let OmniCpp_SelectFirstItem = 2 - -" Vim syntax file -" Language: C++ special highlighting for STL classes and methods -" Maintainer: Jean-Francois Guchens (thanks to Nathan Skvirsky) -" Last Change: 2008 May 02 - -syn keyword cppSTL abort abs accumulate acos adjacent_difference adjacent_find adjacent_find_if any append asctime asin assert assign at atan atan2 atexit atof atoi atol back back_inserter bad bad_alloc bad_cast bad_exception bad_typeid badbit beg begin binary_compose binary_negate binary_search bind2nd binder1st binder2nd bitset bsearch c_str calloc capacity ceil cerr cin clear clearerr clock clog close compare compose1 compose2 construct copy copy_backward copy_n cos cosh count count_if cout ctime data destroy difference_type difftime div domain_error empty end endl eof eofbit equal equal_range erase exception exit exp fabs fail failbit failure fclose feof ferror fflush fgetc fgetpos fgets fill fill_n find find_end find_first_not_of find_first_of find_if find_last_not_of find_last_of first flags flip floor flush fmod fopen for_each fprintf fputc fputs fread free freopen frexp front fscanf fseek fsetpos ftell fwrite gcount generate generate_n get get_temporary_buffer getc getchar getenv getline gets gmtime good goodbit greater greater_equal ignore in includes inner_product inplace_merge insert inserter invalid_argument ios ios_base iostate iota is_heap is_open is_sorted isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit iter_swap iterator_category key_comp ldiv length length_error less less_equal lexicographical_compare lexicographical_compare_3way localtime log log10 logic_error logical_and logical_not logical_or longjmp lower_bound make_heap malloc max max_element max_size mem_fun mem_fun1 mem_fun1_ref mem_fun_ref memchr memcpy memmove memset merge min min_element minus mismatch mktime modf modulus multiplies negate next_permutation npos nth_element numeric_limits open out_of_range overflow_error partial_sort partial_sort_copy partial_sum partition peek perror plus pop pop_back pop_front pop_heap pow power precision prev_permutation printf ptr_fun push push_back push_front push_heap put putback putc putchar puts qsort raise rand random_sample random_sample_n random_shuffle range_error rbegin rdbuf rdstate read realloc reference remove remove_copy remove_copy_if remove_if rename rend replace replace_copy replace_copy_if replace_if reserve reset resize return_temporary_buffer reverse reverse_copy rewind rfind rotate rotate_copy runtime_error scanf search search_n second seekg seekp set_difference set_intersection set_symmetric_difference set_union setbuf setf setjmp setlocale setvbuf signal sin sinh size size_t size_type sort sort_heap splice sprintf sqrt srand sscanf stable_partition stable_sort std str strcat strchr strcmp strcoll strcpy strcspn strerror strftime string strlen strncat strncmp strncpy strpbrk strrchr strspn strstr strtod strtok strtol strtoul strxfrm substr swap swap_ranges sync_with_stdio system tan tanh tellg tellp test time time_t tmpfile tmpnam to_string to_ulong tolower top toupper transform unary_compose unary_negate underflow_error unget ungetc uninitialized_copy uninitialized_copy_n uninitialized_fill uninitialized_fill_n unique unique_copy unsetf upper_bound va_arg value_comp value_type vfprintf vprintf vsprintf width write - -syn keyword cppSTLtype istreambuf_iterator filebuf string ofstream ifstream stream istream_iterator istringstream ostream ostream_iterator ostringstream fstream auto_ptr pointer pointer_to_binary_function pointer_to_unary_function basic_string bit_vector bitset char_producer deque hash hash_map hash_multimap hash_multiset hash_set list map multimap multiset queue priority_queue rope set stack vector back_insert_iterator iterator bidirectional_iterator bidirectional_iterator_tag forward_iterator forward_iterator_tag front_insert_iterator input_iterator input_iterator_tag insert_iterator istream_iterator iterator_traits ostream_iterator output_iterator output_iterator_tag random_access_iterator random_access_iterator_tag raw_storage_iterator reverse_bidirectional_iterator reverse_iterator sequence_buffer binary_compose binary_function binary_negate binder1st binder2nd divides equal_to unary_compose unary_function unary_negate pair char_traits const_iterator reverse_iterator temporary_buffer - -" Default highlighting -if version >= 508 || !exists("did_cpp_syntax_inits") - if version < 508 - let did_cpp_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - HiLink cppSTL Identifier - HiLink cppSTLtype Type - delcommand HiLink -endif - diff --git a/vim/.vim/specific/ddl.vim b/vim/.vim/specific/ddl.vim deleted file mode 100644 index 31b9c56..0000000 --- a/vim/.vim/specific/ddl.vim +++ /dev/null @@ -1 +0,0 @@ -set filetype=sql diff --git a/vim/.vim/specific/egg.vim b/vim/.vim/specific/egg.vim deleted file mode 100644 index 137b3bd..0000000 --- a/vim/.vim/specific/egg.vim +++ /dev/null @@ -1 +0,0 @@ -setf egg diff --git a/vim/.vim/specific/html.vim b/vim/.vim/specific/html.vim deleted file mode 100644 index 6c65216..0000000 --- a/vim/.vim/specific/html.vim +++ /dev/null @@ -1 +0,0 @@ -map :%w !xmllint --valid --noout - diff --git a/vim/.vim/specific/java.vim b/vim/.vim/specific/java.vim deleted file mode 100644 index 8e94e99..0000000 --- a/vim/.vim/specific/java.vim +++ /dev/null @@ -1 +0,0 @@ -let java_highlight_functions="style" diff --git a/vim/.vim/specific/js.vim b/vim/.vim/specific/js.vim deleted file mode 100644 index 3829e28..0000000 --- a/vim/.vim/specific/js.vim +++ /dev/null @@ -1 +0,0 @@ -set ft=javascript.jquery diff --git a/vim/.vim/specific/mp.vim b/vim/.vim/specific/mp.vim deleted file mode 100644 index 3202f68..0000000 --- a/vim/.vim/specific/mp.vim +++ /dev/null @@ -1 +0,0 @@ -set nospell diff --git a/vim/.vim/specific/pro.vim b/vim/.vim/specific/pro.vim deleted file mode 100644 index 202f824..0000000 --- a/vim/.vim/specific/pro.vim +++ /dev/null @@ -1 +0,0 @@ -set filetype=prolog diff --git a/vim/.vim/specific/py.vim b/vim/.vim/specific/py.vim deleted file mode 100644 index dcd9ced..0000000 --- a/vim/.vim/specific/py.vim +++ /dev/null @@ -1,201 +0,0 @@ -" Python indent file -" Language: Python -" Maintainer: Eric Mc Sween -" Original Author: David Bustos -" Last Change: 2004 Jun 07 - -" Only load this indent file when no other was loaded. -if exists("b:did_indent") - finish -endif -let b:did_indent = 1 - -setlocal expandtab -setlocal nolisp -"setlocal autoindent -setlocal shiftwidth=4 -setlocal tabstop=4 -setlocal indentexpr=GetPythonIndent(v:lnum) -setlocal indentkeys=!^F,o,O,<:>,0),0],0},=elif,=except -"Retour à la ligne auto au bout de 80 lignes -setlocal textwidth=80 - -let s:maxoff = 50 - -" Find backwards the closest open parenthesis/bracket/brace. -function! s:SearchParensPair() - let line = line('.') - let col = col('.') - - " Skip strings and comments and don't look too far - let skip = "line('.') < " . (line - s:maxoff) . " ? dummy :" . - \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? ' . - \ '"string\\|comment"' - - " Search for parentheses - call cursor(line, col) - let parlnum = searchpair('(', '', ')', 'bW', skip) - let parcol = col('.') - - " Search for brackets - call cursor(line, col) - let par2lnum = searchpair('\[', '', '\]', 'bW', skip) - let par2col = col('.') - - " Search for braces - call cursor(line, col) - let par3lnum = searchpair('{', '', '}', 'bW', skip) - let par3col = col('.') - - " Get the closest match - if par2lnum > parlnum || (par2lnum == parlnum && par2col > parcol) - let parlnum = par2lnum - let parcol = par2col - endif - if par3lnum > parlnum || (par3lnum == parlnum && par3col > parcol) - let parlnum = par3lnum - let parcol = par3col - endif - - " Put the cursor on the match - if parlnum > 0 - call cursor(parlnum, parcol) - endif - return parlnum -endfunction - -" Find the start of a multi-line statement -function! s:StatementStart(lnum) - let lnum = a:lnum - while 1 - if getline(lnum - 1) =~ '\\$' - let lnum = lnum - 1 - else - call cursor(lnum, 1) - let maybe_lnum = s:SearchParensPair() - if maybe_lnum < 1 - return lnum - else - let lnum = maybe_lnum - endif - endif - endwhile -endfunction - -" Find the block starter that matches the current line -function! s:BlockStarter(lnum, block_start_re) - let lnum = a:lnum - let maxindent = 10000 " whatever - while lnum > 1 - let lnum = prevnonblank(lnum - 1) - if indent(lnum) < maxindent - if getline(lnum) =~ a:block_start_re - return lnum - else - let maxindent = indent(lnum) - " It's not worth going further if we reached the top level - if maxindent == 0 - return -1 - endif - endif - endif - endwhile - return -1 -endfunction - -function! GetPythonIndent(lnum) - - " First line has indent 0 - if a:lnum == 1 - return 0 - endif - - " If we can find an open parenthesis/bracket/brace, line up with it. - call cursor(a:lnum, 1) - let parlnum = s:SearchParensPair() - if parlnum > 0 - let parcol = col('.') - let closing_paren = match(getline(a:lnum), '^\s*[])}]') != -1 - if match(getline(parlnum), '[([{]\s*$', parcol - 1) != -1 - if closing_paren - return indent(parlnum) - else - return indent(parlnum) + &shiftwidth - endif - else - if closing_paren - return parcol - 1 - else - return parcol - endif - endif - endif - - " Examine this line - let thisline = getline(a:lnum) - let thisindent = indent(a:lnum) - - " If the line starts with 'elif' or 'else', line up with 'if' or 'elif' - if thisline =~ '^\s*\(elif\|else\)\>' - let bslnum = s:BlockStarter(a:lnum, '^\s*\(if\|elif\)\>') - if bslnum > 0 - return indent(bslnum) - else - return -1 - endif - endif - - " If the line starts with 'except' or 'finally', line up with 'try' - " or 'except' - if thisline =~ '^\s*\(except\|finally\)\>' - let bslnum = s:BlockStarter(a:lnum, '^\s*\(try\|except\)\>') - if bslnum > 0 - return indent(bslnum) - else - return -1 - endif - endif - - " Examine previous line - let plnum = a:lnum - 1 - let pline = getline(plnum) - let sslnum = s:StatementStart(plnum) - - " If the previous line is blank, keep the same indentation - if pline =~ '^\s*$' - return -1 - endif - - " If this line is explicitly joined, try to find an indentation that looks - " good. - if pline =~ '\\$' - let compound_statement = '^\s*\(if\|while\|for\s.*\sin\|except\)\s*' - let maybe_indent = matchend(getline(sslnum), compound_statement) - if maybe_indent != -1 - return maybe_indent - else - return indent(sslnum) + &sw * 2 - endif - endif - - " If the previous line ended with a colon, indent relative to - " statement start. - if pline =~ ':\s*$' - return indent(sslnum) + &sw - endif - - " If the previous line was a stop-execution statement or a pass - if getline(sslnum) =~ '^\s*\(break\|continue\|raise\|return\|pass\)\>' - " See if the user has already dedented - if indent(a:lnum) > indent(sslnum) - &sw - " If not, recommend one dedent - return indent(sslnum) - &sw - endif - " Otherwise, trust the user - return -1 - endif - - " In all other cases, line up with the start of the previous statement. - return indent(sslnum) -endfunction - diff --git a/vim/.vim/specific/tex.vim b/vim/.vim/specific/tex.vim deleted file mode 100644 index 204235a..0000000 --- a/vim/.vim/specific/tex.vim +++ /dev/null @@ -1,10 +0,0 @@ -" this is mostly a matter of taste. but LaTeX looks good with just a bit -" of indentation. -set sw=2 -set softtabstop=2 -" TIP: if you write your \label's as \label{fig:something}, then if you -" type in \ref{fig: and press you will automatically cycle through -" all the figure labels. Very useful! -set iskeyword+=: - -set makeprg=pdflatex\ -shell-escape\ % diff --git a/vim/.vim/specific/tla.vim b/vim/.vim/specific/tla.vim deleted file mode 100644 index 9629698..0000000 --- a/vim/.vim/specific/tla.vim +++ /dev/null @@ -1,2 +0,0 @@ -set syntax=vhdl -set nospell diff --git a/vim/.vim/specific/xml.vim b/vim/.vim/specific/xml.vim deleted file mode 100644 index 3202f68..0000000 --- a/vim/.vim/specific/xml.vim +++ /dev/null @@ -1 +0,0 @@ -set nospell diff --git a/vim/.vim/templates/autocompletion.vim b/vim/.vim/templates/autocompletion.vim deleted file mode 100644 index a4dca09..0000000 --- a/vim/.vim/templates/autocompletion.vim +++ /dev/null @@ -1,11 +0,0 @@ -" <+DATE+> : Date du jour -%s/<+DATE+>/\=strftime("%d %b %Y")/g - -" <+AUTEUR+> : Auteur -%s/<+AUTEUR+>/Audric Schiltknecht \/ Viveris Technologies/g - -" <+VERSION+> : Par défaut -> 1.0 -%s/<+VERSION+>/1\.0/g - -" <+FILE+> : nom du fichier -%s/<+FILE+>/\=expand('%')/g diff --git a/vim/.vim/templates/c.tpl b/vim/.vim/templates/c.tpl deleted file mode 100644 index 0e86285..0000000 --- a/vim/.vim/templates/c.tpl +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @file <+FILE+> - * @author <+AUTEUR+> - * @date <+DATE+> - * @version <+VERSION+> - * @brief <+DESCRIPTION_COURTE+> - * - */ diff --git a/vim/.vim/templates/cpp.tpl b/vim/.vim/templates/cpp.tpl deleted file mode 100644 index 0e86285..0000000 --- a/vim/.vim/templates/cpp.tpl +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @file <+FILE+> - * @author <+AUTEUR+> - * @date <+DATE+> - * @version <+VERSION+> - * @brief <+DESCRIPTION_COURTE+> - * - */ diff --git a/vim/.vim/templates/h.tpl b/vim/.vim/templates/h.tpl deleted file mode 100644 index 53a7226..0000000 --- a/vim/.vim/templates/h.tpl +++ /dev/null @@ -1,14 +0,0 @@ -/** - * @file <+FILE+> - * @author <+AUTEUR+> - * @version <+VERSION+> - * @brief <+DESCRIPTION_COURTE+> - * - * <+DESCRIPTION_LONGUE+> - * - */ -#ifndef <+HEADER_H+> -#define <+HEADER_H+> - - -#endif diff --git a/vim/.vim/templates/html.tpl b/vim/.vim/templates/html.tpl deleted file mode 100644 index 1b18da7..0000000 --- a/vim/.vim/templates/html.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/vim/.vim/templates/java.tpl b/vim/.vim/templates/java.tpl deleted file mode 100644 index 7b4f715..0000000 --- a/vim/.vim/templates/java.tpl +++ /dev/null @@ -1,11 +0,0 @@ -/** -* @author : <+AUTEUR+> -* @date : <+DATE+> -* @version : <+VERSION+> -*/ - -package <+NOM_PACKAGE+>; - -class <+FILE+> { - -} diff --git a/vim/.vim/templates/py.tpl b/vim/.vim/templates/py.tpl deleted file mode 100644 index 606c45a..0000000 --- a/vim/.vim/templates/py.tpl +++ /dev/null @@ -1,4 +0,0 @@ -# -*- coding: utf-8 -*- -# Author: <+AUTEUR+> -# $Id:$ - -- cgit v1.2.3-70-g09d2