# HG changeset patch
# User zegervdv <zegervdv@me.com>
# Date 1421171359 -3600
# Node ID ed108055146c5c21370877c85d672226732475ab
# Parent  529bb6ae8e5ec3535e098fd0f167ef5a447a901d
update Plug

diff -r 529bb6ae8e5e -r ed108055146c vim/autoload/plug.vim
--- a/vim/autoload/plug.vim	Wed Dec 31 18:32:53 2014 +0100
+++ b/vim/autoload/plug.vim	Tue Jan 13 18:49:19 2015 +0100
@@ -914,7 +914,7 @@
     if valid
       if pull
         call s:spawn(name,
-          \ printf('git checkout -q %s 2>&1 && git pull --progress --no-rebase origin %s 2>&1 && git submodule update --init --recursive 2>&1',
+          \ printf('(git fetch --progress 2>&1 && git checkout -q %s 2>&1 && git merge --ff-only origin/%s 2>&1 && git submodule update --init --recursive 2>&1)',
           \ s:shellesc(spec.branch), s:shellesc(spec.branch)), { 'dir': spec.dir })
       else
         let s:jobs[name] = { 'running': 0, 'result': 'Already installed', 'error': 0 }
@@ -1125,7 +1125,7 @@
               else
                 if pull
                   log.call name, 'Updating ...', :update
-                  bt.call "#{cd} #{dir} && git checkout -q #{branch} 2>&1 && (git pull --no-rebase origin #{branch} #{progress} 2>&1 && #{subm})", name, :update, nil
+                  bt.call "#{cd} #{dir} && (git fetch #{progress} 2>&1 && git checkout -q #{branch} 2>&1 && git merge --ff-only origin/#{branch} 2>&1 && #{subm})", name, :update, nil
                 else
                   [true, skip]
                 end
diff -r 529bb6ae8e5e -r ed108055146c vimrc
--- a/vimrc	Wed Dec 31 18:32:53 2014 +0100
+++ b/vimrc	Tue Jan 13 18:49:19 2015 +0100
@@ -437,7 +437,8 @@
 " }}}
 " Neo Complete {{{
 let g:neocomplete#enable_at_startup = 1
-let g:neocomplet#enable_smart_case = 1
+let g:neocomplete#enable_smart_case = 1
+let g:neocomplete#force_overwrite_completefunc = 1
 let g:marching_enable_neocomplete = 1
 let g:neocomplete#enable_fuzzy_completion = 1