From 864b9177172d476997dcfe8bdcdcdf0f6d8c0375 Mon Sep 17 00:00:00 2001
From: Petar Radosevic <petar@wunki.org>
Date: Wed, 27 Jan 2016 12:12:11 +0100
Subject: [PATCH] Upgrade vim Plug

---
 .gitignore             |  1 +
 ghc/ghci               | 18 +++++++++++++++---
 nvim/autoload/plug.vim |  6 +++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index ca813116..c7356668 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /bin/python
 /bin/nvim
 nvim/shada
+nvim/autoload/plug.vim.old
 emacs/bookmarks
 emacs/var
 emacs/.org-id-locations
diff --git a/ghc/ghci b/ghc/ghci
index a65a7bc8..71a211b9 100644
--- a/ghc/ghci
+++ b/ghc/ghci
@@ -1,14 +1,26 @@
-:set prompt "λ> "
+-- Prompt
+:set prompt  "\ESC[34;1mλ> \ESC[m"
+:set prompt2 "\ESC[34;1m | \ESC[m"
 
+-- Print the type after every statement
 :set +t
-:set +c
 
+-- Collect information after modules have been
+-- loaded.
+:set +c
 
+-- Hoogle
 :def hoogle \s -> return $ ":! hoogle --count=15 \"" ++ s ++ "\""
 :def doc \x -> return $ ":!hoogle --info \"" ++ x ++ "\""
 
+-- Use incremental compilation
+-- If you are missing information on a module, run `-fbyte-code`
+-- and :load the module again.
+:set -fobject-code
+
+-- Warn me about these things
 :set -Wall
 :set -fno-warn-missing-signatures
 :set -fno-warn-type-defaults
 :set -fno-warn-name-shadowing
-:set -fno-warn-unused-do-bind
\ No newline at end of file
+:set -fno-warn-unused-do-bind
diff --git a/nvim/autoload/plug.vim b/nvim/autoload/plug.vim
index 57a51001..ab1c1f73 100644
--- a/nvim/autoload/plug.vim
+++ b/nvim/autoload/plug.vim
@@ -450,9 +450,9 @@ function! s:add(repo, ...)
 
   try
     let repo = s:trim(a:repo)
-    let name = fnamemodify(repo, ':t:s?\.git$??')
-    let spec = extend(s:infer_properties(name, repo),
-                    \ a:0 == 1 ? s:parse_options(a:1) : s:base_spec)
+    let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec
+    let name = get(opts, 'as', fnamemodify(repo, ':t:s?\.git$??'))
+    let spec = extend(s:infer_properties(name, repo), opts)
     if !has_key(g:plugs, name)
       call add(g:plugs_order, name)
     endif