etc/vim/after/plugin/snipMate.vim etc/vim/autoload/snipMate.vim etc/vim/doc/snipMate.txt etc/vim/ftplugin/html_snip_helper.vim etc/vim/plugin/snipMate.vim etc/vim/snippets/_.snippets etc/vim/snippets/c.snippets etc/vim/snippets/cpp.snippets etc/vim/snippets/eruby.snippets etc/vim/snippets/html.snippets etc/vim/snippets/java.snippets etc/vim/snippets/javascript.snippets etc/vim/snippets/objc.snippets etc/vim/snippets/perl.snippets etc/vim/snippets/php.snippets etc/vim/snippets/python.snippets etc/vim/snippets/rails.snippets etc/vim/snippets/ruby.snippets etc/vim/snippets/sh.snippets etc/vim/snippets/snippet.snippets etc/vim/snippets/tex.snippets etc/vim/snippets/vim.snippets etc/vim/snippetsEmu.vim etc/vim/syntax/snippet.vim @@ -4,8 +4,8 @@ # here: http://www.perforce.com/perforce/downloads/component.html if [ "$5" != "/dev/null" ] && [ "$2" != "/dev/null" ] ; then - echo "$2 -> $5" + echo "$1 -> $5" [ $# -eq 7 ] && p4merge "$2" "$5" else - echo "$2 -> $5 ------- Skipped --------" + echo "$1 -> $5 ------- Skipped --------" fi bin/p4diff @@ -61,6 +61,7 @@ alias gtshowcommands="echo -e '${COLOR_LIGHT_PURPLE}Available commands: ${COLOR_BLUE}gt${COLOR_NC}add${COLOR_BLUE}all${COLOR_NC} ${COLOR_GRAY}Note: adds all files not in repository [recursively] ${COLOR_BLUE}gt${COLOR_NC}show ${COLOR_BLUE}gt${COLOR_NC}diff + ${COLOR_BLUE}gt${COLOR_NC}diff${COLOR_BLUE}staged${COLOR_NC} ${COLOR_BLUE}gt${COLOR_NC}push ${COLOR_BLUE}gt${COLOR_NC}pull ${COLOR_BLUE}gt${COLOR_NC}fetch @@ -78,6 +79,7 @@ alias gtcommitall='gt commit -a -v' alias gtadd='gt add' alias gtaddall='gt add .' alias gtdiff='gt diff' +alias gtdiffstaged='gt diff --cached' alias gtpush='gt push' alias gtfetch='gt fetch' alias gtpull='gt pull' @@ -113,6 +115,7 @@ alias rrgenerate='./script/generate' alias rrconsole='./script/console' alias rrrakelist='rake -T | g ":"' +alias rrrakefind='rake -T | g ' rrtest(){ date etc/bashrc_app_specific @@ -5,6 +5,7 @@ 'NERDTreeCaseSensitiveSort' NERD_tree.txt /*'NERDTreeCaseSensitiveSort'* 'NERDTreeChDirMode' NERD_tree.txt /*'NERDTreeChDirMode'* 'NERDTreeHighlightCursorline' NERD_tree.txt /*'NERDTreeHighlightCursorline'* +'NERDTreeHijackNetrw' NERD_tree.txt /*'NERDTreeHijackNetrw'* 'NERDTreeIgnore' NERD_tree.txt /*'NERDTreeIgnore'* 'NERDTreeMouseMode' NERD_tree.txt /*'NERDTreeMouseMode'* 'NERDTreeQuitOnOpen' NERD_tree.txt /*'NERDTreeQuitOnOpen'* @@ -16,13 +17,21 @@ 'NERDTreeWinPos' NERD_tree.txt /*'NERDTreeWinPos'* 'NERDTreeWinSize' NERD_tree.txt /*'NERDTreeWinSize'* 'loaded_nerd_tree' NERD_tree.txt /*'loaded_nerd_tree'* +'snippets' snipMate.txt /*'snippets'* +.snippet snipMate.txt /*.snippet* +.snippets snipMate.txt /*.snippets* :MatchDebug matchit.txt /*:MatchDebug* :NERDTree NERD_tree.txt /*:NERDTree* +:NERDTreeClose NERD_tree.txt /*:NERDTreeClose* :NERDTreeFromBookmark NERD_tree.txt /*:NERDTreeFromBookmark* +:NERDTreeMirror NERD_tree.txt /*:NERDTreeMirror* :NERDTreeToggle NERD_tree.txt /*:NERDTreeToggle* :Snippet snippets_emu.txt /*:Snippet* CreateBundleSnippet snippets_emu.txt /*CreateBundleSnippet* CreateSnippet snippets_emu.txt /*CreateSnippet* +ExtractSnips() snipMate.txt /*ExtractSnips()* +ExtractSnipsFile() snipMate.txt /*ExtractSnipsFile()* +Filename() snipMate.txt /*Filename()* MatchError matchit.txt /*MatchError* NERDTree NERD_tree.txt /*NERDTree* NERDTree-! NERD_tree.txt /*NERDTree-!* @@ -31,7 +40,7 @@ NERDTree-B NERD_tree.txt /*NERDTree-B* NERDTree-C NERD_tree.txt /*NERDTree-C* NERDTree-D NERD_tree.txt /*NERDTree-D* NERDTree-F NERD_tree.txt /*NERDTree-F* -NERDTree-H NERD_tree.txt /*NERDTree-H* +NERDTree-I NERD_tree.txt /*NERDTree-I* NERDTree-J NERD_tree.txt /*NERDTree-J* NERDTree-K NERD_tree.txt /*NERDTree-K* NERDTree-O NERD_tree.txt /*NERDTree-O* @@ -45,18 +54,18 @@ NERDTree-c-k NERD_tree.txt /*NERDTree-c-k* NERDTree-contents NERD_tree.txt /*NERDTree-contents* NERDTree-e NERD_tree.txt /*NERDTree-e* NERDTree-f NERD_tree.txt /*NERDTree-f* +NERDTree-gi NERD_tree.txt /*NERDTree-gi* NERDTree-go NERD_tree.txt /*NERDTree-go* -NERDTree-gtab NERD_tree.txt /*NERDTree-gtab* +NERDTree-i NERD_tree.txt /*NERDTree-i* NERDTree-m NERD_tree.txt /*NERDTree-m* NERDTree-o NERD_tree.txt /*NERDTree-o* NERDTree-p NERD_tree.txt /*NERDTree-p* NERDTree-q NERD_tree.txt /*NERDTree-q* NERDTree-r NERD_tree.txt /*NERDTree-r* NERDTree-t NERD_tree.txt /*NERDTree-t* -NERDTree-tab NERD_tree.txt /*NERDTree-tab* NERDTree-u NERD_tree.txt /*NERDTree-u* NERDTree-x NERD_tree.txt /*NERDTree-x* -NERDTreeAuthor NERD_tree.txt /*NERDTreeAuthor* +NERDTreeAbout NERD_tree.txt /*NERDTreeAbout* NERDTreeBookmarkCommands NERD_tree.txt /*NERDTreeBookmarkCommands* NERDTreeBookmarkTable NERD_tree.txt /*NERDTreeBookmarkTable* NERDTreeBookmarks NERD_tree.txt /*NERDTreeBookmarks* @@ -65,15 +74,15 @@ NERDTreeCredits NERD_tree.txt /*NERDTreeCredits* NERDTreeFilesysMenu NERD_tree.txt /*NERDTreeFilesysMenu* NERDTreeFunctionality NERD_tree.txt /*NERDTreeFunctionality* NERDTreeGlobalCommands NERD_tree.txt /*NERDTreeGlobalCommands* +NERDTreeHacking NERD_tree.txt /*NERDTreeHacking* NERDTreeInvalidBookmarks NERD_tree.txt /*NERDTreeInvalidBookmarks* NERDTreeLicense NERD_tree.txt /*NERDTreeLicense* NERDTreeMappings NERD_tree.txt /*NERDTreeMappings* NERDTreeOptionDetails NERD_tree.txt /*NERDTreeOptionDetails* NERDTreeOptionSummary NERD_tree.txt /*NERDTreeOptionSummary* NERDTreeOptions NERD_tree.txt /*NERDTreeOptions* -NERDTreePublicFunctions NERD_tree.txt /*NERDTreePublicFunctions* -NERDTreeTodo NERD_tree.txt /*NERDTreeTodo* NERD_tree.txt NERD_tree.txt /*NERD_tree.txt* +ResetSnippets() snipMate.txt /*ResetSnippets()* [% matchit.txt /*[%* ]% matchit.txt /*]%* b:match_col matchit.txt /*b:match_col* @@ -110,6 +119,10 @@ g:rails_statusline rails.txt /*g:rails_statusline* g:rails_syntax rails.txt /*g:rails_syntax* g:rails_tabstop rails.txt /*g:rails_tabstop* g:rails_url rails.txt /*g:rails_url* +g:snippets_dir snipMate.txt /*g:snippets_dir* +g:snips_author snipMate.txt /*g:snips_author* +i_CTRL-R_<Tab> snipMate.txt /*i_CTRL-R_<Tab>* +list-snippets snipMate.txt /*list-snippets* macros/rails.vim rails.txt /*macros\/rails.vim* matchit matchit.txt /*matchit* matchit-% matchit.txt /*matchit-%* @@ -136,6 +149,7 @@ matchit-troubleshoot matchit.txt /*matchit-troubleshoot* matchit-v_% matchit.txt /*matchit-v_%* matchit.txt matchit.txt /*matchit.txt* matchit.vim matchit.txt /*matchit.vim* +multi_snip snipMate.txt /*multi_snip* named-tags snippets_emu.txt /*named-tags* o_[% matchit.txt /*o_[%* o_]% matchit.txt /*o_]%* @@ -297,7 +311,28 @@ snip-snippet-commands snippets_emu.txt /*snip-snippet-commands* snip-special-vars snippets_emu.txt /*snip-special-vars* snip-start-end-tags snippets_emu.txt /*snip-start-end-tags* snip-tag-name-syntax snippets_emu.txt /*snip-tag-name-syntax* +snipMate snipMate.txt /*snipMate* +snipMate-$# snipMate.txt /*snipMate-$#* +snipMate-${#:} snipMate.txt /*snipMate-${#:}* +snipMate-${#} snipMate.txt /*snipMate-${#}* +snipMate-author snipMate.txt /*snipMate-author* +snipMate-commands snipMate.txt /*snipMate-commands* +snipMate-contact snipMate.txt /*snipMate-contact* +snipMate-description snipMate.txt /*snipMate-description* +snipMate-disadvantages snipMate.txt /*snipMate-disadvantages* +snipMate-expandtab snipMate.txt /*snipMate-expandtab* +snipMate-features snipMate.txt /*snipMate-features* +snipMate-filename snipMate.txt /*snipMate-filename* +snipMate-indenting snipMate.txt /*snipMate-indenting* +snipMate-placeholders snipMate.txt /*snipMate-placeholders* +snipMate-remap snipMate.txt /*snipMate-remap* +snipMate-settings snipMate.txt /*snipMate-settings* +snipMate-usage snipMate.txt /*snipMate-usage* +snipMate.txt snipMate.txt /*snipMate.txt* +snippet snipMate.txt /*snippet* snippet-commands snippets_emu.txt /*snippet-commands* +snippet-syntax snipMate.txt /*snippet-syntax* +snippets snipMate.txt /*snippets* snippets_emu-bugs snippets_emu.txt /*snippets_emu-bugs* snippets_emu-features snippets_emu.txt /*snippets_emu-features* snippets_emu-options snippets_emu.txt /*snippets_emu-options* etc/vim/doc/tags @@ -10,6 +10,7 @@ if has("gui_macvim") set fuoptions=maxvert,maxhorz " fullscreen options (MacVim only), resized window when changed to fullscreen set guifont=Monaco:h13 set guioptions-=T " remove toolbar + set stal=2 " turn on tabs by default elseif has("gui_gtk2") etc/vim/gvimrc @@ -1,6 +1,27 @@ " ----------------------------------------------------------------------------- " | VIM Settings | " | (see gvimrc for gui vim settings) | +" | | +" | Some highlights: | +" | jj = <esc> Very useful for keeping your hands on the home row | +" | ,n = toggle NERDTree off and on | +" | | +" | ,f = fuzzy find all files | +" | ,b = fuzzy find in all buffers | +" | | +" | hh = inserts '=>' | +" | aa = inserts '@' | +" | | +" | ,h = new horizontal window | +" | ,v = new vertical window | +" | | +" | ,f = fuzzy find all files | +" | ,b = fuzzy find all buffers | +" | | +" | enter and shift-enter = adds a new line after and before the current line | +" | | +" | :call Tabstyle_tabs = set tab to real tabs | +" | :call Tabstyle_spaces = set tab to 2 spaces | " ----------------------------------------------------------------------------- set nocompatible etc/vim/vimrc 4bd337bd417c95cd347d4859d008f105c48178b8 Todd Werth twerth@infinitered.com http://github.com/twerth/dotfiles/commit/2fb8c25d7e039a50c95c3c609be8c06f06fb37d7 2fb8c25d7e039a50c95c3c609be8c06f06fb37d7 2009-05-28T23:28:00-07:00 2009-05-28T23:28:00-07:00 Misc changes. Replaced snippetsEmu with snipMate (and started to modify it). Add some vimrc documentation. Turned on tabs in MacVim by default. Added some new svn and git commands 24f0234f2974e2ae04fe6d6375e4541f67a6864c Todd Werth twerth@infinitered.com