1 files changed, 4 insertions, 8 deletions

diff --git a/vimrc-full b/vimrc-full
index 9354b77..ec4f3db 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -403,12 +403,7 @@ if has("autocmd")
 
   " autocmd BufNewFile set nobuflisted
   " use the shada/viminfo file to return the cursor to where it was...
-  function! ReturnCursor()
-    if line("'\"") > 1 && line("'\"") <= line("$")
-      exe "normal! g`\""
-    endif
-  endfunction
-  autocmd! BufReadPost * call ReturnCursor()
+  autocmd BufReadPost * call setpos(".", getpos("'\""))
 
 
   augroup ToggleQuickFix
@@ -698,8 +693,8 @@ Plug 'godlygeek/tabular'              | " align code on a sign, like :Tab/=
 Plug 'severin-lemaignan/vim-minimap'
 Plug 'tpope/vim-surround'             | " plugin makes cs"' inside a line replace " with '
 let g:signify_vcs_list = [ 'git' ]    | " use signify only with git (improves speed when loading buffers, see :h signify)
-let g:signify_cursorhold_insert     = 1
-let g:signify_cursorhold_normal     = 1
+let g:signify_cursorhold_insert     = 0
+let g:signify_cursorhold_normal     = 0
 let g:signify_update_on_bufenter    = 0
 let g:signify_update_on_focusgained = 1
 
@@ -844,6 +839,7 @@ if has("python")
   " ULTISNIPS: code snippet ============================================================================================
   Plug 'honza/vim-snippets'                      " dependency of ultisnips (see below)
   Plug 'SirVer/ultisnips'                        " replaces loremipsum (and many more)
+  " let g:UltiSnipsExpandTrigger       = '<Tab>'|  " expands the snippet, be careful not to use <tab> elsewhere (ycm uses it by default, but it has been deactivated by g:ycm_key_list_select_completion)
   let g:UltiSnipsExpandTrigger       = '<Tab>'|  " expands the snippet, be careful not to use <tab> elsewhere (ycm uses it by default, but it has been deactivated by g:ycm_key_list_select_completion)
 
   let g:UltiSnipsJumpForwardTrigger  = '<Tab>'|