@@ -49,7 +49,6 @@ majutsushi/tagbar               -- Menu de ctags

 cohama/lexima.vim               -- Clos auto les {([ ...

 honza/vim-snippets              -- Gestion de snippets (template de bouts de code)

 Valloric/YouCompleteMe          -- Autocompletion

-spell correction orthographe

 mbbill/undotree

@@ -145,4 +144,8 @@ mbbill/undotree

   <leader>hs                -- Stage la modif

   <leader>hu                -- Annuler la modif

+** Spell : Correction orth

+  <F11>                     -- Active/Desactive/Switch entre les langues

+  <TAB>                     -- Completer/Corriger un mot

+

@@ -57,10 +57,6 @@ set nocompatible

 " Encodage

 set encoding=UTF-8

-" Ouvre les fichiers sur plusieurs onglets au lieu de plusieurs buffers

-if !&diff | silent tab all | tabfirst | endif

-

-

 " Affiche la barre d'info en bas

 set laststatus=2

 " Largeur maxi : 0 = desactive

@@ -80,10 +76,6 @@ set showmatch

 " Essaye de garder le curseur dans la même colonne quand on change de ligne

 set nostartofline

-" Option de la complétion automatique

-set wildmode=list:full

-set wildignore+=*.o,*.obj,*.exe,*.so,*.dll,*.pyc,*.swp,*.jpg,*.png,*.gif,*.pdf,*.bak,.svn,.hg,.bzr,.git,

-

 "find the next match as we type the search

 set incsearch

 "highlight searches by default

@@ -107,7 +99,11 @@ set visualbell t_vb=

 " Active la souris

 set mouse=a

+" Touche <leader>

+let mapleader = " "

+" Passer d'une ligne a l'autre avec les fleches

+set whichwrap=<,>,[,]

 " Performances

 set hidden

@@ -117,7 +113,7 @@ set ttyfast

-" ------- THEME -------

+" ------- THEME & PLUGIN: Lightline -------

 set background=dark

 colorscheme palenight

@@ -128,17 +124,47 @@ set cursorline

 " N'affiche pas le mode en cours en bas, vu qu'il est sur la lightline

 set noshowmode

+function! LightlineSession()

+  if v:this_session != ""

+    return '[Session: ' . fnamemodify(v:this_session, ':t') . ']'

+  endif

+  return '[Session: -]'

+endfunction

+

+function! LightlineSpellLanguage()

+  if(&spell)

+    return "Spell: " . &spelllang

+  else

+    return "(nospell)"

+  endif

+endfunction

+

 let g:lightline = {

  \ 'colorscheme': 'wombat',

  \ 'active': {

  \   'left': [ [ 'mode', 'paste' ],

- \             [ 'gitbranch', 'readonly', 'filename', 'modified' ] ]

+ \             [ 'gitbranch', 'readonly', 'relativepath', 'modified' ],

+ \             [ 'vimsession' ] ],

+ \ 'right': [ [ 'lineinfo' ],

+ \            [ 'percent' ],

+ \            [ 'spelllang', 'fileformat', 'fileencoding', 'filetype' ] ] 

  \ },

  \ 'component_function': {

- \   'gitbranch': 'FugitiveHead'

+ \   'gitbranch': 'FugitiveHead',

+ \   'vimsession': 'LightlineSession',

+ \   'spelllang' : 'LightlineSpellLanguage'

  \ },

  \ }

+let g:lightline.tabline = {

+ \ 'left': [ ['tabs'] ],

+ \ 'right': [ ['close'] ]

+ \ }

+

+autocmd WinEnter,BufWinEnter,FileType,ColorScheme,SessionLoadPost,BufEnter,TabEnter,InsertEnter * call lightline#update()

+

+set showtabline=2

+

@@ -164,8 +190,33 @@ vnoremap > >gv

+" ------- FOLDS SETTINGS -------

+

+set foldcolumn=3

+set foldmethod=manual

+set foldlevelstart=99

+autocmd BufWinLeave *.php,*.htm,*.html,*.css,*.c,*.cc,*.h,*.cpp,*.py,*.rb,*.js mkview

+autocmd BufWinEnter *.php,*.htm,*.html,*.css,*.c,*.cc,*.h,*.cpp,*.py,*.rb,*.js silent loadview

+

+" Cree un fold du prochain/precedent {, jusqu'au } de fermeture

+nmap <C-f> ?{<CR>zf%za:noh<CR>

+nmap <leader><Down> /{<CR>zf%za:noh<CR>

+nnoremap <leader><Up> ?{<CR>zf%za:noh<CR>

+" Toggle le fold en cours

+nmap <F9> za

+" Ouvre tous les folds

+nnoremap <leader><PageDown> zR

+" Ferme tous les folds

+nnoremap <leader><PageUp> zM

+

+

+

+

 " ------- AUTOCOMPLETION -------

+set wildmode=list:full

+set wildignore+=*.o,*.obj,*.exe,*.so,*.dll,*.pyc,*.swp,*.jpg,*.png,*.gif,*.pdf,*.bak,.svn,.hg,.bzr,.git,

+

 set omnifunc=syntaxcomplete#Complete

 set completeopt=menuone

@@ -174,23 +225,40 @@ function! Smart_TabComplete()

   " Current line

   let line = getline('.')

-  " from the start of the current line to one character right of the cursor

-  let substr = strpart(line, -1, col('.')+1)

-  " word till cursor

-  let substr = matchstr(substr, "[^ \t]*$")

-  " nothing to match on empty string

-  if (strlen(substr)==0)

-    return "\<tab>"

-  endif

-  " position of slash, if any

-  let has_slash = match(substr, '\/') != -1

-  if (has_slash)

-    " file matching

-    return "\<C-X>\<C-F>"

+  " CORRECTION : MODE ORTHOGRAPHE

+  if(&spell)

+

+    let substr = strpart(line, col('.') - 1, 1)

+    if substr == "" | return "\<C-N>" | endif

+    if substr == " " | return "\<C-N>" | endif

+    return "\<c-o>z="

+

+

+

+  " CORRECTION : MODE CODE

   else

-    " plugin matching

-    return "\<C-X>\<C-O>"

+

+    " from the start of the current line to one character right of the cursor

+    let substr = strpart(line, -1, col('.')+1)

+    " word till cursor:

+    let substr = matchstr(substr, "[^ \t]*$")

+    " nothing to match on empty string

+    if (strlen(substr)==0)

+      return "\<tab>"

+    endif

+

+    " position of slash, if any

+    let has_slash = match(substr, '\/') != -1

+    if (has_slash)

+      " file matching

+      return "\<C-X>\<C-F>"

+    else

+      " plugin matching

+      return "\<C-X>\<C-O>"

+    endif

+

   endif

+

 endfunction

 inoremap <tab> <c-r>=Smart_TabComplete()<CR>

@@ -198,26 +266,36 @@ inoremap <tab> <c-r>=Smart_TabComplete()<CR>

+" ------- SPELL -------

-" ------- FOLDS SETTINGS -------

+" Use word completion when spelling is enabled

+set complete+=kspell

-set foldcolumn=3

-set foldmethod=manual

-set foldlevelstart=99

-autocmd BufWinLeave *.php,*.htm,*.html,*.css,*.c,*.cc,*.h,*.cpp,*.py,*.rb,*.js mkview

-autocmd BufWinEnter *.php,*.htm,*.html,*.css,*.c,*.cc,*.h,*.cpp,*.py,*.rb,*.js silent loadview

+"switch spellcheck languages

+let g:myLangList=["nospell","fr","en_us"]

-" Cree un fold du prochain/precedent {, jusqu'au } de fermeture

-nmap <C-f> ?{<CR>zf%za:noh<CR>

-nmap <leader><Down> /{<CR>zf%za:noh<CR>

-nnoremap <leader><Up> ?{<CR>zf%za:noh<CR>

-" Toggle le fold en cours

-nmap <F9> za

-" Ouvre tous les folds

-nnoremap <leader><PageDown> zR

-" Ferme tous les folds

-nnoremap <leader><PageUp> zM

+function! MySpellLang()

+  if !exists("b:myLang")

+    if &spell

+      let b:myLang=index(g:myLangList, &spelllang)

+      if b:myLang < 0 | b:myLang = 0 | endif

+    else

+      let b:myLang=0

+    endif

+  endif

+  "loop through languages

+  let b:myLang = b:myLang + 1

+  if b:myLang >= len(g:myLangList) | let b:myLang = 0 | endif

+  if b:myLang == 0

+    set nospell

+  else

+    execute "setlocal spell spelllang=".get(g:myLangList, b:myLang)

+  endif

+endf

+

+map <silent> <F11> :call MySpellLang()<CR>

+imap <silent> <F11> <C-o>:call MySpellLang()<CR>

@@ -271,7 +349,7 @@ let g:startify_relative_path = 0

 let g:startify_change_to_dir = 1

 let g:startify_update_oldfiles = 1

 let g:startify_session_autoload = 1

-let g:startify_custom_header = 'startify#pad([ "         VIM - STARTIFY"] + ["         [e] Empty file" ])'

+let g:startify_custom_header = 'startify#pad(["         VIM - STARTIFY"] + [""] + ["[e] Empty file"] + ["[q] Quit"] + ["[t] Tag file(s) to be opened in tabs"])'

 let g:startify_lists = [

   \ { 'type': 'sessions',  'header': ['   Sessions']       },

   \ { 'type': 'files',     'header': ['   MRU']            },

@@ -284,9 +362,18 @@ let g:startify_session_before_save = [

   \ 'silent! NERDTreeTabsClose'

   \ ]

+let g:startify_session_dir = $HOME . '/.vim/session'

+

+function! EnsureDirExists (dir)

+  if !isdirectory(a:dir)

+    call mkdir(a:dir,'p')

+  endif

+endfunction

+

 function! SessionCreate()

   if empty(v:this_session)

     if tabpagenr("$") > 1

+      call EnsureDirExists(g:startify_session_dir)

       SSave!

     endif

   endif

@@ -295,7 +382,7 @@ endfunction

 " Quitte quand plusieurs onglets sont ouverts, et cree une session si elle n'existe pas

 noremap <leader>q :call SessionCreate()<CR>:qa<CR>

 " Supprime la session en cours

-noremap <leader>d :SDelete<CR>

+noremap <leader>d :SDelete!<CR>

@@ -319,6 +406,9 @@ nnoremap <Esc><Esc> :noh<CR>

 " ------- TABS -------

+" Ouvre les fichiers sur plusieurs onglets au lieu de plusieurs buffers

+"if !&diff | silent tab all | tabfirst | endif

+

 " Creer un nouveau tab et ouvre l'explorateur NerdTree

 noremap <leader>t :$tabe<CR>:NERDTreeToggle<CR>

 noremap <F3> :$tabe<CR>:NERDTreeToggle<CR>

@@ -332,4 +422,3 @@ inoremap <F4> <Esc>gt

 noremap <leader><F2> :tabm -1<CR>

 noremap <leader><F4> :tabm +1<CR>

-