Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base: master
...
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 14 commits
  • 35 files changed
  • 0 commit comments
  • 1 contributor
Showing with 158 additions and 30 deletions.
  1. BIN  .DS_Store
  2. +1 −0  .gitignore
  3. +12 −3 .gitmodules
  4. +27 −0 .gvimrc
  5. +4 −1 .vimrc
  6. +16 −6 autoload/pathogen.vim
  7. +1 −1  bundle/ack
  8. +1 −0  bundle/cocoa
  9. +1 −1  bundle/nerdtree
  10. +1 −1  bundle/tabular
  11. +1 −0  bundle/taskpaper
  12. +1 −0  bundle/textile
  13. +1 −1  bundle/vim-cucumber
  14. +1 −1  bundle/vim-endwise
  15. +1 −1  bundle/vim-fugitive
  16. +1 −1  bundle/vim-git
  17. +1 −1  bundle/vim-haml
  18. +1 −1  bundle/vim-javascript
  19. +1 −1  bundle/vim-markdown
  20. +1 −1  bundle/vim-ragtag
  21. +1 −1  bundle/vim-rails
  22. +1 −1  bundle/vim-ruby
  23. +1 −1  bundle/vim-rubytest
  24. +1 −1  bundle/vim-speeddating
  25. +1 −1  bundle/vim-surround
  26. +67 −0 keybindings.gui.vim
  27. +1 −1  snippets/cucumber/And.snippet
  28. +0 −1  snippets/cucumber/Given.snippet
  29. +0 −1  snippets/cucumber/Then.snippet
  30. +0 −1  snippets/cucumber/When.snippet
  31. +4 −0 snippets/cucumber/fea.snippet
  32. +1 −0  snippets/cucumber/giv.snippet
  33. +4 −0 snippets/cucumber/sce.snippet
  34. +1 −0  snippets/cucumber/th.snippet
  35. +1 −0  snippets/cucumber/wh.snippet
View
BIN  .DS_Store
Binary file not shown
View
1  .gitignore
@@ -1,2 +1,3 @@
backups
tmp
+.netrwhist
View
15 .gitmodules
@@ -22,9 +22,6 @@
[submodule "bundle/vim-ragtag"]
path = bundle/vim-ragtag
url = git://github.com/tpope/vim-ragtag.git
-[submodule "bundle/vim-rails"]
- path = bundle/vim-rails
- url = git@github.com:duff/vim-rails.git
[submodule "bundle/vim-rubytest"]
path = bundle/vim-rubytest
url = git://github.com/janx/vim-rubytest.git
@@ -64,3 +61,15 @@
[submodule "bundle/vim-javascript"]
path = bundle/vim-javascript
url = http://github.com/pangloss/vim-javascript.git
+[submodule "bundle/vim-rails"]
+ path = bundle/vim-rails
+ url = http://github.com/tpope/vim-rails.git
+[submodule "bundle/textile"]
+ path = bundle/textile
+ url = http://github.com/timcharper/textile.vim.git
+[submodule "bundle/cocoa"]
+ path = bundle/cocoa
+ url = https://github.com/msanders/cocoa.vim.git
+[submodule "bundle/taskpaper"]
+ path = bundle/taskpaper
+ url = https://github.com/jessmartin/taskpaper.vim.git
View
27 .gvimrc
@@ -0,0 +1,27 @@
+" Keybindings:
+source ~/.vim/keybindings.gui.vim
+
+" Font: Choose font and enable anti-aliasing
+set guifont=Monaco:h14
+set antialias
+
+" Maximize: Vert and Horiz by default
+set fuoptions=maxvert,maxhorz
+
+" Hide toolbar and menus.
+set guioptions-=T
+set guioptions-=m
+
+" Scrollbar is always off.
+set guioptions-=rL
+
+" Console style tab labels
+set guioptions-=e
+
+" Don't flick cursor.
+set guicursor=a:blinkon0
+
+
+if filereadable(expand("~/.vim/custom_gvimrc"))
+ source ~/.vim/custom_gvimrc
+endif
View
5 .vimrc
@@ -1,4 +1,3 @@
-
" ---------------------------------------------------------------------------
" General
" ---------------------------------------------------------------------------
@@ -216,6 +215,10 @@ augroup markdown
autocmd BufRead *.markdown set ai formatoptions=tcroqn2 comments=n:>
augroup END
+augroup god
+ autocmd BufRead *.god set filetype=ruby
+augroup END
+
let g:liquid_highlight_types=["html","erb=eruby","html+erb=eruby.html"]
View
22 autoload/pathogen.vim
@@ -81,12 +81,22 @@ function! pathogen#glob_directories(pattern) abort " {{{1
return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
endfunction "}}}1
-" Prepend all subdirectories of path to the rtp, and append all after
+" Checks if a bundle is 'disabled'. A bundle is considered 'disabled' if
+" its 'basename()' is included in g:pathogen_disabled[]'.
+function! pathogen#is_disabled(path) " {{{1
+ if !exists("g:pathogen_disabled")
+ return 0
+ endif
+ let sep = pathogen#separator()
+ return index(g:pathogen_disabled, strpart(a:path, strridx(a:path, sep)+1)) != -1
+endfunction "}}}1
+
+" Prepend all subdirectories of path to the rtp, and append all 'after'
" directories in those subdirectories.
function! pathogen#runtime_prepend_subdirectories(path) " {{{1
let sep = pathogen#separator()
- let before = pathogen#glob_directories(a:path.sep."*[^~]")
- let after = pathogen#glob_directories(a:path.sep."*[^~]".sep."after")
+ let before = filter(pathogen#glob_directories(a:path.sep."*[^~]"), '!pathogen#is_disabled(v:val)')
+ let after = filter(pathogen#glob_directories(a:path.sep."*[^~]".sep."after"), '!pathogen#is_disabled(v:val)')
let rtp = pathogen#split(&rtp)
let path = expand(a:path)
call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
@@ -108,9 +118,9 @@ function! pathogen#runtime_append_all_bundles(...) " {{{1
let list = []
for dir in pathogen#split(&rtp)
if dir =~# '\<after$'
- let list += pathogen#glob_directories(substitute(dir,'after$',name.sep.'*[^~]'.sep.'after','')) + [dir]
+ let list += filter(pathogen#glob_directories(substitute(dir,'after$',name,'').sep.'*[^~]'.sep.'after'), '!pathogen#is_disabled(v:val)') + [dir]
else
- let list += [dir] + pathogen#glob_directories(dir.sep.name.sep.'*[^~]')
+ let list += [dir] + filter(pathogen#glob_directories(dir.sep.name.sep.'*[^~]'), '!pathogen#is_disabled(v:val)')
endif
endfor
let &rtp = pathogen#join(pathogen#uniq(list))
@@ -123,7 +133,7 @@ let s:done_bundles = ''
" Invoke :helptags on all non-$VIM doc directories in runtimepath.
function! pathogen#helptags() " {{{1
for dir in pathogen#split(&rtp)
- if dir[0 : strlen($VIM)-1] !=# $VIM && isdirectory(dir.'/doc') && (!filereadable(dir.'/doc/tags') || filewritable(dir.'/doc/tags'))
+ if dir[0 : strlen($VIM)-1] !=# $VIM && isdirectory(dir.'/doc') && !empty(glob(dir.'/doc/*')) && (!filereadable(dir.'/doc/tags') || filewritable(dir.'/doc/tags'))
helptags `=dir.'/doc'`
endif
endfor
2  bundle/ack
@@ -1 +1 @@
-Subproject commit 724747b4aee363cf6adbfb3436b8ebe5c9296153
+Subproject commit a41d5d52c39a31128e969e69acf800b198cb07f9
1  bundle/cocoa
@@ -0,0 +1 @@
+Subproject commit ca6f2544c1f4ef9e5fbd8a040c1ed94fbac67351
2  bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 153041ac939502746e5a24468910eb7214a3f593
+Subproject commit 1cd50482d2b0137a3faa3ee6ec4cb9d425bd3bb6
2  bundle/tabular
@@ -1 +1 @@
-Subproject commit f4d460ea92527f242e447aab37e3fd180ceef526
+Subproject commit b7b4d8791a50013b56c2d68b6c5708c808203b54
1  bundle/taskpaper
@@ -0,0 +1 @@
+Subproject commit 3b624e7b83cc22ec7c418498eb7a784b097ac1de
1  bundle/textile
@@ -0,0 +1 @@
+Subproject commit 87407575657188ee6c136876e290f574b2fd5ec7
2  bundle/vim-cucumber
@@ -1 +1 @@
-Subproject commit bbc287f99983e6cdb758ab4a4c901c704ffa312a
+Subproject commit 2ef3e5a4876a4cd5ea83a0dcbf17f5c3edbf9de3
2  bundle/vim-endwise
@@ -1 +1 @@
-Subproject commit 780fa5603c0917d9b22e3b64dd8ab0423e006eb5
+Subproject commit 86e1d4ab9192245ae83831f073c0452f3b7baba8
2  bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 8fcc5cb3496c1782511260062a7d46a79bb4757c
+Subproject commit 44533707686c09972bf845c31544368bdfe0ce4f
2  bundle/vim-git
@@ -1 +1 @@
-Subproject commit bda9f09bda79b6154d6a3e2db06a406b002b5f09
+Subproject commit ca001e529f3d02675d66f9dd8b7253ab4f284ee1
2  bundle/vim-haml
@@ -1 +1 @@
-Subproject commit dfb1f770d5cf959be057b3d2c34d2ef20ecf8119
+Subproject commit de3e72a384c9b1cc8707c9bc37cefc24d8484ebf
2  bundle/vim-javascript
@@ -1 +1 @@
-Subproject commit cf76032a4f981490735a2c8d93d2ab9c7ce16db3
+Subproject commit 6362ba99c825afc046818807267d5c1143b5c887
2  bundle/vim-markdown
@@ -1 +1 @@
-Subproject commit 8d0860c1d5ac0827588ba9d149fced4fbd6d9f69
+Subproject commit 34e28b3f6f6d702ff2963b8196eccae9344ed4bc
2  bundle/vim-ragtag
@@ -1 +1 @@
-Subproject commit 01ddd82695e079d54285a1c57635bd96e02e8c30
+Subproject commit 75a3b16bdfaedd36c0a11287d6a18449feb6bc80
2  bundle/vim-rails
@@ -1 +1 @@
-Subproject commit 73f6fcd27269d3f65dd5f4af41c149362f3ef3fa
+Subproject commit 51c8e2190211420b344455df3213f536a62e7b6b
2  bundle/vim-ruby
@@ -1 +1 @@
-Subproject commit 5ac7efa24bf728bc5bf3a169689ae14af66d0daa
+Subproject commit 07d0b51e96ff3c8878848bc29f3a401c4fabf75b
2  bundle/vim-rubytest
@@ -1 +1 @@
-Subproject commit 3feffe6c1db1adbe30a27ddc1b4cec6f3bb2a500
+Subproject commit 68721a49cbbb2294fa28ae8c069b62fabffb46a4
2  bundle/vim-speeddating
@@ -1 +1 @@
-Subproject commit 799bcdddca4f8b81dcfffc1f327f0e511d11980c
+Subproject commit b0ee6ec2153c5f30827d67db1668f37a975a1005
2  bundle/vim-surround
@@ -1 +1 @@
-Subproject commit ad5690f10eb08688b0772045a4795cf7df461c93
+Subproject commit d9e6bfdd902fc661c8fd58ede248ccfc3b3039d7
View
67 keybindings.gui.vim
@@ -0,0 +1,67 @@
+" OSX: Specific keybindings
+if has("mac")
+
+ " TABS: safari style tab navigation
+ nmap <D-[> :tabprevious<CR>
+ nmap <D-]> :tabnext<CR>
+ map <D-[> :tabprevious<CR>
+ map <D-]> :tabnext<CR>
+ imap <D-[> <C-O>:tabprevious<CR>
+ imap <D-]> <C-O>:tabnext<CR>
+
+ " TABS: Firefox style, open tabs with command-<tab number>
+ map <silent> <D-1> :tabn 1<CR>
+ map <silent> <D-2> :tabn 2<CR>
+ map <silent> <D-3> :tabn 3<CR>
+ map <silent> <D-4> :tabn 4<CR>
+ map <silent> <D-5> :tabn 5<CR>
+ map <silent> <D-6> :tabn 6<CR>
+ map <silent> <D-7> :tabn 7<CR>
+ map <silent> <D-8> :tabn 8<CR>
+ map <silent> <D-9> :tabn 9<CR>
+
+ " TextMateLikeIndent: bind command-] to shift right
+ nmap <D-]> >>
+ vmap <D-]> >>
+ imap <D-]> <C-O>>>
+
+ " TextMateLikeDeindent: bind command-[ to shift left
+ nmap <D-[> <<
+ vmap <D-[> <<
+ imap <D-[> <C-O><<
+
+ " Unmap Apple+T so we can...
+ macmenu &File.New\ Tab key=<nop>
+
+ " Change Apple+T to TextMate Like Fuzzy Finder
+ nnoremap <D-t> :FufCoverageFile<CR>
+
+ " Unmap Apple+Shift+T so we can...
+ macmenu &File.Open\ Tab\.\.\. key=<nop>
+
+ " CommandShiftT: Fuzzy Find by Tag
+ nnoremap <D-T> :FufTag!<CR>
+
+ " Unmap Apple+b so we can...
+ macmenu &Tools.Make key=<nop>
+
+ " Change Apple+b to Emacseque buffer browser
+ map <D-b> :FufBuffer!<CR>
+ imap <D-b> :FufBuffer!<CR>
+
+ " Unmap Apple+S to remap to Esc, then :w<CR>
+ macmenu &File.Save key=<nop>
+ imap <D-s> <Esc>:w<CR>
+ map <D-s> :w<CR>
+
+ " bind command-/ to toggle comment
+ " requires NERD Commenter to be installed: http://www.vim.org/scripts/script.php?script_id=1218
+ nmap <D-/> ,c<Space>
+ vmap <D-/> ,c<Space>
+ imap <D-/> <C-O>,c<Space>
+
+ " LeaveInsertMode: Alternate Key mappings
+ inoremap <D-i> <Esc>
+ nnoremap <D-i> <Esc>
+
+endif
View
2  snippets/cucumber/And.snippet
@@ -1 +1 @@
-And %{<+step+>}
+And <+step+>
View
1  snippets/cucumber/Given.snippet
@@ -1 +0,0 @@
-Given %{<+step+>}
View
1  snippets/cucumber/Then.snippet
@@ -1 +0,0 @@
-Then %{<+step+>}
View
1  snippets/cucumber/When.snippet
@@ -1 +0,0 @@
-When %{<+step+>}
View
4 snippets/cucumber/fea.snippet
@@ -0,0 +1,4 @@
+Feature: <+description+>
+ As a <+role+>
+ In order to <+outcome+>
+ I want <+action+>
View
1  snippets/cucumber/giv.snippet
@@ -0,0 +1 @@
+Given <+step+>
View
4 snippets/cucumber/sce.snippet
@@ -0,0 +1,4 @@
+Scenario: <+description+>
+ Given <+step+>
+ When <+step+>
+ Then <+step+>
View
1  snippets/cucumber/th.snippet
@@ -0,0 +1 @@
+Then <+step+>
View
1  snippets/cucumber/wh.snippet
@@ -0,0 +1 @@
+When <+step+>

No commit comments for this range

Something went wrong with that request. Please try again.