Permalink
Browse files

Merge commit 'ce05cc1866cd82573ebf196b8b7fef1be6b4fe86'

# By Yan Pritzker (79) and others
# Via Yan Pritzker
* commit 'ce05cc1866cd82573ebf196b8b7fef1be6b4fe86': (124 commits)
  Ensure EDITOR/VISUAL vars set to vim [Fix #217]
  Better colors, readme update
  Remove SearchComplete plugin - too much grief
  Improve colors in normal vi [Fix #216]
  cl! abbreviation for logging, and ;; for closing javascript lines
  Undo zm mapping which conflicts with folding. Jump to method now Cmd-Shift-M
  Remapped ,m to zm due to conflict with ShowMarks
  Fix 'ga *foo*' by not globbing git
  Improved vim colors
  Fix skwp and kylewest themes - ensure git-info is on [Fix #213]
  Font improvement: Inconsolata XL
  Bundles for better javascript highlighting and tag highlighting
  Bring back keybindings to enable vim mode and ctrl-R [Fix #212]
  Rdebugrc [Fix #189]
  Upgraded vim plugins
  Sprintly alias
  Prevent neocomplcache hanging in python [Fix #163]
  Added `vim/spell` to gitignore.
  Added tmux support [Fix #190]
  Fix pointer to PCKeyboardHack [Fix #200]
  ...
  • Loading branch information...
2 parents 942b5f2 + ce05cc1 commit b6fd696df857bfb8b9df7973d9dc01cf9c00e2aa Wolfgang Profer committed Nov 26, 2012
Showing with 7,643 additions and 914 deletions.
  1. +2 −0 .gitignore
  2. +53 −11 .gitmodules
  3. +22 −0 README-pry.md
  4. +98 −153 README.md
  5. +141 −54 Rakefile
  6. +255 −226 bin/fasd
  7. +3,738 −0 bin/ghi
  8. +305 −0 bin/marky.rb
  9. +13 −0 bin/rebuild_mail_index.sh
  10. +1 −1 bin/yadr/default_libs.rb
  11. +0 −10 bin/yadr/yadr
  12. +12 −0 bin/yadr/yadr-update-plugins
  13. +0 −12 bin/yadr/yadr-vim-update-plugins
  14. +1 −20 chrome/Custom.css
  15. +26 −0 ctags/ctags
  16. +0 −20 custom/zsh.sample/after/after.sample.zsh
  17. +0 −16 custom/zsh.sample/before/before.sample.zsh
  18. BIN fonts/Inconsolata XL Bold.otf
  19. BIN fonts/Inconsolata XL.otf
  20. +0 −7 oh-my-zsh/README
  21. +0 −92 oh-my-zsh/modules/prompt/functions/prompt_skwp_setup
  22. BIN oh-my-zsh/themes/kylewest.png
  23. +0 −30 oh-my-zsh/themes/kylewest.zsh-theme
  24. +0 −24 oh-my-zsh/themes/skwp.zsh-theme
  25. +4 −0 ruby/rdebugrc
  26. +73 −0 tmux/tmux.conf
  27. +4 −1 vim/after/plugin/vimrc_after.vim
  28. +1 −1 vim/bundle/AndrewRadev-splitjoin
  29. +1 −1 vim/bundle/MarcWeber-vim-addon-mw-utils
  30. +1 −1 vim/bundle/Shougo-neocomplcache
  31. +0 −1 vim/bundle/VimEz-ShowMarks
  32. +1 −0 vim/bundle/bbommarito-vim-slim
  33. +1 −0 vim/bundle/briancollins-vim-jst
  34. +1 −1 vim/bundle/briandoll-change-inside-surroundings
  35. +9 −0 vim/bundle/chrisbra-NrrwRgn/.gitignore
  36. +45 −0 vim/bundle/chrisbra-NrrwRgn/Makefile
  37. +523 −0 vim/bundle/chrisbra-NrrwRgn/README
  38. +1,170 −0 vim/bundle/chrisbra-NrrwRgn/autoload/nrrwrgn.vim
  39. +523 −0 vim/bundle/chrisbra-NrrwRgn/doc/NarrowRegion.txt
  40. +68 −0 vim/bundle/chrisbra-NrrwRgn/plugin/NrrwRgn.vim
  41. +13 −0 vim/bundle/chrisbra-NrrwRgn/todo.txt
  42. +1 −1 vim/bundle/chrisbra-color_highlight
  43. +1 −1 vim/bundle/claco-jasmine
  44. +1 −0 vim/bundle/digitaltoad-vim-jade
  45. +1 −1 vim/bundle/garbas-vim-snipmate
  46. +1 −1 vim/bundle/godlygeek-csapprox
  47. +1 −1 vim/bundle/godlygeek-tabular
  48. +1 −1 vim/bundle/gregsexton-gitv
  49. +1 −1 vim/bundle/groenewege-vim-less
  50. +1 −1 vim/bundle/honza-snipmate-snippets
  51. +1 −0 vim/bundle/itspriddle-vim-jquery
  52. +1 −1 vim/bundle/jistr-vim-nerdtree-tabs
  53. +1 −0 vim/bundle/jtratner-vim-flavored-markdown
  54. +1 −1 vim/bundle/kchmck-vim-coffee-script
  55. +1 −1 vim/bundle/kien-ctrlp
  56. +1 −1 vim/bundle/majutsushi-tagbar
  57. +1 −1 vim/bundle/mattn-gist-vim
  58. +1 −1 vim/bundle/mattn-webapi-vim
  59. +1 −1 vim/bundle/mattn-zencoding-vim
  60. +1 −1 vim/bundle/mileszs-ack
  61. +1 −1 vim/bundle/nathanaelkane-vim-indent-guides
  62. +1 −0 vim/bundle/pangloss-vim-javascript
  63. +1 −1 vim/bundle/raimondi-delimitMate
  64. +1 −1 vim/bundle/scrooloose-nerdtree
  65. +1 −1 vim/bundle/scrooloose-syntastic
  66. +1 −1 vim/bundle/sjbach-lusty
  67. +1 −0 vim/bundle/skwp-YankRing
  68. +1 −1 vim/bundle/skwp-vim-html-escape
  69. +1 −1 vim/bundle/skwp-vim-ruby-conque
  70. +1 −1 vim/bundle/timcharper-textile
  71. +1 −1 vim/bundle/tomtom-tcomment_vim
  72. +1 −1 vim/bundle/tomtom-tlib_vim
  73. +1 −0 vim/bundle/tpope-vim-abolish
  74. +1 −1 vim/bundle/tpope-vim-bundler
  75. +1 −1 vim/bundle/tpope-vim-endwise
  76. +1 −1 vim/bundle/tpope-vim-fugitive
  77. +1 −1 vim/bundle/tpope-vim-git
  78. +1 −1 vim/bundle/tpope-vim-haml
  79. +1 −1 vim/bundle/tpope-vim-pathogen
  80. +1 −0 vim/bundle/tpope-vim-ragtag
  81. +1 −1 vim/bundle/tpope-vim-rails
  82. +1 −1 vim/bundle/tpope-vim-rake
  83. +1 −1 vim/bundle/tpope-vim-repeat
  84. +1 −1 vim/bundle/tpope-vim-surround
  85. +1 −1 vim/bundle/tpope-vim-unimpaired
  86. +1 −1 vim/bundle/vim-ruby-vim-ruby
  87. +1 −0 vim/bundle/vim-scripts-TagHighlight
  88. +1 −1 vim/bundle/vim-scripts-Vim-R-plugin
  89. +0 −1 vim/bundle/vim-scripts-YankRing
  90. +1 −1 vim/bundle/vim-scripts-ZoomWin
  91. +1 −0 vim/bundle/xsunsmile-showmarks
  92. +1 −1 vim/plugin/settings/abbr.vim
  93. +4 −5 vim/plugin/settings/ctrlp.vim
  94. +6 −0 vim/plugin/settings/gh-markdown.vim
  95. +7 −0 vim/plugin/settings/gotofile.vim
  96. +1 −0 vim/plugin/settings/jquery.vim
  97. +3 −0 vim/plugin/settings/neocomplcache.vim
  98. +13 −0 vim/plugin/settings/outerblock.vim
  99. +2 −0 vim/plugin/settings/powerline.vim
  100. +1 −1 vim/plugin/settings/rspec.vim
  101. +46 −0 vim/plugin/settings/smart_jump_to_tag.vim
  102. +42 −0 vim/plugin/settings/solarized.vim
  103. +9 −0 vim/plugin/settings/stop-visual-paste-insanity.vim
  104. +1 −1 vim/plugin/settings/yadr-appearance.vim
  105. +11 −13 vim/plugin/settings/yadr-keymap.vim
  106. +1 −0 vim/plugin/settings/yankring.vim
  107. +0 −4 vimrc
  108. +7 −0 zsh/0000_before.zsh
  109. +1 −1 zsh/0_path.zsh
  110. +30 −7 zsh/aliases.zsh
  111. +0 −10 zsh/color-man-pages.zsh
  112. +1 −0 zsh/colors.zsh
  113. +3 −0 zsh/custom_prompt_path.zsh
  114. +14 −13 zsh/fasd.zsh
  115. +0 −6 zsh/git.zsh
  116. +0 −1 zsh/highlighting.zsh
  117. +0 −24 zsh/key-bindings.zsh
  118. +4 −0 zsh/noglob.zsh
  119. +0 −35 zsh/omz-sorin/omz-sorin.zsh
  120. +1 −0 zsh/prezto
  121. +134 −0 zsh/prezto-override/zpreztorc
  122. +57 −0 zsh/prezto-themes/prompt_kylewest_setup
  123. +74 −0 zsh/prezto-themes/prompt_skwp_setup
  124. +2 −0 zsh/rm.zsh
  125. +0 −17 zsh/rvm.zsh
  126. +3 −0 zsh/secrets.zsh
  127. +1 −0 zsh/theme.zsh
  128. +3 −0 zsh/vi-mode.zsh
  129. 0 zsh/{zvm.zsh → zmv.zsh}
  130. +0 −1 zsh/zsh-syntax-highlighting
  131. +0 −51 zsh/zshrc
  132. +6 −0 zsh/zzzz_after.zsh
View
@@ -5,6 +5,8 @@ vim/view
*un~
vim/.netrwhist
vim/tmp
+vim/spell
+vim/after/.vimrc.after
.netrwhist
bin/subl
tags
View
@@ -234,10 +234,6 @@
path = vim/bundle/joestelmach-javaScriptLint
url = https://github.com/joestelmach/javaScriptLint.vim
ignore = dirty
-[submodule "vim/bundle/VimEz-ShowMarks"]
- path = vim/bundle/VimEz-ShowMarks
- url = https://github.com/VimEz/ShowMarks.git
- ignore = dirty
[submodule "vim/bundle/kana-vim-arpeggio"]
path = vim/bundle/kana-vim-arpeggio
url = https://github.com/kana/vim-arpeggio
@@ -286,10 +282,6 @@
path = vim/bundle/vim-scripts-Specky
url = https://github.com/vim-scripts/Specky.git
ignore = dirty
-[submodule "zsh/zsh-syntax-highlighting"]
- path = zsh/zsh-syntax-highlighting
- url = https://github.com/zsh-users/zsh-syntax-highlighting.git
- ignore = dirty
[submodule "vim/bundle/tpope-vim-bundler"]
path = vim/bundle/tpope-vim-bundler
url = https://github.com/tpope/vim-bundler
@@ -322,7 +314,57 @@
path = vim/bundle/skwp-vim-powerline
url = https://github.com/skwp/vim-powerline.git
ignore = dirty
-[submodule "vim/bundle/vim-scripts-YankRing"]
- path = vim/bundle/vim-scripts-YankRing
- url = https://github.com/vim-scripts/YankRing.vim
+[submodule "vim/bundle/briancollins-vim-jst"]
+ path = vim/bundle/briancollins-vim-jst
+ url = https://github.com/briancollins/vim-jst
+ ignore = dirty
+[submodule "vim/bundle/pangloss-vim-javascript"]
+ path = vim/bundle/pangloss-vim-javascript
+ url = https://github.com/pangloss/vim-javascript
+ ignore = dirty
+[submodule "vim/bundle/chrisbra-NrrwRgn"]
+ path = vim/bundle/chrisbra-NrrwRgn
+ url = https://github.com/chrisbra/NrrwRgn
+ ignore = dirty
+[submodule "zsh/prezto"]
+ path = zsh/prezto
+ url = https://github.com/sorin-ionescu/prezto.git
+ ignore = dirty
+[submodule "vim/bundle/skwp-YankRing"]
+ path = vim/bundle/skwp-YankRing
+ url = https://github.com/skwp/YankRing.vim
+ ignore = dirty
+[submodule "vim/bundle/tpope-vim-abolish"]
+ path = vim/bundle/tpope-vim-abolish
+ url = https://github.com/tpope/vim-abolish
+ ignore = dirty
+[submodule "vim/bundle/bbommarito-vim-slim"]
+ path = vim/bundle/bbommarito-vim-slim
+ url = https://github.com/bbommarito/vim-slim.git
+ ignore = dirty
+[submodule "vim/bundle/jtratner-vim-flavored-markdown"]
+ path = vim/bundle/jtratner-vim-flavored-markdown
+ url = https://github.com/jtratner/vim-flavored-markdown.git
+ ignore = dirty
+[submodule "vim/bundle/xsunsmile-showmarks"]
+ path = vim/bundle/xsunsmile-showmarks
+ url = https://github.com/xsunsmile/showmarks.git
+ ignore = dirty
+[submodule "vim/bundle/digitaltoad-vim-jade"]
+ path = vim/bundle/digitaltoad-vim-jade
+ url = git://github.com/digitaltoad/vim-jade.git
+ ignore = dirty
+[submodule "vim/bundle/tpope-vim-ragtag"]
+ path = vim/bundle/tpope-vim-ragtag
+ url = https://github.com/tpope/vim-ragtag
+ ignore = dirty
+[submodule "vim/bundle/vim-scripts-TagHighlight"]
+ path = vim/bundle/vim-scripts-TagHighlight
+ url = https://github.com/vim-scripts/TagHighlight.git
ignore = dirty
+[submodule "vim/bundle/jelera-vim-javascript-syntax"]
+ path = vim/bundle/jelera-vim-javascript-syntax
+ url = https://github.com/jelera/vim-javascript-syntax.git
+[submodule "vim/bundle/itspriddle-vim-jquery"]
+ path = vim/bundle/itspriddle-vim-jquery
+ url = https://github.com/itspriddle/vim-jquery.git
View
@@ -0,0 +1,22 @@
+### Install the gem
+
+```bash
+gem install pry
+gem install pry-nav
+gem install awesome_print
+```
+
+### Use pry
+
+ * as irb: `pry`
+ * as rails console: `script/console --irb=pry`
+ * as a debugger: `require 'pry'; binding.pry` in your code (or just type `pry!<space>` to make vim do it)
+
+### Pry Customizations:
+
+ * `clear` command to clear screen
+ * `sql` command to execute something (within a rails console)
+ * `c` (continue) `n` (next) `s` (step) commands for debugging using pry-nav
+ * all objects displayed in readable format (colorized, sorted hash keys) - via awesome_print
+ * a few color modifications to make it more useable
+ * type `help` to see all the commands
Oops, something went wrong.

0 comments on commit b6fd696

Please sign in to comment.