changeset 461:eb8891b1a6f5

Clone FZF and source its Vim plugin directly, use official hggit repo.
author Ludovic Chabant <ludovic@chabant.com>
date Tue, 09 Apr 2019 00:11:42 -0700
parents 10acde38fcee
children 4f6af3e668eb
files install.cfg vim/vimrc
diffstat 2 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/install.cfg	Tue Apr 09 00:04:37 2019 -0700
+++ b/install.cfg	Tue Apr 09 00:11:42 2019 -0700
@@ -1,9 +1,11 @@
 [subrepos]
 lib/fish/virtualfish = [git]https://github.com/adambrenecki/virtualfish.git
 
+lib/fzf = [git]https://github.com/junegunn/fzf.git
+
 lib/hg/allpaths = https://bitbucket.org/ludovicchabant/allpaths
 lib/hg/fast-hg-prompt = https://bitbucket.org/ludovicchabant/fast-hg-prompt
-lib/hg/hg-git = https://bitbucket.org/ludovicchabant/hg-git
+lib/hg/hg-git = https://bitbucket.org/durin42/hg-git
 lib/hg/hg-git-sync = https://bitbucket.org/ludovicchabant/hg-git-sync
 lib/hg/hg-prompt = https://bitbucket.org/sjl/hg-prompt
 lib/hg/mercurial-cli-templates = https://bitbucket.org/sjl/mercurial-cli-templates
--- a/vim/vimrc	Tue Apr 09 00:04:37 2019 -0700
+++ b/vim/vimrc	Tue Apr 09 00:11:42 2019 -0700
@@ -298,11 +298,12 @@
 
 " FZF {{{
 
-if ludo#platform() == 'mac'
-    if filereadable('/usr/local/opt/fzf/plugin/fzf.vim')
-        " FZF installed via Homebrew.
-        source /usr/local/opt/fzf/plugin/fzf.vim
-    endif
+" Load FZF Vim plugin from our sub-repo.
+let s:local_fzfplugin = ludo#localpath('../lib/fzf/plugin/fzf.vim')
+if filereadable(s:local_fzfplugin)
+    execute 'source' s:local_fzfplugin
+else
+    call ludo#error("Can't find FZF at: ".s:local_fzfplugin)
 endif
 
 let g:fzf_action = {