solving merge

6 files changed, 36 insertions, 46 deletions

diff --git a/mutt/muttrc b/mutt/muttrc
index 7811ff2..00ceec1 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -124,13 +124,4 @@ bind compose p postpone-message
 ## Hooks
 mbox-hook .* "+Main/Main"
 
-
-##  Aliases
-
 set reverse_alias
-alias krystle Krystle Acquah <krystle.acquah-arhin13@imperial.ac.uk>
-alias khoi Khoi Nguyen <khoi@member.fsf.org>
-alias me Urbain Vaes <urbainvaes90@gmail.com>
-alias amanda Amanda Diez <amanda.diez10@imperial.ac.uk>
-alias vaes Christophe & Nathalies Vaes  <vaesvdb@gmail.com>
-alias greg Supervisor <g.pavliotis@imperial.ac.uk>
diff --git a/vim/after/ftplugin/vim/folding.vim b/vim/after/ftplugin/vim/folding.vim
index 773b38e..7f8f28d 100644
--- a/vim/after/ftplugin/vim/folding.vim
+++ b/vim/after/ftplugin/vim/folding.vim
@@ -1,25 +1,25 @@
-function! VimFolds()
-    let thisline = getline(v:lnum)
-    if match(thisline,'^""  ') >= 0
-        return ">1"
-    elseif match(thisline,'^"  ') >=0
-        return ">1"
-    else
-        return "="
-    endif
-endfunction
-
-function! VimFoldText()
-    let startline = getline(v:foldstart)
-    if match(startline,'^""  ') >= 0
-        let title = substitute(startline,'^""  \(.*\)$','\1',"")
-        return '# ' . title
-    elseif match(startline,'^"  ') >=0
-        let title = substitute(startline,'^"  \(.*\)$','\1',"")
-        return '    ## ' .title
-    endif
-endfunction
-
-setlocal foldmethod=expr
-setlocal foldexpr=VimFolds()
-setlocal foldtext=VimFoldText()
+" function! VimFolds()
+"     let thisline = getline(v:lnum)
+"     if match(thisline,'^""  ') >= 0
+"         return ">1"
+"     elseif match(thisline,'^"  ') >=0
+"         return ">1"
+"     else
+"         return "="
+"     endif
+" endfunction
+"
+" function! VimFoldText()
+"     let startline = getline(v:foldstart)
+"     if match(startline,'^""  ') >= 0
+"         let title = substitute(startline,'^""  \(.*\)$','\1',"")
+"         return '# ' . title
+"     elseif match(startline,'^"  ') >=0
+"         let title = substitute(startline,'^"  \(.*\)$','\1',"")
+"         return '    ## ' .title
+"     endif
+" endfunction
+"
+" setlocal foldmethod=expr
+" setlocal foldexpr=VimFolds()
+" setlocal foldtext=VimFoldText()
diff --git a/vim/mySnippets/all.snippets b/vim/mySnippets/all.snippets
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/vim/mySnippets/all.snippets
@@ -0,0 +1 @@
+
diff --git a/vim/mySnippets/mail.snippets b/vim/mySnippets/mail.snippets
index 72a4648..293256a 100644
--- a/vim/mySnippets/mail.snippets
+++ b/vim/mySnippets/mail.snippets
@@ -20,7 +20,7 @@ Department of Mathematics
 Office 6M09
 endsnippet
 
-snippet bisous "Bisous" b
+snippet bisous "Gros bisous" b
 Gros bisous,
 
 Urbain
diff --git a/vim/vimrc b/vim/vimrc
index c9c08f4..6654561 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -18,7 +18,7 @@ Plugin 'Tabular'
 Plugin 'tComment'
 Plugin 'Gundo'
 Plugin 'altercation/vim-colors-solarized'
-Plugin 'klen/python-mode'
+" Plugin 'klen/python-mode'
 Plugin 'honza/vim-snippets'
 
 filetype plugin indent on
@@ -71,8 +71,6 @@ nnoremap <F5> :GundoToggle<cr>
 
 "  Nerdtree
 nnoremap <F3> :NERDTreeToggle<cr>
-
-
 let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
             \ '\.fls$','\.bbl$','\.blg$',
             \ '\.out$', '\.log$','\.aux$','\.sty$',
@@ -117,7 +115,7 @@ set undodir=/home/urbain/.vim/vimundo/
 set nonumber
 set ruler
 set showcmd
-set listchars=tab:▸\ ,eol:¬
+set listchars=tab:▸\ ,eol:¬,trail:-
 set fillchars=fold:\ ,vert:\ ,
 set showbreak=...
 set colorcolumn=0
@@ -219,7 +217,7 @@ vnoremap g^ ^
 
 ""  Latex  
 nmap <buffer> <F2> <Plug>LatexChangeEnv
-let g:tex_fast="" 
+let g:tex_fast=""
 
 "  Synctex 
 function! LatexEvinceSearch()
@@ -232,7 +230,7 @@ autocmd FileType tex map <F6> :silent LatexEvinceSearch <Return>
 autocmd Filetype tex call SetTexOptions()
 
 
-""  Functions  
+""  Functions
 function! Tex_ForwardSearchLaTeX()
     let cmd = 'evince_forward_search ' . fnamemodify(LatexBox_GetMainTexFile(), ":p:r") .  '.pdf ' . line(".") . ' ' . expand("%:p")
     let output = system(cmd)
@@ -274,8 +272,8 @@ function! SetTexOptions()
 
 endfunction
 
-""  Autocommands  
+""  Autocommands
 augroup autorelead_vimrc
-    au! 
+    au!
     au BufWritePost ~/.vim/vimrc source ~/.vim/vimrc
 augroup END
diff --git a/zshrc b/zshrc
index 01eef12..817ca2b 100644
--- a/zshrc
+++ b/zshrc
@@ -80,13 +80,13 @@ bindkey -a 'j' history-beginning-search-forward
 sleep 2
 h=`date +%H`
 if [ $h -lt 9 ]; then
-    xdotool key Alt+t p Down Return
+    xdotool key Alt+t p Down Right Return
     eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-dark`
 elif [ $h -lt 17 ]; then
-    xdotool key Alt+t p Down Down Return
+    xdotool key Alt+t p Down Down Right Return
     eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-light`
 else
-    xdotool key Alt+t p Down Return
+    xdotool key Alt+t p Down Right Return
     eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-dark`
 fi