Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of https://github.com/skwp/dotfiles

* 'master' of https://github.com/skwp/dotfiles:
  Readme cleanup
  Removed unused / not working ,,f ,,F aliases
  • Loading branch information...
commit 7e2520ef9c227dd475396cece85f9f1925a6d4b4 2 parents e616d6e + 15f2d9d
@kmees authored
Showing with 9 additions and 48 deletions.
  1. +9 −8 README.md
  2. +0 −40 vim/plugin/settings/smart_jump_to_tag.vim
17 README.md
@@ -50,6 +50,15 @@ cd ~/.yadr && rake install
**Note:** YADR will automatically install all of its subcomponents. If you want to be asked
about each one, use `ASK=true rake install`
+# Additional Installation
+
+ * [Highly recommended: Install iTerm theme](https://github.com/altercation/solarized/tree/master/iterm2-colors-solarized)
+ * [Highly recommended: Remap caps-lock to escape with PCKeyboardHack](http://pqrs.org/macosx/keyremap4macbook/pckeyboardhack.html)
+
+The escape key is the single most used key in vim.
+Old keyboards used to have Ctrl where caps lock is today. But it's even better if you put escape there.
+If you're hitting a small target in the corner, you are slowing yourself down considerably, and probably damaging your hands with repetitive strain injuries.
+
### Upgrading
Upgrading is easy.
@@ -64,14 +73,6 @@ rake update
Read on to learn what YADR provides!
-### Public service announcement: stop abusing your hands!
-
-[Remap caps-lock to escape with PCKeyboardHack](http://pqrs.org/macosx/keyremap4macbook/pckeyboardhack.html)
-
-The escape key is the single most used key in vim.
-Old keyboards used to have Ctrl where caps lock is today. But it's even better if you put escape there.
-If you're hitting a small target in the corner, you are slowing yourself down considerably, and probably damaging your hands with repetitive strain injuries.
-
### [Homebrew](http://mxcl.github.com/homebrew/)
Homebrew is _the missing package manager for OSX_. Installed automatically.
View
40 vim/plugin/settings/smart_jump_to_tag.vim
@@ -1,46 +1,6 @@
-function! JumpToRubyMethod()
- " Grab the current WORD. Which could be something like
- " object.some_method!
- let l:stuff_under_cursor = expand("<cWORD>")
-
- " Figure out if this is a method call (obj.some_method)
- " by looking for the period
- let l:method_invocation = split(matchstr(l:stuff_under_cursor, '\..*'), '\.')
-
- " If there was no method invocation in the current word then
- " we want to avoid the <cWORD> which might be something
- " like foo_bar(baz). We just want the method name, which
- " is already stored for us as <cword> by vim
- if empty(l:method_invocation)
- " See if this is a regular method ending in !
- let l:bang_method = matchstr(l:stuff_under_cursor, '.*!')
-
- if(empty(l:bang_method))
- let l:method_name = expand("<cword>")
- else
- let l:method_name = l:bang_method
- end
- else
- " If there is a method invocation, then figure out
- " the method name, which is the first element in the match
- let l:method_name = l:method_invocation[0]
- endif
-
- try
- execute ':tag ' . l:method_name
- catch
- endtry
-endfunction
-
" hit ,f to find the definition of the current class
" this uses ctags. the standard way to get this is Ctrl-]
nnoremap <silent> ,f <C-]>
-" Jump to tag with awareness of ruby bang! methods
-nnoremap <silent> ,,f :call JumpToRubyMethod()<CR>
-
-" Jump to tag with awareness of ruby bang! methods (in vertical split)
-nnoremap <silent> ,,F :vsp<cr> :wincmd w<cr> :call JumpToRubyMethod()<CR>
-
" use ,F to jump to tag in a vertical split
nnoremap <silent> ,F :let word=expand("<cword>")<CR>:vsp<CR>:wincmd w<cr>:exec("tag ". word)<cr>
Please sign in to comment.
Something went wrong with that request. Please try again.