Commits

Seh Hui Leong committed b4855ad

Updated plugins, use subrepo and added tmux config.

  • Participants
  • Parent commits 1b1d4b6

Comments (0)

Files changed (43)

File .bash_profile

-export CLICOLOR=1
-export LSCOLORS=ExFxCxDxBxegedabagacad
-export SVN_EDITOR=vim
-export PS1="[\W]\$ "
-export HISTCONTROL=ignoreboth
+CLICOLOR=1
+LSCOLORS=ExFxCxDxBxegedabagacad
+SVN_EDITOR=vim
+PS1="[\W]\$ "
+HISTCONTROL=ignoreboth
+LC_ALL=en_US.UTF-8
 
+CDPATH=$HOME/Projects:$HOME/Sites:$HOME
+PATH=/usr/local/bin:/usr/local/sbin:$PATH:/usr/local/share/python:/usr/local/Cellar/python/2.7.2/bin:/usr/local/Cellar/ruby/1.9.3-p286/bin:/usr/local/Cellar/gettext/0.18.1.1/bin:$HOME/bin:$HOME/homebrew/bin
+PATH=$(brew --prefix coreutils)/libexec/gnubin:$PATH
+ANDROID_SDK_ROOT=/usr/local/Cellar/android-sdk/r6
+WORKON_HOME=~/.virtualenvs
+VIRTUALENVWRAPPER_PYTHON=/usr/bin/python
 
-export CDPATH=$HOME/Projects:$HOME/Sites:$HOME
-export PATH=/usr/local/bin:/usr/local/sbin:$PATH:/usr/local/share/python:/usr/local/Cellar/python/2.7.2/bin:$HOME/bin:$HOME/Sites/cakephp/cake/console:$HOME/homebrew/bin
-export ANDROID_SDK_ROOT=/usr/local/Cellar/android-sdk/r6
-export WORKON_HOME=~/.virtualenvs
-
-source /usr/local/share/python/virtualenvwrapper.sh
-source /usr/local/Cellar/coreutils/8.12/aliases
+source /usr/local/bin/virtualenvwrapper.sh
+if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
 
 alias gvim='mvim -p'
 alias vi="$HOME/Applications/MacVim.app/Contents/MacOS/Vim -p"
 alias mp3tag="wine 'C:\Program Files\Mp3tag\Mp3tag.exe'"
 alias ssh_webhost="ssh -p 22017 felix@rainbowsarge.com"
 alias ls="gls --color"
+#alias clearterm="echo -e \\033c" -- actual command being reset
 
 set -o vi
-
 	email = felixleong@gmail.com
 [core]
     editor = vim
-	excludesfile = /home/felix/.gitignore_global
+	excludesfile = $HOME/.gitignore_global
 [alias]
     ci = commit
     co = checkout
     update = svn rebase
 [color]
 	diff = auto
+[push]
+	default = simple
 .git
 .gitignore
 .gitmodules
+tags
 
 # Temporary ignore (Hacks)
 .vim/bundle/vim-markdown/doc
+.vim/bundle/command-t = [git]git://git.wincent.com/command-t
+.vim/bundle/vim-flake8 = [git]https://github.com/nvie/vim-flake8.git
+07087e16ba8fe0a87b1d1ccd03e158a0157dc1f8 .vim/bundle/command-t
+d1bb8f1d440a4656342bcc536574e0e1627dedcb .vim/bundle/vim-flake8
 bind-key -r C-h select-window -t :-
 bind-key -r C-l select-window -t :+
 
-# act like GNU screen
-# unbind C-b
-# set -g prefix C-a
-
 # look good
 set -g default-terminal "screen-256color"
+
+# Set the bases to 1 instead of 0
+set-option -g base-index 1
+setw -g pane-base-index 1
+
+# Rebind split binding to something that makes more sense
+bind | split-window -h
+bind - split-window -v
+
+# panes - resize quick short keys
+bind-key -r J resize-pane -D 5
+bind-key -r K resize-pane -U 5
+bind-key -r H resize-pane -L 5
+bind-key -r L resize-pane -R 5

File .vim/bundle/EnhancedCommentify-2.3/doc/tags

-EnhComm-Bugs	EnhancedCommentify.txt	/*EnhComm-Bugs*
-EnhComm-Credits	EnhancedCommentify.txt	/*EnhComm-Credits*
-EnhComm-EnhCommentify	EnhancedCommentify.txt	/*EnhComm-EnhCommentify*
-EnhComm-Fallbacks	EnhancedCommentify.txt	/*EnhComm-Fallbacks*
-EnhComm-Keybindings	EnhancedCommentify.txt	/*EnhComm-Keybindings*
-EnhComm-NewLanguages	EnhancedCommentify.txt	/*EnhComm-NewLanguages*
-EnhComm-Options	EnhancedCommentify.txt	/*EnhComm-Options*
-EnhComm-Support	EnhancedCommentify.txt	/*EnhComm-Support*
-EnhancedCommentify	EnhancedCommentify.txt	/*EnhancedCommentify*
-EnhancedCommentify()	EnhancedCommentify.txt	/*EnhancedCommentify()*

File .vim/bundle/MultipleSearch/doc/tags

-:Search	MultipleSearch.txt	/*:Search*
-:SearchBuffers	MultipleSearch.txt	/*:SearchBuffers*
-MultipleSearch	MultipleSearch.txt	/*MultipleSearch*
-MultipleSearch-commands	MultipleSearch.txt	/*MultipleSearch-commands*
-MultipleSearch-mappings	MultipleSearch.txt	/*MultipleSearch-mappings*
-MultipleSearch-settings	MultipleSearch.txt	/*MultipleSearch-settings*
-MultipleSearch.txt	MultipleSearch.txt	/*MultipleSearch.txt*
-g:MultipleSearchColorSequence	MultipleSearch.txt	/*g:MultipleSearchColorSequence*
-g:MultipleSearchMaxColors	MultipleSearch.txt	/*g:MultipleSearchMaxColors*
-g:MultipleSearchTextColorSequence	MultipleSearch.txt	/*g:MultipleSearchTextColorSequence*

File .vim/bundle/bufexplorer/doc/tags

-bufexplorer	bufexplorer.txt	/*bufexplorer*
-bufexplorer-changelog	bufexplorer.txt	/*bufexplorer-changelog*
-bufexplorer-credits	bufexplorer.txt	/*bufexplorer-credits*
-bufexplorer-customization	bufexplorer.txt	/*bufexplorer-customization*
-bufexplorer-installation	bufexplorer.txt	/*bufexplorer-installation*
-bufexplorer-todo	bufexplorer.txt	/*bufexplorer-todo*
-bufexplorer-usage	bufexplorer.txt	/*bufexplorer-usage*
-bufexplorer-windowlayout	bufexplorer.txt	/*bufexplorer-windowlayout*
-bufexplorer.txt	bufexplorer.txt	/*bufexplorer.txt*
-buffer-explorer	bufexplorer.txt	/*buffer-explorer*
-g:bufExplorerDefaultHelp	bufexplorer.txt	/*g:bufExplorerDefaultHelp*
-g:bufExplorerDetailedHelp	bufexplorer.txt	/*g:bufExplorerDetailedHelp*
-g:bufExplorerFindActive	bufexplorer.txt	/*g:bufExplorerFindActive*
-g:bufExplorerReverseSort	bufexplorer.txt	/*g:bufExplorerReverseSort*
-g:bufExplorerShowDirectories	bufexplorer.txt	/*g:bufExplorerShowDirectories*
-g:bufExplorerShowRelativePath	bufexplorer.txt	/*g:bufExplorerShowRelativePath*
-g:bufExplorerShowTabBuffer	bufexplorer.txt	/*g:bufExplorerShowTabBuffer*
-g:bufExplorerShowUnlisted	bufexplorer.txt	/*g:bufExplorerShowUnlisted*
-g:bufExplorerSortBy	bufexplorer.txt	/*g:bufExplorerSortBy*
-g:bufExplorerSplitBelow	bufexplorer.txt	/*g:bufExplorerSplitBelow*
-g:bufExplorerSplitOutPathName	bufexplorer.txt	/*g:bufExplorerSplitOutPathName*
-g:bufExplorerSplitRight	bufexplorer.txt	/*g:bufExplorerSplitRight*

File .vim/bundle/command-t/.bundle/config

---- 
-BUNDLE_BIN: bin
-BUNDLE_DISABLE_SHARED_GEMS: "1"

File .vim/bundle/command-t/.mailmap

-Sung Pae <sung@metablu.com>
+Nicolas Alpi <nicolas.alpi@gmail.com> Spyou <nicolas.alpi@gmail.com>
+Noon Silk <noonsilk@gmail.com> Noon Silk <noonsilk@gmail.com>
+Noon Silk <noonsilk@gmail.com> Noon Silk <superhappyfun@gmail.com>
+Sung Pae <sung@metablu.com> guns <sung@metablu.com>
+Sung Pae <sung@metablu.com> guns <self@sungpae.com>

File .vim/bundle/command-t/LICENSE

-Copyright 2010-2011 Wincent Colaiuta. All rights reserved.
+Copyright 2010-2012 Wincent Colaiuta. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

File .vim/bundle/command-t/Rakefile

   rake prerelease
   rake gem
   rake push
-  bin/rake upload:all
+  bundle exec rake upload:all
   rake archive
 
 Most of the Rake tasks run fine without Bundler, and in fact, we
 
 task :check_bundler do
   unless ENV.has_key? 'BUNDLE_GEMFILE'
-    warn 'warning: Bundler is not loaded; try running with bin/rake'
+    warn 'warning: Bundler is not loaded; try running with `bundle exec rake`'
   end
 end
 
 desc 'Run specs'
 task :spec do
-  system 'bin/rspec spec'
+  system 'bundle exec rspec spec'
   bail_on_failure
 end
 
 desc 'Clean compiled products'
 task :clean do
   Dir.chdir 'ruby/command-t' do
-    system 'make clean'
+    system 'make clean' if File.exists?('Makefile')
+    system 'rm -f Makefile'
   end
 end
 

File .vim/bundle/command-t/bin/autospec

-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'autospec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rspec-core', 'autospec')

File .vim/bundle/command-t/bin/htmldiff

-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'htmldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('diff-lcs', 'htmldiff')

File .vim/bundle/command-t/bin/ldiff

-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'ldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('diff-lcs', 'ldiff')

File .vim/bundle/command-t/bin/nokogiri

-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'nokogiri' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('nokogiri', 'nokogiri')

File .vim/bundle/command-t/bin/rake

-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rake', 'rake')

File .vim/bundle/command-t/bin/rspec

-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rspec-core', 'rspec')

File .vim/bundle/command-t/command-t.recipe

+ruby/command-t/controller.rb
+ruby/command-t/extconf.rb
+ruby/command-t/finder/buffer_finder.rb
+ruby/command-t/finder/file_finder.rb
+ruby/command-t/finder/jump_finder.rb
+ruby/command-t/finder/tag_finder.rb
+ruby/command-t/finder.rb
+ruby/command-t/match_window.rb
+ruby/command-t/prompt.rb
+ruby/command-t/scanner/buffer_scanner.rb
+ruby/command-t/scanner/file_scanner.rb
+ruby/command-t/scanner/jump_scanner.rb
+ruby/command-t/scanner/tag_scanner.rb
+ruby/command-t/scanner.rb
+ruby/command-t/settings.rb
+ruby/command-t/stub.rb
+ruby/command-t/vim/path_utilities.rb
+ruby/command-t/vim/screen.rb
+ruby/command-t/vim/window.rb
+ruby/command-t/vim.rb
+ruby/command-t/ext.c
+ruby/command-t/match.c
+ruby/command-t/matcher.c
+ruby/command-t/ext.h
+ruby/command-t/match.h
+ruby/command-t/matcher.h
+ruby/command-t/ruby_compat.h
+ruby/command-t/depend
+doc/command-t.txt
+plugin/command-t.vim

File .vim/bundle/command-t/doc/command-t.txt

  7. Mappings                |command-t-mappings|
  8. Options                 |command-t-options|
  9. Authors                 |command-t-authors|
-10. Website                 |command-t-website|
-11. Donations               |command-t-donations|
-12. License                 |command-t-license|
-13. History                 |command-t-history|
+10. Development             |command-t-development|
+11. Website                 |command-t-website|
+12. Donations               |command-t-donations|
+13. License                 |command-t-license|
+14. History                 |command-t-history|
 
 
 INTRODUCTION                                    *command-t-intro*
   ruby extconf.rb
   make
 
-Note: If you are an RVM user, you must perform the build using the same
-version of Ruby that Vim itself is linked against. This will often be the
-system Ruby, which can be selected before issuing the "make" command with:
+Note: If you are an RVM or rbenv user, you must perform the build using the
+same version of Ruby that Vim itself is linked against. This will often be the
+system Ruby, which can be selected before issuing the "make" command with one
+of the following commands:
 
   rvm use system
+  rbenv local system
+
+Note: Make sure you compile targeting the same architecture Vim was built for.
+For instance, MacVim binaries are built for i386, but sometimes GCC compiles
+for x86_64. First you have to check the platform Vim was built for:
+
+  vim --version
+  ...
+  Compilation: gcc ... -arch i386 ...
+  ...
+
+and make sure you use the correct ARCHFLAGS during compilation:
+
+  export ARCHFLAGS="-arch i386"
+  make
 
 
 MANAGING USING PATHOGEN                         *command-t-pathogen*
 
 After installing or updating you must build the extension:
 
-  cd ~/.vim/bundle/command-t
-  rake make
+  cd ~/.vim/bundle/command-t/ruby/command-t
+  ruby extconf.rb
+  make
 
 While the Vimball installation automatically generates the help tags, under
 Pathogen it is necessary to do so explicitly from inside Vim:
     <C-k>       select previous file in the file listing
     <C-p>       select previous file in the file listing
     <Up>        select previous file in the file listing
+    <C-f>       flush the cache (see |:CommandTFlush| for details)
     <C-c>       cancel (dismisses file listing)
 
 The following is also available on terminals which support it:
                 can persist across Vim sessions (see Vim's |jumplist|
                 documentation for more info).
 
+                                                *:CommandTTag*
+|:CommandTTag| Brings up the Command-T window tags window, which can
+                be used to select from the tags, if any, returned by
+                Vim's |taglist()| function. See Vim's |tag| documentation
+                for general info on tags.
+
                                                 *:CommandTFlush*
 |:CommandTFlush|Instructs the plug-in to flush its path cache, causing
                 the directory to be rescanned for new or deleted paths
-                the next time the file window is shown. In addition, all
-                configuration settings are re-evaluated, causing any
-                changes made to settings via the |:let| command to be picked
-                up.
+                the next time the file window is shown (pressing <C-f> when
+                a match listing is visible flushes the cache immediately; this
+                mapping is configurable via the |g:CommandTRefreshMap|
+                setting). In addition, all configuration settings are
+                re-evaluated, causing any changes made to settings via the
+                |:let| command to be picked up.
 
 
 MAPPINGS                                        *command-t-mappings*
       If set to 0, the window will occupy as much of the available space as
       needed to show matching entries.
 
+                                               *g:CommandTMinHeight*
+  |g:CommandTMinHeight|                          number (default: 0)
+
+      The minimum height in lines the match window is allowed to shrink to.
+      If set to 0, will default to a single line. If set above the max height,
+      will default to |g:CommandTMaxHeight|.
+
                                                *g:CommandTAlwaysShowDotFiles*
   |g:CommandTAlwaysShowDotFiles|                 boolean (default: 0)
 
       you want the best match to appear in a fixed location on the screen
       but still be near the prompt at the bottom.
 
+                                                *g:CommandTTagIncludeFilenames*
+  |g:CommandTTagIncludeFilenames|                 boolean (default: 0)
+
+      When this setting is off (the default) the matches in the |:CommandTTag|
+      listing do not include filenames.
+
 As well as the basic options listed above, there are a number of settings that
 can be used to override the default key mappings used by Command-T. For
 example, to set <C-x> as the mapping for cancelling (dismissing) the Command-T
                                       *g:CommandTClearMap*
                   |g:CommandTClearMap|  <C-u>
 
+                                      *g:CommandTRefreshMap*
+                |g:CommandTRefreshMap|  <C-f>
+
                                       *g:CommandTCursorLeftMap*
              |g:CommandTCursorLeftMap|  <Left>
                                       <C-h>
 Other contributors that have submitted patches include (in alphabetical
 order):
 
-  Anthony Panozzo
-  Daniel Hahler
-  Lucas de Vries
-  Marian Schubert
-  Matthew Todd
-  Mike Lundy
-  Scott Bronson
-  Steven Moazami
-  Sung Pae
-  Victor Hugo Borja
-  Woody Peterson
-  Zak Johnson
+  Anthony Panozzo           Mike Lundy                Thomas Pelletier
+  Daniel Hahler             Nate Kane                 Victor Hugo Borja
+  Felix Tjandrawibawa       Nicholas Alpi             Woody Peterson
+  Gary Bernhardt            Nadav Samet               Yan Pritzker
+  Ivan Ukhov                Noon Silk                 Zak Johnson
+  Jeff Kreeftmeijer         Rainux Luo
+  Lucas de Vries            Scott Bronson
+  Marcus Brito              Seth Fowler
+  Marian Schubert           Steven Moazami
+  Matthew Todd              Sung Pae
 
 As this was the first Vim plug-in I had ever written I was heavily influenced
 by the design of the LustyExplorer plug-in by Stephen Bach, which I understand
   http://www.vim.org/scripts/script.php?script_id=1890
 
 
+DEVELOPMENT                                     *command-t-development*
+
+Development in progress can be inspected via the project's Git web-based
+repository browser at:
+
+  https://wincent.com/repos/command-t
+
+the clone URL for which is:
+
+  git://git.wincent.com/command-t.git
+
+Mirrors exist on GitHub and Gitorious; these are automatically updated once
+per hour from the authoritative repository:
+
+  https://github.com/wincent/command-t
+  https://gitorious.org/command-t/command-t
+
+Patches are welcome via the usual mechanisms (pull requests, email, posting to
+the project issue tracker etc).
+
+As many users choose to track Command-T using Pathogen, which often means
+running a version later than the last official release, the intention is that
+the "master" branch should be kept in a stable and reliable state as much as
+possible.
+
+Riskier changes are first cooked on the "next" branch for a period before
+being merged into master. You can track this branch if you're feeling wild and
+experimental, but note that the "next" branch may periodically be rewound
+(force-updated) to keep it in sync with the "master" branch after each
+official release.
+
+
 WEBSITE                                         *command-t-website*
 
 The official website for Command-T is:
 
 The latest release will always be available from there.
 
-Development in progress can be inspected via the project's Git repository
-browser at:
-
-  https://wincent.com/repos/command-t
-
 A copy of each release is also available from the official Vim scripts site
 at:
 
 
 LICENSE                                         *command-t-license*
 
-Copyright 2010-2011 Wincent Colaiuta. All rights reserved.
+Copyright 2010-2012 Wincent Colaiuta. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
 HISTORY                                         *command-t-history*
 
+1.5 (not yet released)
+- don't scan "pathological" filesystem structures (ie. circular or
+  self-referential symlinks; patch from Marcus Brito)
+- gracefully handle files starting with "+" (patch from Ivan Ukhov)
+
+1.4 (20 June 2012)
+
+- added |:CommandTTag| command (patches from Noon Silk)
+- turn off |'colorcolumn'| and |'relativenumber'| in the match window (patch
+  from Jeff Kreeftmeijer)
+- documentation update (patch from Nicholas Alpi)
+- added |:CommandTMinHeight| option (patch from Nate Kane)
+- highlight (by underlining) matched characters in the match listing (requires
+  Vim to have been compiled with the +conceal feature, which is available in
+  Vim 7.3 or later; patch from Steven Moazami)
+- added the ability to flush the cache while the match window is open using
+  <C-f>
+
 1.3.1 (18 December 2011)
 
 - fix jumplist navigation under Ruby 1.9.x (patch from Woody Peterson)

File .vim/bundle/command-t/multi-spec.sh

   export PATH=~/.multiruby/install/$RUBY_VERSION/bin:$OLD_PATH
   build_quietly
   echo "$RUBY_VERSION: running spec suite"
-  bin/rspec spec
+  bundle exec rspec spec
   echo "$RUBY_VERSION: finished"
 done
 

File .vim/bundle/command-t/plugin/command-t.vim

 " command-t.vim
-" Copyright 2010-2011 Wincent Colaiuta. All rights reserved.
+" Copyright 2010-2012 Wincent Colaiuta. All rights reserved.
 "
 " Redistribution and use in source and binary forms, with or without
 " modification, are permitted provided that the following conditions are met:
 " ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 " POSSIBILITY OF SUCH DAMAGE.
 
-if exists("g:command_t_loaded")
+if exists("g:command_t_loaded") || &cp
   finish
 endif
 let g:command_t_loaded = 1
 
 command CommandTBuffer call <SID>CommandTShowBufferFinder()
 command CommandTJump call <SID>CommandTShowJumpFinder()
+command CommandTTag call <SID>CommandTShowTagFinder()
 command -nargs=? -complete=dir CommandT call <SID>CommandTShowFileFinder(<q-args>)
 command CommandTFlush call <SID>CommandTFlush()
 
   endif
 endfunction
 
+function s:CommandTShowTagFinder()
+  if has('ruby')
+    ruby $command_t.show_tag_finder
+  else
+    call s:CommandTRubyWarning()
+  endif
+endfunction
+
 function s:CommandTFlush()
   if has('ruby')
     ruby $command_t.flush
   ruby $command_t.accept_selection :command => 'vs'
 endfunction
 
+function CommandTRefresh()
+  ruby $command_t.refresh
+endfunction
+
 function CommandTToggleFocus()
   ruby $command_t.toggle_focus
 endfunction

File .vim/bundle/command-t/ruby/command-t/Makefile

+
+SHELL = /bin/sh
+
+# V=0 quiet, V=1 verbose.  other values don't work.
+V = 0
+Q1 = $(V:1=)
+Q = $(Q1:0=@)
+n=$(NULLCMD)
+ECHO1 = $(V:1=@$n)
+ECHO = $(ECHO1:0=@echo)
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /usr/local/Cellar/ruby/1.9.3-p194/include/ruby-1.9.1
+hdrdir = /usr/local/Cellar/ruby/1.9.3-p194/include/ruby-1.9.1
+arch_hdrdir = /usr/local/Cellar/ruby/1.9.3-p194/include/ruby-1.9.1/$(arch)
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
+prefix = $(DESTDIR)/usr/local/Cellar/ruby/1.9.3-p194
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
+exec_prefix = $(prefix)
+vendorhdrdir = $(rubyhdrdir)/vendor_ruby
+sitehdrdir = $(rubyhdrdir)/site_ruby
+rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
+vendordir = $(rubylibprefix)/vendor_ruby
+sitedir = $(rubylibprefix)/site_ruby
+ridir = $(datarootdir)/$(RI_BASE_NAME)
+mandir = $(datarootdir)/man
+localedir = $(datarootdir)/locale
+libdir = $(exec_prefix)/lib
+psdir = $(docdir)
+pdfdir = $(docdir)
+dvidir = $(docdir)
+htmldir = $(docdir)
+infodir = $(datarootdir)/info
+docdir = $(datarootdir)/doc/$(PACKAGE)
+oldincludedir = $(DESTDIR)/usr/include
+includedir = $(prefix)/include
+localstatedir = $(prefix)/var
+sharedstatedir = $(prefix)/com
+sysconfdir = $(prefix)/etc
+datadir = $(datarootdir)
+datarootdir = $(prefix)/share
+libexecdir = $(exec_prefix)/libexec
+sbindir = $(exec_prefix)/sbin
+bindir = $(exec_prefix)/bin
+rubylibdir = $(rubylibprefix)/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
+sitelibdir = $(sitedir)/$(ruby_version)
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+
+NULLCMD = :
+
+CC = /usr/bin/llvm-gcc
+CXX = /usr/bin/llvm-g++
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+OUTFLAG = -o 
+COUTFLAG = -o 
+
+RUBY_EXTCONF_H = 
+cflags   =  $(optflags) $(debugflags) $(warnflags)
+optflags = -O3
+debugflags = -ggdb
+warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration
+CFLAGS   = -fno-common -Os -w -pipe -march=core2 -msse4 -fno-common $(ARCH_FLAG)
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
+DEFS     = 
+CPPFLAGS = -DHAVE_RUBY_H -I/usr/local/Cellar/readline/6.2.2/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
+CXXFLAGS = $(CFLAGS) -Os -w -pipe -march=core2 -msse4
+ldflags  = -L. -L/usr/local/Cellar/readline/6.2.2/lib
+dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -Wl,-flat_namespace
+ARCH_FLAG = 
+DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
+LDSHARED = $(CC) -dynamic -bundle
+LDSHAREDXX = $(CXX) -dynamic -bundle
+AR = ar
+EXEEXT = 
+
+RUBY_BASE_NAME = ruby
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby.1.9.1
+arch = x86_64-darwin11.4.0
+sitearch = $(arch)
+ruby_version = 1.9.1
+ruby = /usr/local/Cellar/ruby/1.9.3-p194/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+RM_RF = $(RUBY) -run -e rm -- -rf
+RMDIRS = rmdir --ignore-fail-on-non-empty -p
+MAKEDIRS = /usr/local/Cellar/coreutils/8.16/libexec/gnubin/mkdir -p
+INSTALL = /usr/local/Cellar/coreutils/8.16/libexec/gnubin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L. -L$(libdir)
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = 
+DISTCLEANDIRS = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc 
+SRCS = ext.c match.c matcher.c
+OBJS = ext.o match.o matcher.o
+TARGET = ext
+DLLIB = $(TARGET).bundle
+EXTSTATIC = 
+STATIC_LIB = 
+
+BINDIR        = $(bindir)
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
+ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).bundle 
+CLEANOBJS     = *.o  *.bak
+
+all:    $(DLLIB)
+static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
+
+clean-rb-default::
+clean-rb::
+clean-so::
+clean: clean-so clean-rb-default clean-rb
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean-rb-default::
+distclean-rb::
+distclean-so::
+distclean: clean distclean-so distclean-rb-default distclean-rb
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+		@-$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
+
+realclean: distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_PROG) $(DLLIB) $(@D)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+pre-install-rb-default:
+	$(ECHO) installing default ext libraries
+$(RUBYARCHDIR):
+	$(Q) $(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o
+
+.cc.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.mm.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cxx.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cpp.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.C.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.c.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+.m.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+$(DLLIB): $(OBJS) Makefile
+	$(ECHO) linking shared-object $(DLLIB)
+	@-$(RM) $(@)
+	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+###
+# Copyright 2010 Wincent Colaiuta. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+CFLAGS += -std=c99 -Wall -Wextra -Wno-unused-parameter

File .vim/bundle/command-t/ruby/command-t/controller.rb

-# Copyright 2010-2011 Wincent Colaiuta. All rights reserved.
+# Copyright 2010-2012 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 require 'command-t/finder/buffer_finder'
 require 'command-t/finder/jump_finder'
 require 'command-t/finder/file_finder'
+require 'command-t/finder/tag_finder'
 require 'command-t/match_window'
 require 'command-t/prompt'
 require 'command-t/vim/path_utilities'
       show
     end
 
+    def show_tag_finder
+      @path          = VIM::pwd
+      @active_finder = tag_finder
+      show
+    end
+
     def show_file_finder
       # optional parameter will be desired starting directory, or ""
       @path             = File.expand_path(::VIM::evaluate('a:arg'), VIM::pwd)
       end
     end
 
+    def refresh
+      return unless @active_finder && @active_finder.respond_to?(:flush)
+      @active_finder.flush
+      list_matches
+    end
+
     def flush
       @max_height   = nil
+      @min_height   = nil
       @file_finder  = nil
+      @tag_finder   = nil
     end
 
     def handle_key
       @match_window     = MatchWindow.new \
         :prompt               => @prompt,
         :match_window_at_top  => get_bool('g:CommandTMatchWindowAtTop'),
-        :match_window_reverse => get_bool('g:CommandTMatchWindowReverse')
+        :match_window_reverse => get_bool('g:CommandTMatchWindowReverse'),
+        :min_height           => min_height
       @focus            = @prompt
       @prompt.focus
       register_for_key_presses
       @max_height ||= get_number('g:CommandTMaxHeight') || 0
     end
 
-    def exists? name
-      ::VIM::evaluate("exists(\"#{name}\")").to_i != 0
+    def min_height
+      @min_height ||= begin
+        min_height = get_number('g:CommandTMinHeight') || 0
+        min_height = max_height if max_height != 0 && min_height > max_height
+        min_height
+      end
     end
 
     def get_number name
-      exists?(name) ? ::VIM::evaluate("#{name}").to_i : nil
+      VIM::exists?(name) ? ::VIM::evaluate("#{name}").to_i : nil
     end
 
     def get_bool name
-      exists?(name) ? ::VIM::evaluate("#{name}").to_i != 0 : nil
+      VIM::exists?(name) ? ::VIM::evaluate("#{name}").to_i != 0 : nil
     end
 
     def get_string name
-      exists?(name) ? ::VIM::evaluate("#{name}").to_s : nil
+      VIM::exists?(name) ? ::VIM::evaluate("#{name}").to_s : nil
     end
 
     # expect a string or a list of strings
     def get_list_or_string name
-      return nil unless exists?(name)
+      return nil unless VIM::exists?(name)
       list_or_string = ::VIM::evaluate("#{name}")
       if list_or_string.kind_of?(Array)
         list_or_string.map { |item| item.to_s }
       selection = File.expand_path selection, @path
       selection = relative_path_under_working_directory selection
       selection = sanitize_path_string selection
+      selection = File.join('.', selection) if selection =~ /^\+/
       ensure_appropriate_window_selection
-      ::VIM::command "silent #{command} #{selection}"
+
+      @active_finder.open_selection command, selection, options
     end
 
     def map key, function, param = nil
         ":call CommandT#{function}(#{param})<CR>"
     end
 
-    def xterm?
-      !!(::VIM::evaluate('&term') =~ /\Axterm/)
-    end
-
-    def vt100?
-      !!(::VIM::evaluate('&term') =~ /\Avt100/)
+    def term
+      @term ||= ::VIM::evaluate('&term')
     end
 
     def register_for_key_presses
       end
 
       # "special" keys (overridable by settings)
-      { 'Backspace'             => '<BS>',
-        'Delete'                => '<Del>',
+      {
         'AcceptSelection'       => '<CR>',
         'AcceptSelectionSplit'  => ['<C-CR>', '<C-s>'],
         'AcceptSelectionTab'    => '<C-t>',
         'AcceptSelectionVSplit' => '<C-v>',
-        'ToggleFocus'           => '<Tab>',
+        'Backspace'             => '<BS>',
         'Cancel'                => ['<C-c>', '<Esc>'],
+        'Clear'                 => '<C-u>',
+        'CursorEnd'             => '<C-e>',
+        'CursorLeft'            => ['<Left>', '<C-h>'],
+        'CursorRight'           => ['<Right>', '<C-l>'],
+        'CursorStart'           => '<C-a>',
+        'Delete'                => '<Del>',
+        'Refresh'               => '<C-f>',
         'SelectNext'            => ['<C-n>', '<C-j>', '<Down>'],
         'SelectPrev'            => ['<C-p>', '<C-k>', '<Up>'],
-        'Clear'                 => '<C-u>',
-        'CursorLeft'            => ['<Left>', '<C-h>'],
-        'CursorRight'           => ['<Right>', '<C-l>'],
-        'CursorEnd'             => '<C-e>',
-        'CursorStart'           => '<C-a>' }.each do |key, value|
+        'ToggleFocus'           => '<Tab>',
+      }.each do |key, value|
         if override = get_list_or_string("g:CommandT#{key}Map")
-          [override].flatten.each do |mapping|
+          Array(override).each do |mapping|
             map mapping, key
           end
         else
-          [value].flatten.each do |mapping|
-            map mapping, key unless mapping == '<Esc>' && (xterm? || vt100?)
+          Array(value).each do |mapping|
+            unless mapping == '<Esc>' && term =~ /\A(screen|xterm|vt100)/
+              map mapping, key
+            end
           end
         end
       end
     def jump_finder
       @jump_finder ||= CommandT::JumpFinder.new
     end
+
+    def tag_finder
+      @tag_finder ||= CommandT::TagFinder.new \
+        :include_filenames => get_bool('g:CommandTTagIncludeFilenames')
+    end
   end # class Controller
 end # module commandT

File .vim/bundle/command-t/ruby/command-t/ext.bundle

Binary file added.

File .vim/bundle/command-t/ruby/command-t/extconf.rb

   exit 1
 end
 
+RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+
 have_header('ruby.h') or missing('ruby.h')
 create_makefile('ext')

File .vim/bundle/command-t/ruby/command-t/finder.rb

-# Copyright 2010-2011 Wincent Colaiuta. All rights reserved.
+# Copyright 2010-2012 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
   # Specialized subclasses use different kinds of scanners adapted for
   # different kinds of search (files, buffers).
   class Finder
+    include VIM::PathUtilities
+
     def initialize path = Dir.pwd, options = {}
       raise RuntimeError, 'Subclass responsibility'
     end
       @matcher.sorted_matches_for str, options
     end
 
-    def flush
-      @scanner.flush
+    def open_selection command, selection, options = {}
+      ::VIM::command "silent #{command} #{selection}"
     end
 
     def path= path

File .vim/bundle/command-t/ruby/command-t/finder/file_finder.rb

-# Copyright 2010-2011 Wincent Colaiuta. All rights reserved.
+# Copyright 2010-2012 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
       @scanner = FileScanner.new path, options
       @matcher = Matcher.new @scanner, options
     end
+
+    def flush
+      @scanner.flush
+    end
   end # class FileFinder
 end # CommandT

File .vim/bundle/command-t/ruby/command-t/finder/tag_finder.rb

+# Copyright 2011-2012 Wincent Colaiuta. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+require 'command-t/ext' # CommandT::Matcher
+require 'command-t/scanner/tag_scanner'
+require 'command-t/finder'
+
+module CommandT
+  class TagFinder < Finder
+    def initialize options = {}
+      @scanner = TagScanner.new options
+      @matcher = Matcher.new @scanner, :always_show_dot_files => true
+    end
+
+    def open_selection command, selection, options = {}
+      if @scanner.include_filenames
+        selection = selection[0, selection.index(':')]
+      end
+
+      #  open the tag and center the screen on it
+      ::VIM::command "silent! tag #{selection} | :normal zz"
+    end
+  end # class TagFinder
+end # module CommandT

File .vim/bundle/command-t/ruby/command-t/match_window.rb

-# Copyright 2010-2011 Wincent Colaiuta. All rights reserved.
+# Copyright 2010-2012 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 
 module CommandT
   class MatchWindow
-    @@selection_marker  = '> '
-    @@marker_length     = @@selection_marker.length
-    @@unselected_marker = ' ' * @@marker_length
-    @@buffer            = nil
+    SELECTION_MARKER  = '> '
+    MARKER_LENGTH     = SELECTION_MARKER.length
+    UNSELECTED_MARKER = ' ' * MARKER_LENGTH
+    MH_START          = '<commandt>'
+    MH_END            = '</commandt>'
+    @@buffer          = nil
 
     def initialize options = {}
       @prompt = options[:prompt]
       @reverse_list = options[:match_window_reverse]
+      @min_height = options[:min_height]
 
       # save existing window dimensions so we can restore them later
       @windows = []
           'setlocal textwidth=0'        # don't hard-wrap (break long lines)
         ].each { |command| ::VIM::command command }
 
+        # don't show the color column
+        ::VIM::command 'setlocal colorcolumn=0' if VIM::exists?('+colorcolumn')
+
+        # don't show relative line numbers
+        ::VIM::command 'setlocal norelativenumber' if VIM::exists?('+relativenumber')
+
         # sanity check: make sure the buffer really was created
         raise "Can't find GoToFile buffer" unless $curbuf.name.match /GoToFile\z/
         @@buffer = $curbuf
 
       # syntax coloring
       if VIM::has_syntax?
-        ::VIM::command "syntax match CommandTSelection \"^#{@@selection_marker}.\\+$\""
+        ::VIM::command "syntax match CommandTSelection \"^#{SELECTION_MARKER}.\\+$\""
         ::VIM::command 'syntax match CommandTNoEntries "^-- NO MATCHES --$"'
         ::VIM::command 'syntax match CommandTNoEntries "^-- NO SUCH FILE OR DIRECTORY --$"'
+        ::VIM::command 'setlocal synmaxcol=9999'
+
+        if VIM::has_conceal?
+          ::VIM::command 'setlocal conceallevel=2'
+          ::VIM::command 'setlocal concealcursor=nvic'
+          ::VIM::command 'syntax region CommandTCharMatched ' \
+                         "matchgroup=CommandTCharMatched start=+#{MH_START}+ " \
+                         "matchgroup=CommandTCharMatchedEnd end=+#{MH_END}+ concealends"
+          ::VIM::command 'highlight def CommandTCharMatched ' \
+                         'term=bold,underline cterm=bold,underline ' \
+                         'gui=bold,underline'
+        end
+
         ::VIM::command 'highlight link CommandTSelection Visual'
         ::VIM::command 'highlight link CommandTNoEntries Error'
         ::VIM::evaluate 'clearmatches()'
       # by some unexpected means of dismissing or leaving the Command-T window
       # (eg. <C-W q>, <C-W k> etc)
       ::VIM::command 'autocmd! * <buffer>'
-      ::VIM::command 'autocmd BufLeave <buffer> ruby $command_t.leave'
-      ::VIM::command 'autocmd BufUnload <buffer> ruby $command_t.unload'
+      ::VIM::command 'autocmd BufLeave <buffer> silent! ruby $command_t.leave'
+      ::VIM::command 'autocmd BufUnload <buffer> silent! ruby $command_t.unload'
 
       @has_focus  = false
       @selection  = nil
     end
 
     def close
+      # Unlisted buffers like those provided by Netrw, NERDTree and Vim's help
+      # don't actually appear in the buffer list; if they are the only such
+      # buffers present when Command-T is invoked (for example, when invoked
+      # immediately after starting Vim with a directory argument, like `vim .`)
+      # then performing the normal clean-up will yield an "E90: Cannot unload
+      # last buffer" error. We can work around that by doing a :quit first.
+      if ::VIM::Buffer.count == 0
+        ::VIM::command 'silent quit'
+      end
+
       # Workaround for upstream bug in Vim 7.3 on some platforms
       #
       # On some platforms, $curbuf.number always returns 0. One workaround is
       # For more details, see: https://wincent.com/issues/1617
       if $curbuf.number == 0
         # use bwipeout as bunload fails if passed the name of a hidden buffer
-        ::VIM::command 'bwipeout! GoToFile'
+        ::VIM::command 'silent! bwipeout! GoToFile'
         @@buffer = nil
       else
-        ::VIM::command "bunload! #{@@buffer.number}"
+        ::VIM::command "silent! bunload! #{@@buffer.number}"
       end
     end
 
       return unless VIM::Window.select(@window)
       unlock
       clear
-      @window.height = 1
+      @window.height = @min_height > 0 ? @min_height : 1
       @@buffer[1] = "-- #{msg} --"
       lock
     end
     end
 
     def match_text_for_idx idx
-      match = truncated_match @matches[idx]
+      match = truncated_match @matches[idx].to_s
       if idx == @selection
-        prefix = @@selection_marker
+        prefix = SELECTION_MARKER
         suffix = padding_for_selected_match match
       else
-        prefix = @@unselected_marker
+        if VIM::has_syntax? && VIM::has_conceal?
+          match = match_with_syntax_highlight match
+        end
+        prefix = UNSELECTED_MARKER
         suffix = ''
       end
       prefix + match + suffix
     end
 
+    # Highlight matching characters within the matched string.
+    #
+    # Note that this is only approximate; it will highlight the first matching
+    # instances within the string, which may not actually be the instances that
+    # were used by the matching/scoring algorithm to determine the best score
+    # for the match.
+    #
+    def match_with_syntax_highlight match
+      highlight_chars = @prompt.abbrev.downcase.chars.to_a
+      match.chars.inject([]) do |output, char|
+        if char.downcase == highlight_chars.first
+          highlight_chars.shift
+          output.concat [MH_START, char, MH_END]
+        else
+          output << char
+        end
+      end.join
+    end
+
     # Print just the specified match.
     def print_match idx
       return unless VIM::Window.select(@window)
         @window_width = @window.width # update cached value
         max_lines = VIM::Screen.lines - 5
         max_lines = 1 if max_lines < 0
-        actual_lines = match_count > max_lines ? max_lines : match_count
+        actual_lines = match_count < @min_height ? @min_height : match_count
+        actual_lines = max_lines if actual_lines > max_lines
         @window.height = actual_lines
         (1..actual_lines).each do |line|
           idx = line - 1
     # highlighting extends all the way to the right edge of the window.
     def padding_for_selected_match str
       len = str.length
-      if len >= @window_width - @@marker_length
+      if len >= @window_width - MARKER_LENGTH
         ''
       else
-        ' ' * (@window_width - @@marker_length - len)
+        ' ' * (@window_width - MARKER_LENGTH - len)
       end
     end
 
     # window width.
     def truncated_match str
       len = str.length
-      available_width = @window_width - @@marker_length
+      available_width = @window_width - MARKER_LENGTH
       return str if len <= available_width
       left = (available_width / 2) - 1
       right = (available_width / 2) - 2 + (available_width % 2)

File .vim/bundle/command-t/ruby/command-t/mkmf.log

+have_header: checking for ruby.h... -------------------- yes
+
+"/usr/bin/llvm-gcc -o conftest -I/usr/local/Cellar/ruby/1.9.3-p194/include/ruby-1.9.1/x86_64-darwin11.4.0 -I/usr/local/Cellar/ruby/1.9.3-p194/include/ruby-1.9.1/ruby/backward -I/usr/local/Cellar/ruby/1.9.3-p194/include/ruby-1.9.1 -I. -I/usr/local/Cellar/readline/6.2.2/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE  -I/usr/local/Cellar/readline/6.2.2/include -Os -w -pipe -march=core2 -msse4 -fno-common conftest.c  -L. -L/usr/local/Cellar/ruby/1.9.3-p194/lib -L. -L/usr/local/Cellar/readline/6.2.2/lib     -lruby.1.9.1  -lpthread -ldl -lobjc "
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: int main() {return 0;}
+/* end */
+
+"/usr/bin/llvm-gcc -E -I/usr/local/Cellar/ruby/1.9.3-p194/include/ruby-1.9.1/x86_64-darwin11.4.0 -I/usr/local/Cellar/ruby/1.9.3-p194/include/ruby-1.9.1/ruby/backward -I/usr/local/Cellar/ruby/1.9.3-p194/include/ruby-1.9.1 -I. -I/usr/local/Cellar/readline/6.2.2/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE  -I/usr/local/Cellar/readline/6.2.2/include -Os -w -pipe -march=core2 -msse4 -fno-common  conftest.c -o conftest.i"
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: #include <ruby.h>
+/* end */
+
+--------------------
+

File .vim/bundle/command-t/ruby/command-t/scanner/file_scanner.rb

       ::VIM::evaluate("empty(expand(fnameescape('#{path}')))").to_i == 1
     end
 
+    def looped_symlink? path
+      if File.symlink?(path)
+        target = File.expand_path(File.readlink(path), File.dirname(path))
+        target.include?(@path) || @path.include?(target)
+      end
+    end
+
     def add_paths_for_directory dir, accumulator
       Dir.foreach(dir) do |entry|
         next if ['.', '..'].include?(entry)
           elsif File.directory?(path)
             next if @depth >= @max_depth
             next if (entry.match(/\A\./) && !@scan_dot_directories)
+            next if looped_symlink?(path)
             @depth += 1
             add_paths_for_directory path, accumulator
             @depth -= 1

File .vim/bundle/command-t/ruby/command-t/scanner/jump_scanner.rb

       filenames = jumps_with_filename[1..-2].map do |line|
         relative_path_under_working_directory line.split[3]
       end
+
       filenames.sort.uniq
     end
 

File .vim/bundle/command-t/ruby/command-t/scanner/tag_scanner.rb

+# Copyright 2011-2012 Wincent Colaiuta. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+require 'command-t/vim'
+require 'command-t/scanner'
+
+module CommandT
+  class TagScanner < Scanner
+    attr_reader :include_filenames
+
+    def initialize options = {}
+      @include_filenames = options[:include_filenames] || false
+    end
+
+    def paths
+      taglist.map do |tag|
+        path = tag['name']
+        path << ":#{tag['filename']}" if @include_filenames
+        path
+      end.uniq.sort
+    end
+
+  private
+
+    def taglist
+      ::VIM::evaluate 'taglist(".")'
+    end
+  end # class TagScanner
+end # module CommandT

File .vim/bundle/command-t/ruby/command-t/stub.rb

                     'Please see INSTALLATION and TROUBLE-SHOOTING in the help',
                     'For more information type:    :help command-t']
 
-    [:flush, :show_buffer_finder, :show_file_finder].each do |method|
+    [:flush, :show_buffer_finder, :show_file_finder, :show_tag_finder].each do |method|
       define_method(method.to_sym) { warn *@@load_error }
     end
 

File .vim/bundle/command-t/ruby/command-t/vim.rb

-# Copyright 2010-2011 Wincent Colaiuta. All rights reserved.
+# Copyright 2010-2012 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
       ::VIM::evaluate('has("syntax")').to_i != 0
     end
 
+    def self.exists? str
+      ::VIM::evaluate(%{exists("#{str}")}).to_i != 0
+    end
+
+    def self.has_conceal?
+      ::VIM::evaluate('has("conceal")').to_i != 0
+    end
+
     def self.pwd
       ::VIM::evaluate 'getcwd()'
     end

File .vim/bundle/command-t/spec/command-t/controller_spec.rb

   end
 
   def stub_finder(sorted_matches=[])
-    finder = Object.new
+    finder = CommandT::FileFinder.new
     stub(finder).path = anything
     stub(finder).sorted_matches_for(anything, anything).returns(sorted_matches)
     stub(CommandT::FileFinder).new.returns(finder)

File .vim/bundle/snipmate.vim/snippets/htmldjango.snippets

+html.snippets

File .vim/bundle/taglist/doc/tags

-'Tlist_Auto_Highlight_Tag'	taglist.txt	/*'Tlist_Auto_Highlight_Tag'*
-'Tlist_Auto_Open'	taglist.txt	/*'Tlist_Auto_Open'*
-'Tlist_Auto_Update'	taglist.txt	/*'Tlist_Auto_Update'*
-'Tlist_Close_On_Select'	taglist.txt	/*'Tlist_Close_On_Select'*
-'Tlist_Compact_Format'	taglist.txt	/*'Tlist_Compact_Format'*
-'Tlist_Ctags_Cmd'	taglist.txt	/*'Tlist_Ctags_Cmd'*
-'Tlist_Display_Prototype'	taglist.txt	/*'Tlist_Display_Prototype'*
-'Tlist_Display_Tag_Scope'	taglist.txt	/*'Tlist_Display_Tag_Scope'*
-'Tlist_Enable_Fold_Column'	taglist.txt	/*'Tlist_Enable_Fold_Column'*
-'Tlist_Exit_OnlyWindow'	taglist.txt	/*'Tlist_Exit_OnlyWindow'*
-'Tlist_File_Fold_Auto_Close'	taglist.txt	/*'Tlist_File_Fold_Auto_Close'*
-'Tlist_GainFocus_On_ToggleOpen'	taglist.txt	/*'Tlist_GainFocus_On_ToggleOpen'*
-'Tlist_Highlight_Tag_On_BufEnter'	taglist.txt	/*'Tlist_Highlight_Tag_On_BufEnter'*
-'Tlist_Inc_Winwidth'	taglist.txt	/*'Tlist_Inc_Winwidth'*
-'Tlist_Max_Submenu_Items'	taglist.txt	/*'Tlist_Max_Submenu_Items'*
-'Tlist_Max_Tag_Length'	taglist.txt	/*'Tlist_Max_Tag_Length'*
-'Tlist_Process_File_Always'	taglist.txt	/*'Tlist_Process_File_Always'*
-'Tlist_Show_Menu'	taglist.txt	/*'Tlist_Show_Menu'*
-'Tlist_Show_One_File'	taglist.txt	/*'Tlist_Show_One_File'*
-'Tlist_Sort_Type'	taglist.txt	/*'Tlist_Sort_Type'*
-'Tlist_Use_Horiz_Window'	taglist.txt	/*'Tlist_Use_Horiz_Window'*
-'Tlist_Use_Right_Window'	taglist.txt	/*'Tlist_Use_Right_Window'*
-'Tlist_Use_SingleClick'	taglist.txt	/*'Tlist_Use_SingleClick'*
-'Tlist_WinHeight'	taglist.txt	/*'Tlist_WinHeight'*
-'Tlist_WinWidth'	taglist.txt	/*'Tlist_WinWidth'*
-:TlistAddFiles	taglist.txt	/*:TlistAddFiles*
-:TlistAddFilesRecursive	taglist.txt	/*:TlistAddFilesRecursive*
-:TlistClose	taglist.txt	/*:TlistClose*
-:TlistDebug	taglist.txt	/*:TlistDebug*
-:TlistHighlightTag	taglist.txt	/*:TlistHighlightTag*
-:TlistLock	taglist.txt	/*:TlistLock*
-:TlistMessages	taglist.txt	/*:TlistMessages*
-:TlistOpen	taglist.txt	/*:TlistOpen*
-:TlistSessionLoad	taglist.txt	/*:TlistSessionLoad*
-:TlistSessionSave	taglist.txt	/*:TlistSessionSave*
-:TlistShowPrototype	taglist.txt	/*:TlistShowPrototype*
-:TlistShowTag	taglist.txt	/*:TlistShowTag*
-:TlistToggle	taglist.txt	/*:TlistToggle*
-:TlistUndebug	taglist.txt	/*:TlistUndebug*
-:TlistUnlock	taglist.txt	/*:TlistUnlock*
-:TlistUpdate	taglist.txt	/*:TlistUpdate*
-Tlist_Get_Tag_Prototype_By_Line()	taglist.txt	/*Tlist_Get_Tag_Prototype_By_Line()*
-Tlist_Get_Tagname_By_Line()	taglist.txt	/*Tlist_Get_Tagname_By_Line()*
-Tlist_Set_App()	taglist.txt	/*Tlist_Set_App()*
-Tlist_Update_File_Tags()	taglist.txt	/*Tlist_Update_File_Tags()*
-taglist-commands	taglist.txt	/*taglist-commands*
-taglist-debug	taglist.txt	/*taglist-debug*
-taglist-extend	taglist.txt	/*taglist-extend*
-taglist-faq	taglist.txt	/*taglist-faq*
-taglist-functions	taglist.txt	/*taglist-functions*
-taglist-install	taglist.txt	/*taglist-install*
-taglist-internet	taglist.txt	/*taglist-internet*
-taglist-intro	taglist.txt	/*taglist-intro*
-taglist-keys	taglist.txt	/*taglist-keys*
-taglist-license	taglist.txt	/*taglist-license*
-taglist-menu	taglist.txt	/*taglist-menu*
-taglist-options	taglist.txt	/*taglist-options*
-taglist-requirements	taglist.txt	/*taglist-requirements*
-taglist-session	taglist.txt	/*taglist-session*
-taglist-todo	taglist.txt	/*taglist-todo*
-taglist-using	taglist.txt	/*taglist-using*
-taglist.txt	taglist.txt	/*taglist.txt*

File .vim/bundle/vim-colors-solarized/doc/tags

-'solarized_bold'	solarized.txt	/*'solarized_bold'*
-'solarized_contrast'	solarized.txt	/*'solarized_contrast'*
-'solarized_degrade'	solarized.txt	/*'solarized_degrade'*
-'solarized_hitrail'	solarized.txt	/*'solarized_hitrail'*
-'solarized_italic'	solarized.txt	/*'solarized_italic'*
-'solarized_menu'	solarized.txt	/*'solarized_menu'*
-'solarized_termcolors'	solarized.txt	/*'solarized_termcolors'*
-'solarized_termtrans'	solarized.txt	/*'solarized_termtrans'*
-'solarized_underline'	solarized.txt	/*'solarized_underline'*
-'solarized_visibility'	solarized.txt	/*'solarized_visibility'*
-before	solarized.txt	/*before*
-solarized	solarized.txt	/*solarized*
-solarized-colors	solarized.txt	/*solarized-colors*
-solarized-colorscheme	solarized.txt	/*solarized-colorscheme*
-solarized-help	solarized.txt	/*solarized-help*
-solarized-install	solarized.txt	/*solarized-install*
-solarized-menu	solarized.txt	/*solarized-menu*
-solarized-options	solarized.txt	/*solarized-options*
-solarized-term	solarized.txt	/*solarized-term*
-solarized-togglebg	solarized.txt	/*solarized-togglebg*
-solarized.vim	solarized.txt	/*solarized.vim*
-toggle-background	solarized.txt	/*toggle-background*
-toggle-bg	solarized.txt	/*toggle-bg*
-togglebg	solarized.txt	/*togglebg*
-urxvt	solarized.txt	/*urxvt*
-vim-colors-solarized	solarized.txt	/*vim-colors-solarized*
-without	solarized.txt	/*without*

File .vim/bundle/vim-flake8/README.mdown

 
     autocmd FileType python map <buffer> <F3> :call Flake8()<CR>
 
+To add builtins, in your .vimrc:
+
+    let g:flake8_builtins="_,apply"
+
 To ignore errors, in your .vimrc:
 
     let g:flake8_ignore="E501,W293"
 
     let g:flake8_max_complexity=10
 
-To cutomize the location of your flake8 binary, set `g:flake8_cmd`:
+To customize the location of your flake8 binary, set `g:flake8_cmd`:
 
     let g:flake8_cmd="/opt/strangebin/flake8000"
 
 
 - [PyUnit](http://github.com/nvie/vim-pyunit) (unit test helper under `<F8>`
   and `<F9>`)
+
+
+History
+-------
+
+1.3: Added the following options:
+
+     - `g:flake8_builtins="_,apply"`
+     - `g:flake8_max_complexity=10`
+
+1.2: Added the following options:
+
+     - `g:flake8_cmd="/opt/strangebin/flake8000"`
+     - `g:flake8_max_line_length=120`
+     - `g:flake8_ignore="E501,W293"`
+
+1.1: Added `g:flake8_ignore` option.
+
+1.0: Initial version.

File .vim/bundle/vim-flake8/ftplugin/python_flake8.vim

 endif
 let b:loaded_flake8_ftplugin=1
 
-if exists("g:flake8_cmd")
-    let s:flake8_cmd=g:flake8_cmd
-else
-    let s:flake8_cmd="flake8"
-endif
-
-let s:flake8_ignores=""
-if exists("g:flake8_ignore")
-    let s:flake8_ignores=" --ignore=".g:flake8_ignore
-endif
-
-let s:flake8_max_line_length=""
-if exists("g:flake8_max_line_length")
-    let s:flake8_max_line_length=" --max-line-length=".g:flake8_max_line_length
-endif
-
-let s:flake8_max_complexity=""
-if exists("g:flake8_max_complexity")
-    let s:flake8_max_complexity=" --max-complexity=".g:flake8_max_complexity
-endif
-
 if !exists("*Flake8()")
     function Flake8()
+        if exists("g:flake8_cmd")
+            let s:flake8_cmd=g:flake8_cmd
+        else
+            let s:flake8_cmd="flake8"
+        endif
+
         if !executable(s:flake8_cmd)
             echoerr "File " . s:flake8_cmd . " not found. Please install it first."
             return
             update
         endif
 
+        " read config
+        if exists("g:flake8_builtins")
+            let s:flake8_builtins_opt=" --builtins=".g:flake8_builtins
+        else
+            let s:flake8_builtins_opt=""
+        endif
+
+        if exists("g:flake8_ignore")
+            let s:flake8_ignores=" --ignore=".g:flake8_ignore
+        else
+            let s:flake8_ignores=""
+        endif
+
+        if exists("g:flake8_max_line_length")
+            let s:flake8_max_line_length=" --max-line-length=".g:flake8_max_line_length
+        else
+            let s:flake8_max_line_length=""
+        endif
+
+        if exists("g:flake8_max_complexity")
+            let s:flake8_max_complexity=" --max-complexity=".g:flake8_max_complexity
+        else
+            let s:flake8_max_complexity=""
+        endif
+
         " perform the grep itself
         let &grepformat="%f:%l:%c: %m\,%f:%l: %m"
-        let &grepprg=s:flake8_cmd.s:flake8_ignores.s:flake8_max_line_length.s:flake8_max_complexity
-        silent! grep! `pwd`/%
+        let &grepprg=s:flake8_cmd.s:flake8_builtins_opt.s:flake8_ignores.s:flake8_max_line_length.s:flake8_max_complexity
+        silent! grep! %
 
         " restore grep settings
         let &grepformat=l:old_gfm