From 9c4abaa89ffd8e2b6e5b88a5a9e32c2f5f536872 Mon Sep 17 00:00:00 2001
From: Yan Pritzker <yan@pritzker.ws>
Date: Sun, 5 Jan 2014 19:09:18 -0600
Subject: [PATCH] Change to Lightline instead of Airline [Fix #418]

---
 CHANGELOG.md               | 5 +++++
 Rakefile                   | 2 +-
 vim/settings/airline.vim   | 7 -------
 vim/settings/lightline.vim | 8 ++++++++
 vim/settings/solarized.vim | 1 +
 vim/vundles.vim            | 2 +-
 6 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 vim/settings/airline.vim
 create mode 100644 vim/settings/lightline.vim

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dafae59..052a04e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### Jan 5, 2013
+* Switch to lightline instead of airline for status bar. Works better in terminal vim and should be faster.
+* Added investigate.vim (gK for docs)
+* Fix homebrew installation of macvim with lua enabled, and fix deprecated homebrew install.
+
 ### Dec 17, 2013
 
 * Cleanup of README to make it more palatable, focusing on the primary key bindings
diff --git a/Rakefile b/Rakefile
index e0a81f0..6d026f1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -156,7 +156,7 @@ end
 
 def install_fonts
   puts "======================================================"
-  puts "Installing patched fonts for Powerline."
+  puts "Installing patched fonts for Powerline/Lightline."
   puts "======================================================"
   run %{ cp -f $HOME/.yadr/fonts/* $HOME/Library/Fonts }
   puts
diff --git a/vim/settings/airline.vim b/vim/settings/airline.vim
deleted file mode 100644
index eb3992a..0000000
--- a/vim/settings/airline.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-let g:airline_left_sep = '⮀'
-let g:airline_left_alt_sep = '⮁'
-let g:airline_right_sep = '⮂'
-let g:airline_right_alt_sep = '⮃'
-let g:airline_branch_prefix = '⭠ '
-let g:airline_readonly_symbol = '⭤'
-let g:airline_linecolumn_prefix = '⭡'
diff --git a/vim/settings/lightline.vim b/vim/settings/lightline.vim
new file mode 100644
index 0000000..3edd1d8
--- /dev/null
+++ b/vim/settings/lightline.vim
@@ -0,0 +1,8 @@
+let g:lightline = {
+      \ 'colorscheme': 'solarized',
+      \ 'component': {
+      \   'readonly': '%{&readonly?"⭤":""}',
+      \ },
+      \ 'separator': { 'left': '⮀', 'right': '⮂' },
+      \ 'subseparator': { 'left': '⮁', 'right': '⮃' }
+      \ }
diff --git a/vim/settings/solarized.vim b/vim/settings/solarized.vim
index 4035baf..f334422 100644
--- a/vim/settings/solarized.vim
+++ b/vim/settings/solarized.vim
@@ -27,6 +27,7 @@ hi! link CTagsMethod Identifier
 hi! link CTagsSingleton Identifier
 
 hi! link javascriptFuncName Type
+hi! link jsFuncCall jsFuncName
 hi! link javascriptFunction Statement
 hi! link javascriptThis Statement
 hi! link javascriptParens Normal
diff --git a/vim/vundles.vim b/vim/vundles.vim
index f563d48..f7045d3 100644
--- a/vim/vundles.vim
+++ b/vim/vundles.vim
@@ -134,7 +134,7 @@ Bundle "vim-scripts/argtextobj.vim"
 " Cosmetics, color scheme, Powerline...
 Bundle "chrisbra/color_highlight.git"
 Bundle "skwp/vim-colors-solarized"
-Bundle "bling/vim-airline.git"
+Bundle "itchyny/lightline.vim"
 Bundle "vim-scripts/TagHighlight.git"
 Bundle "bogado/file-line.git"
 Bundle "jby/tmux.vim.git"