Permalink
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
frankmt committed Apr 2, 2012
2 parents c66c2ab + ad53cb6 commit b85c65224b05ffcd8b1b8ec497745d222045c1f0
Showing with 32 additions and 7 deletions.
  1. +12 −0 .gitmodules
  2. +6 −2 bash_profile
  3. +1 −0 rspec
  4. +1 −0 vim/bundle/ack
  5. +1 −0 vim/bundle/greplace
  6. +1 −0 vim/bundle/vim-matchit
  7. +1 −0 vim/bundle/vim-ruby
  8. +9 −5 vim/vimrc
View
@@ -25,3 +25,15 @@
[submodule "vim/bundle/kwbdi"]
path = vim/bundle/kwbdi
url = https://github.com/vim-scripts/kwbdi.vim.git
+[submodule "vim/bundle/ack"]
+ path = vim/bundle/ack
+ url = https://github.com/mileszs/ack.vim.git
+[submodule "vim/bundle/greplace"]
+ path = vim/bundle/greplace
+ url = https://github.com/vim-scripts/greplace.vim.git
+[submodule "vim/bundle/vim-ruby"]
+ path = vim/bundle/vim-ruby
+ url = https://github.com/vim-ruby/vim-ruby.git
+[submodule "vim/bundle/vim-matchit"]
+ path = vim/bundle/vim-matchit
+ url = https://github.com/tsaleh/vim-matchit.git
View
@@ -24,6 +24,10 @@ alias op="open *.tmproj || mate ."
# TextMate
# alias op="open *.tmproj || mate ."
+# let more key combos get through iterm to vim, etc.
+# http://groups.google.com/group/iterm2-discuss/browse_thread/thread/47700851d59386fb?pli=1
+stty -ixon
+
# vim
export EDITOR="vim"
alias v="vim"
@@ -42,8 +46,8 @@ alias tmp="mkdir -p ~/tmp; cd ~/tmp"
alias gst="git status"
alias ga="git add"
alias gc="git commit"
-alias gdv="git diff | vim -"
-alias gdcv="git diff --cached | vim -"
+alias gdv="git diff | view -"
+alias gdcv="git diff --cached | view -"
# brew & ruby(gems?)
export RUBYLIB="`brew --prefix`/lib:$RUBYLIB"
View
1 rspec
@@ -0,0 +1 @@
+--color
Submodule ack added at 989528
Submodule greplace added at 993631
Submodule vim-matchit added at 8f8665
Submodule vim-ruby added at 3d43f0
View
@@ -1,3 +1,9 @@
+" Filetype plugin tells matchit about pairs and probably more.
+" This didn't work until I moved it before Pathogen.
+filetype on
+filetype indent on
+filetype plugin on
+
" Start pathogen for managing plugins, etc.
call pathogen#infect()
@@ -30,11 +36,6 @@ set cpoptions+=$
" Show status line even if single window
set laststatus=2
-" Filetype plugin tells matchit about pairs and probably more.
-filetype on
-filetype indent on
-filetype plugin on
-
" Syntax highlighting
syntax enable
@@ -56,6 +57,9 @@ set term=xterm-256color
" System clipboard sharing
set clipboard=unnamed
+" Leader and friends
+map , \
+
" Reselect visual area when changing indent in visual mode (from @notahat)
vnoremap < <gv
vnoremap > >gv

0 comments on commit b85c652

Please sign in to comment.