From 9e198c91f8c33498ae36da756b25a7d43623427b Mon Sep 17 00:00:00 2001 From: "Miles Z. Sterrett" Date: Tue, 30 Apr 2019 19:41:29 -0400 Subject: [PATCH] Add my semi-annual giant dotfiles commit --- gemrc | 3 +- tmux-client-86913.log | 66 ++ tmux.conf | 39 +- vim/.netrwhist | 12 +- .../.vundle/script-names.vim-scripts.org.json | 1 + vim/bundle/ctrlp.vim/readme.md | 3 + vim/bundle/dart-vim-plugin | 1 + vim/bundle/dash.vim | 2 +- vim/bundle/gist-vim | 2 +- vim/bundle/phoenix.vim | 1 + vim/bundle/quickfixsigns_vim/.gitignore | 2 + vim/bundle/quickfixsigns_vim/LICENSE.TXT | 674 ++++++++++++++++++ vim/bundle/quickfixsigns_vim/README | 31 +- vim/bundle/quickfixsigns_vim/_tplugin.vim | 2 - .../autoload/quickfixsigns.vim | 6 +- .../autoload/quickfixsigns/vcsdiff.vim | 256 ++++--- .../autoload/quickfixsigns/vcsmerge.vim | 89 +++ .../quickfixsigns_vim/doc/quickfixsigns.txt | 222 +++--- .../etc/tpl_quickfixsigns.txt | 6 +- .../plugin/quickfixsigns.vim | 267 ++++--- vim/bundle/supertab | 2 +- vim/bundle/syntastic | 2 +- vim/bundle/tabular | 1 + vim/bundle/tcomment_vim | 2 +- vim/bundle/tlib_vim | 2 +- vim/bundle/vim-addon-mw-utils | 2 +- vim/bundle/vim-arduino | 1 + vim/bundle/vim-bundler | 2 +- vim/bundle/vim-coffee-script | 2 +- vim/bundle/vim-cucumber/indent/cucumber.vim | 19 +- vim/bundle/vim-dispatch | 2 +- vim/bundle/vim-elixir | 2 +- vim/bundle/vim-endwise | 2 +- vim/bundle/vim-eunuch | 2 +- vim/bundle/vim-fugitive | 2 +- vim/bundle/vim-haml | 2 +- vim/bundle/vim-heroku | 2 +- vim/bundle/vim-indent-guides | 2 +- vim/bundle/vim-javascript | 2 +- vim/bundle/vim-jsx | 2 +- vim/bundle/vim-markdown | 2 +- vim/bundle/vim-mustache-handlebars | 1 + vim/bundle/vim-projectionist | 1 + vim/bundle/vim-ragtag | 2 +- vim/bundle/vim-rails | 2 +- vim/bundle/vim-rake | 2 +- vim/bundle/vim-rhubarb | 2 +- vim/bundle/vim-rspec | 2 +- vim/bundle/vim-ruby | 2 +- vim/bundle/vim-rubytest | 2 +- vim/bundle/vim-slim/README.md | 55 +- vim/bundle/vim-slim/ftdetect/slim.vim | 2 +- vim/bundle/vim-slim/ftplugin/slim.vim | 25 + vim/bundle/vim-slim/syntax/slim.vim | 7 + vim/bundle/vim-snipmate | 2 +- vim/bundle/vim-snippets | 1 + vim/bundle/vim-surround | 2 +- vim/bundle/vim-tmux-navigator | 2 +- vim/bundle/vim-unimpaired | 2 +- vim/bundle/vim-vroom | 1 + vim/bundle/vimux/README.mkd | 5 +- vim/bundle/vimux/doc/vimux.txt | 31 +- vim/bundle/vimux/plugin/vimux.vim | 43 +- vim/bundle/webapi-vim | 2 +- vimrc | 53 +- zsh/aliases.sh | 3 + zsh/git.sh | 2 +- zshrc | 20 +- 68 files changed, 1548 insertions(+), 468 deletions(-) create mode 100644 tmux-client-86913.log create mode 100644 vim/bundle/.vundle/script-names.vim-scripts.org.json create mode 160000 vim/bundle/dart-vim-plugin create mode 160000 vim/bundle/phoenix.vim create mode 100644 vim/bundle/quickfixsigns_vim/LICENSE.TXT delete mode 100644 vim/bundle/quickfixsigns_vim/_tplugin.vim create mode 100644 vim/bundle/quickfixsigns_vim/autoload/quickfixsigns/vcsmerge.vim create mode 160000 vim/bundle/tabular create mode 160000 vim/bundle/vim-arduino create mode 160000 vim/bundle/vim-mustache-handlebars create mode 160000 vim/bundle/vim-projectionist create mode 100644 vim/bundle/vim-slim/ftplugin/slim.vim create mode 160000 vim/bundle/vim-snippets create mode 160000 vim/bundle/vim-vroom diff --git a/gemrc b/gemrc index fc892c7..fef118e 100644 --- a/gemrc +++ b/gemrc @@ -6,5 +6,4 @@ gem: --no-ri --no-rdoc :update_sources: true :backtrace: false :sources: -- http://rubygems.org -- http://gems.rubyforge.org/ +- https://rubygems.org diff --git a/tmux-client-86913.log b/tmux-client-86913.log new file mode 100644 index 0000000..b8ba9a1 --- /dev/null +++ b/tmux-client-86913.log @@ -0,0 +1,66 @@ +1502375316.515584 client started (86913): socket /private/tmp/tmux-501/default, protocol 8 +1502375316.515652 on Darwin 15.6.0 Darwin Kernel Version 15.6.0: Mon Jan 9 23:07:29 PST 2017; root:xnu-3248.60.11.2.1~1/RELEASE_X86_64; libevent 2.0.22-stable (select) +1502375316.515684 socket is /private/tmp/tmux-501/default +1502375316.515700 trying connect +1502375316.515783 add peer 0x7f8e43000000: 6 (0x0) +1502375316.517022 sending message 100 to peer 0x7f8e43000000 (4 bytes) +1502375316.517036 sending message 101 to peer 0x7f8e43000000 (15 bytes) +1502375316.517041 sending message 102 to peer 0x7f8e43000000 (13 bytes) +1502375316.517044 sending message 108 to peer 0x7f8e43000000 (24 bytes) +1502375316.517051 sending message 104 to peer 0x7f8e43000000 (0 bytes) +1502375316.517054 sending message 107 to peer 0x7f8e43000000 (4 bytes) +1502375316.517058 sending message 105 to peer 0x7f8e43000000 (60 bytes) +1502375316.517061 sending message 105 to peer 0x7f8e43000000 (66 bytes) +1502375316.517064 sending message 105 to peer 0x7f8e43000000 (76 bytes) +1502375316.517068 sending message 105 to peer 0x7f8e43000000 (15 bytes) +1502375316.517071 sending message 105 to peer 0x7f8e43000000 (22 bytes) +1502375316.517074 sending message 105 to peer 0x7f8e43000000 (14 bytes) +1502375316.517077 sending message 105 to peer 0x7f8e43000000 (17 bytes) +1502375316.517081 sending message 105 to peer 0x7f8e43000000 (28 bytes) +1502375316.517084 sending message 105 to peer 0x7f8e43000000 (15 bytes) +1502375316.517087 sending message 105 to peer 0x7f8e43000000 (24 bytes) +1502375316.517090 sending message 105 to peer 0x7f8e43000000 (28 bytes) +1502375316.517094 sending message 105 to peer 0x7f8e43000000 (23 bytes) +1502375316.517097 sending message 105 to peer 0x7f8e43000000 (212 bytes) +1502375316.517100 sending message 105 to peer 0x7f8e43000000 (20 bytes) +1502375316.517103 sending message 105 to peer 0x7f8e43000000 (20 bytes) +1502375316.517107 sending message 105 to peer 0x7f8e43000000 (57 bytes) +1502375316.517110 sending message 105 to peer 0x7f8e43000000 (13 bytes) +1502375316.517113 sending message 105 to peer 0x7f8e43000000 (19 bytes) +1502375316.517116 sending message 105 to peer 0x7f8e43000000 (16 bytes) +1502375316.517119 sending message 105 to peer 0x7f8e43000000 (61 bytes) +1502375316.517123 sending message 105 to peer 0x7f8e43000000 (38 bytes) +1502375316.517126 sending message 105 to peer 0x7f8e43000000 (8 bytes) +1502375316.517129 sending message 105 to peer 0x7f8e43000000 (22 bytes) +1502375316.517132 sending message 105 to peer 0x7f8e43000000 (30 bytes) +1502375316.517136 sending message 105 to peer 0x7f8e43000000 (22 bytes) +1502375316.517141 sending message 105 to peer 0x7f8e43000000 (11 bytes) +1502375316.517144 sending message 105 to peer 0x7f8e43000000 (8 bytes) +1502375316.517147 sending message 105 to peer 0x7f8e43000000 (21 bytes) +1502375316.517151 sending message 105 to peer 0x7f8e43000000 (32 bytes) +1502375316.517154 sending message 105 to peer 0x7f8e43000000 (11 bytes) +1502375316.517157 sending message 105 to peer 0x7f8e43000000 (30 bytes) +1502375316.517160 sending message 105 to peer 0x7f8e43000000 (43 bytes) +1502375316.517163 sending message 105 to peer 0x7f8e43000000 (16 bytes) +1502375316.517167 sending message 105 to peer 0x7f8e43000000 (28 bytes) +1502375316.517170 sending message 105 to peer 0x7f8e43000000 (46 bytes) +1502375316.517173 sending message 105 to peer 0x7f8e43000000 (42 bytes) +1502375316.517176 sending message 105 to peer 0x7f8e43000000 (325 bytes) +1502375316.517179 sending message 105 to peer 0x7f8e43000000 (61 bytes) +1502375316.517183 sending message 105 to peer 0x7f8e43000000 (55 bytes) +1502375316.517186 sending message 105 to peer 0x7f8e43000000 (25 bytes) +1502375316.517189 sending message 105 to peer 0x7f8e43000000 (18 bytes) +1502375316.517192 sending message 105 to peer 0x7f8e43000000 (30 bytes) +1502375316.517195 sending message 105 to peer 0x7f8e43000000 (18 bytes) +1502375316.517198 sending message 105 to peer 0x7f8e43000000 (22 bytes) +1502375316.517202 sending message 105 to peer 0x7f8e43000000 (17 bytes) +1502375316.517205 sending message 105 to peer 0x7f8e43000000 (15 bytes) +1502375316.517227 sending message 106 to peer 0x7f8e43000000 (0 bytes) +1502375316.517234 sending message 200 to peer 0x7f8e43000000 (4 bytes) +1502375316.517237 client loop enter +1502375316.525834 peer 0x7f8e43000000 message 207 +1502375316.525858 sending message 208 to peer 0x7f8e43000000 (0 bytes) +1502375350.329376 peer 0x7f8e43000000 message 203 +1502375350.329396 sending message 205 to peer 0x7f8e43000000 (0 bytes) +1502375350.330025 peer 0x7f8e43000000 message 204 +1502375350.330042 client loop exit diff --git a/tmux.conf b/tmux.conf index 33287ec..bde4967 100644 --- a/tmux.conf +++ b/tmux.conf @@ -4,9 +4,7 @@ set-option -g prefix C-space set -g default-terminal "screen-256color" -setw -g mode-mouse on -set -g mouse-select-pane on -setw -g mode-mouse on +set-option -g mouse on set -g base-index 1 setw -g automatic-rename off @@ -29,30 +27,34 @@ set -g message-fg colour16 set -g message-bg colour221 set -g message-attr bold -set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour238,nobold]⮀#[fg=colour245,bg=colour238,bold] #(whoami) #[fg=colour238,bg=colour234,nobold]⮀' +set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour238,nobold] ⮀#[fg=colour245,bg=colour238,bold] #(whoami) #[fg=colour238,bg=colour234,nobold] ⮀' set -g window-status-format "#[fg=white,bg=colour234] #I #W " -set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=colour25,bg=colour39,noreverse,bold] #I ⮁ #W #[fg=colour39,bg=colour234,nobold]⮀" +set -g window-status-current-format "#[fg=colour234,bg=colour39] ⮀#[fg=colour25,bg=colour39,noreverse,bold] #I ⮁ #W #[fg=colour39,bg=colour234,nobold] ⮀" set -g status-right "#(date)" # Refresh from the config file bind r source-file ~/.tmux.conf # smart pane switching with awareness of vim splits -bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-h) || tmux select-pane -L" -bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-j) || tmux select-pane -D" -bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-k) || tmux select-pane -U" -bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-l) || tmux select-pane -R" -bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys 'C-\\') || tmux select-pane -l" - +is_vim="ps -o state= -o comm= -t '#{pane_tty}' \ + | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'" +bind-key -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L" +bind-key -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D" +bind-key -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U" +bind-key -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R" +bind-key -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l" +bind-key -T copy-mode-vi C-h select-pane -L +bind-key -T copy-mode-vi C-j select-pane -D +bind-key -T copy-mode-vi C-k select-pane -U +bind-key -T copy-mode-vi C-l select-pane -R +bind-key -T copy-mode-vi C-\ select-pane -l # copy and paste -bind [ copy-mode -bind -t vi-copy v begin-selection -bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy" -unbind -t vi-copy Enter -bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy" -bind -t vi-copy V rectangle-toggle -bind ] paste-buffer +bind-key -T copy-mode-vi v send -X begin-selection +bind-key -T copy-mode-vi y send -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy" +unbind -T copy-mode-vi Enter +bind-key -T copy-mode-vi Enter send -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy" +bind ] run "reattach-to-user-namespace pbpaste | tmux load-buffer - && tmux paste-buffer" # split more intutively with - (horizontal) and | (vertical) unbind-key % @@ -64,5 +66,6 @@ bind-key - split-window -v unbind Q bind-key Q confirm-before kill-session +set -g default-shell $SHELL # Need copy/paste to work set-option -g default-command "reattach-to-user-namespace -l zsh" diff --git a/vim/.netrwhist b/vim/.netrwhist index 1c45f59..9142552 100644 --- a/vim/.netrwhist +++ b/vim/.netrwhist @@ -1,9 +1,5 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =7 -let g:netrw_dirhist_1='/Users/mileszs/.gem/ruby/2.2.3/gems' -let g:netrw_dirhist_2='/Users/mileszs/.gem/ruby/2.2.3/gems/factory_girl-4.5.0' -let g:netrw_dirhist_3='/Users/mileszs/.gem/ruby/2.2.3/gems/factory_girl-4.5.0/lib' -let g:netrw_dirhist_4='/Users/mileszs/.gem/ruby/2.2.3/gems/factory_girl-4.5.0/lib/factory_girl' -let g:netrw_dirhist_5='/Users/mileszs/code/springbuk/springbuk/app/assets/stylesheets/application' -let g:netrw_dirhist_6='/Users/mileszs/code/springbuk' -let g:netrw_dirhist_7='/Users/mileszs/code/amedco/amedco-workshop-evaluator/app/assets/javascripts' +let g:netrw_dirhist_cnt =3 +let g:netrw_dirhist_1='/Users/mileszs/code/olio/episode360-api/app/services' +let g:netrw_dirhist_2='/Users/mileszs/code/olio/episode360-api/app/services/notify' +let g:netrw_dirhist_3='/Users/mileszs/code/olio/api/.circleci' diff --git a/vim/bundle/.vundle/script-names.vim-scripts.org.json b/vim/bundle/.vundle/script-names.vim-scripts.org.json new file mode 100644 index 0000000..c5a91ce --- /dev/null +++ b/vim/bundle/.vundle/script-names.vim-scripts.org.json @@ -0,0 +1 @@ +["test.vim","test.zip","test_syntax.vim","ToggleCommentify.vim","DoxyGen-Syntax","keepcase.vim","ifdef-highlighting","vimbuddy.vim","buffoptions.vim","fortune.vim","drawing.vim","ctags.vim","closetag.vim","htmlcmd.vim","ccase.vim","compiler.tar.gz","ls.vim","calendar.vim","dl.vim","jcommenter.vim","info.vim","hunspchk.zip","EnhCommentify.vim","LoadHeaderFile.vim","mailbrowser.vim","vimmailr.zip","format.vim","vimxmms.tar.gz","sourceSafe.zip","python.vim","a.vim","vimrc.tcl","oravim.txt","javabean.vim","jbean.vim","vimvccmd.zip","dbhelper.tgz","matchit.zip","DrawIt","rcs-menu.vim","bufexplorer.zip","sccs-menu.vim","completeWord.py","Mail_Sig.set","Mail_mutt_alias.set","Mail_Re.set","Triggers.vim","Mail_cc.set","lh-brackets","cscope_macros.vim","calendar.vim","colorize.vim","ConvertBase.vim","TagsMenu.zip","perl.vim","oberon.vim","cvsmenu.vim","dtags","delphi.vim","Embperl_Syntax.zip","whatdomain.vim","emacs.vim","po.vim","CD.vim","_vim_wok_visualcpp01.zip","nqc.vim","vfp.vim","project.tar.gz","pt.vim.gz","dctl.vim.gz","foo.vim","word_complete.vim","aux2tags.vim","javaimp.vim","uri-ref","incfiles.vim","functags.vim","wordlist.vim","files2menu.pm","translate.vim","AppendComment.vim","let-modeline.vim","gdbvim.tar.gz","Mkcolorscheme.vim","brief.vim","plkeyb.vim","vimtips.zip","savevers.vim","vcscommand.vim","nsis.vim","borland.vim","tex.vim","express.vim","winmanager","methods.vim","sqlplus.vim","spec.vim","mail.tgz","TagsBase.zip","nlist.vim","DirDiff.vim","regview.vim","BlockHL","desert.vim","colorscheme_template.vim","SelectBuf","bufNwinUtils.vim","lightWeightArray.vim","golden.vim","torte.vim","borland.vim","idutils","MultiPrompt.vim","blue.vim","csharp.vim","cs.vim","Shell.vim","vim.vim","Decho","asu1dark.vim","Astronaut","sum.vim","quickhigh.tgz","selbuff.vim","ctx-1.15.vim","runscript.vim","random_vim_tip.tar.gz","PushPop.vim","usr2latex.pl","spellcheck.vim","PopupBuffer.vim","TableTab.vim","djgpp.vim","vim-spell.tar.gz","ada.vim","ada.vim","which.vim","VirMark.vim","oracle.vim","sql.vim","words_tools.vim","chcmdmod.vim","increment.vim","CmdlineCompl.vim","SearchCompl.vim","perl_io.vim","darkslategray.vim","undoins.vim","cisco-syntax.tar.gz","ShowMarks","EasyHtml.vim","ctags.vim","ant_menu.vim","increment.vim","autoload_cscope.vim","foldutil.vim","minibufexpl.vim","gtkvim.tgz","FavMenu.vim","auctex.vim","ruby-macros.vim","html-macros.vim","vimsh.tar.gz","libList.vim","perforce.vim","idevim.tgz","email.vim","mcant.vim","multvals.vim","TeTrIs.vim","boxdraw","tf.vim","CreateMenuPath.vim","Lineup--A-simple-text-aligner","Justify","A-better-tcl-indent","ViMail","remcmd.vim","prt_mgr.zip","SuperTab","treeexplorer","vtreeexplorer","bk-menu.vim","glib.vim","win-manager-Improved","ruby-menu.vim","renumber.vim","navajo.vim","wcd.vim","RExplorer","fortune.vim","MRU","Engspchk","vcal.vim","genutils","template-file-loader","charset.vim","ComplMenu.vim","bcbuf.vim","quickfonts.vim","DSP-Make","vimconfig","morse.vim","LaTeX-Help","MRU-Menu","ctx","Perldoc.vim","fine_blue.vim","sokoban.vim","linuxmag.vim","c.vim","lh-vim-lib","tagmenu.vim","xmms-play-and-enqueue","cmvc.vim","tex.vim","bccalc.vim","mkview.vim","VIlisp.vim","mu-template","xl_tiv.vim","night.vim","einstimer.vim","closeb","Brown","Expand-Template","search-in-runtime","Brace-Complete-for-CCpp","Smart-Tabs","spell.vim","print_bw.zip","std_c.zip","Naught-n-crosses","SourceSafe-Integration","Michaels-Standard-Settings","Hex-Output","Visual-Mapping-Maker","perforce","xul.vim","cream-capitalization","mu-marks","imaps.vim","JavaRun","Buffer-Menus","cream-ascii","vimRubyX","update_vim","bnf.vim","lid.vim","UserMenu.vim","midnight.vim","tmpl.vim","ihtml.vim","pascii","XSLT-syntax","htmlmap","lastchange.vim","manxome-foes-colorscheme","vimdoc","doc.vim","csc.vim","aspnet.vim","brief.vim","java.vim","Nsis-color","byteme.vim","scite-colors","Cool-colors","navajo-night","multi.vim","taglist.vim","User-Defined-Type-Highlighter","camo.vim","adrian.vim","PrintWithLNum","sybase.vim","Projmgr","netdict","ExecPerl","candy.vim","txt2pdf.vim","unilatex.vim","potts.vim","sessmgr","outlineMode.vim","aqua","serverlist.vim","ruby-matchit","autodate.vim","xian.vim","utl.vim","Align","bluegreen","showbrace","latextags","vimfortune","TabIndent","Vimacs","xmledit","AnsiEsc.vim","ftpluginruby.vim","pyimp.vim","sql_iabbr.vim","gnome-doc.vim","xemacs-colorscheme","fog-colorscheme","CSV-delimited-field-jumper","cream-sort","grep.vim","ipsec_conf.vim","EDIFACT-position-in-a-segment","tomatosoup.vim","xchat-log-syntax","broadcast.vim","vera.vim","f.vim","highlightline.vim","hungarian_to_english","Buffer-Search","srecord.vim","reformat.vim","multivim","JavaImp.vim","PHPcollection","JHTML-syntax-file","Nightshimmer","cfengine-syntax-file","code2html","prt_hdr","cream-progressbar","QuickAscii","bw.vim","lh-cpp","vtags","vtags_def","ASP-maps","tforge.vim","pf.vim","sand","fstab-syntax","MqlMenu.vim","lcscheck.vim","php.vim","textlink.vim","White-Dust","ruby.vim","Highlight-UnMatched-Brackets","localColorSchemes.vim","multipleRanges.vim","getVar.vim","variableSort.vim","vimrc_nopik","dbext.vim","openroad.vim","java_apidoc.vim","ABAP.vim","rcsdiff.vim","snippet.vim","opsplorer","cream-showinvisibles","bash-support.vim","ldraw.vim","DirDo.vim","oceandeep","atomcoder-vim","Expmod","timstamp.vim","Red-Black","ftpluginruby.vim","indentruby.vim","Denim","mof.vim","vim-game-of-life","ia64.vim","d.vim","PreviewTag.vim","ShowLine.vim","ShowBlockName.vim","SyntaxAttr.vim","DarkOcean.vim","ibmedit.vim","python_match.vim","rnc.vim","LbdbQuery.vim","scratch-utility","plp.vim","LaTeX-functions","ocean.vim","spectre.vim","bugfixes-to-vim-indent-for-verilog","gri.vim","scilab.vim","ShowFunc.vim","maxima.vim","ironman.vim","sean.vim","regRedir.vim","colormenu.vim","eruby.vim","getmail.vim","colour_flip.pl","blackdust.vim","CVSAnnotate.vim","beanshell.vim","svn.vim","muf.vim","tex.vim","cvopsefsa.vim","ActionScript","plsql.vim","Zenburn","Kent-Vim-Extensions","plsql.vim","Registryedit-win32","syslog-syntax-file","MySQL-script-runner","elinks.vim","eukleides.vim","jcl.vim","midnight2.vim","smlisp.vim","lustre","lustre-syntax","VimFootnotes","biogoo.vim","Get-Win32-Short-Name","Get-UNC-Path-Win32","pythonhelper","javaGetSet.vim","copycppdectoimp.vim","cppgetset.vim","titlecase.vim","stata.vim","localvimrc","lilac.vim","spacehi.vim","deldiff.vim","Syntax-for-the-BETA-programming-language","JavaDecompiler.vim","exim.vim","java_checkstyle.vim","gmt.vim","xhtml.vim","EasyAccents","draw.vim","HTML.zip","sql.vim","php_abb","xgen.vim","noweb.vim","PCP-header","vim-templates","rrd.vim","TTCoach","nw.vim","rainbow.zip","VB-Line-Number","vimspell","perl_h2xs","emodeline","VEC","fnaqevan","HTML-Photo-Board","cream-vimabbrev","mup.vim","BlockComment.vim","SearchComplete","LaTeX-Suite-aka-Vim-LaTeX","Transparent","python.vim","aj.vim","MultipleSearch","toothpik.vim","cscomment.vim","cuecat.vim","tagexplorer.vim","ddldbl.vim","markjump.vim","SAPDB_Pascal.vim","Posting","cream-keytest","ManPageView","java_getset.vim","debug.vim","SQLUtilities","Cpp-code-template-generator","ri-browser","sql.vim","poser.vim","waimea.vim","sql.vim","SpellChecker","foldlist","OO-code-completion","transvim.vim","Macromedia-Director-Lingo-Syntax","oz.vim","python_box.vim","greputil.vim","mercury.vim","ZoomWin","mailsig","Varrays","casejump.vim","Printer-Dialog","Indent-Finder","mrswin.vim","python_fold","sr.vim","TVO--The-Vim-Outliner","csv-color","CVS-conflict-highlight","PHPDoc-Script-PDocS","mru.vim","tar.vim","VimITunes.vim","Visual-Studio-.NET-compiler-file","cscope-menu","pdbvim","cppcomplete","mh","blockquote.vim","Mixed-sourceassembly-syntax-objdump","elvis-c-highlighting","colorer-color-scheme","ntservices","PHP-dictionary","tiger.vim","tiger.vim","tab-syntax","cream-email-munge","FavEx","apdl.vim","velocity.vim","russian-menu-translation","nuweb.vim","flyaccent.vim","ebnf.vim","IDLATL-Helper","as.vim","Mines","coffee.vim","adp.vim","mruex","HiCurLine","perl-support.vim","BOG","spreadsheet.vim","BufClose.vim","MPD-syntax-highlighting","help.vim","rd.vim","rcsvers.vim","ASPRecolor.vim","HTML--insert","ctrlax.vim","desc.vim","ntprocesses","caramel.vim","GTK","autolisp-help","wintersday.vim","darkdot","TEXT--fill-char","gnu-c","psp.vim","dawn","allfold","fgl.vim","autonumbering-in-vim","cg.vim","matlab.vim","comment.vim","pyljpost.vim","todolist.vim","northsky","fgl.c","JavaBrowser","seashell","BlackSea","PapayaWhip","ChocolateLiquor","guifontpp.vim","TaQua","HelpClose","colorpalette.vim","python-tools","execmap","cmake.vim","cmake.vim","vimwc.sh","vimbadword.sh","oceanblack.vim","php.vim-html-enhanced","cream-numberlines","asmMIPS","valgrind.vim","toc.vim","Qt.vim","ctags.vim","dante.vim","cpp.vim","gisdk","CRefVim","ruler.vim","Asciitable.vim","Adaryn.vim","BreakPts","brookstream","Russian-menu-for-gvimwin32","Conflict2Diff","tagsubmenu","m4pic.vim","nightwish.vim","Color-Sampler-Pack","ShowPairs","MarkShift","SeeTab","putty","resolv.conf-syntax","cf.vim","make-element","Reindent","otf.vim","sparc.vim","getdp","COMMENT.vim","WC.vim","gmsh.vim","SYN2HTML","tcsoft.vim","GetLatestVimScripts","WML-Wireless-Markup-Language-syntax","Color-Scheme-Test","greyblue.vim","colorize","DOS-Commands","fte.vim","chordpro.vim","vectorscript.vim","uniq.vim","stol.vim","ldap_schema.vim","ldif.vim","proc.vim","esperanto","epperl.vim","headers.vim","sip.vim","gpg.vim","gnupg","xml_cbks","VimDebug","scratch.vim","FeralToggleCommentify.vim","hexman.vim","Dotnet-Dictionaries","random.vim","matrix.vim","VisIncr","autumn.vim","listmaps.vim","Maxlen.vim","MakeDoxygenComment","VS-like-Class-Completion","GenerateMatlabFunctionComment","pgn.vim","genindent.vim","fluxbox.vim","ferallastchange.vim","blockhl2.vim","cschemerotate.vim","ftplugin-for-Calendar","Comment-Tools","incbufswitch.vim","feralalign.vim","VimTweak","calibre.vim","cleanphp","actionscript.vim","POD-Folder","VimSpeak","ample.vim","quancept.vim","po.vim","timecolor.vim","timecolor.vim","Visual-Cpp","NEdit","OIL.vim","cg.vim","parrot.vim","xmmsctrl.vim","isi2bib","sketch.vim","gdl.vim","msp.vim","brainfuck-syntax","sfl.vim","browser-like-scrolling-for-readonly-file","nuvola.vim","SideBar.vim","MSIL-Assembly","cygwin.vim","mupad.vim","trash.vim","wiki.vim","tagMenu","local_vimrc.vim","Hanoi-Tower","sudo.vim","co.vim","xmidas.vim","folddigest.vim","quicksession.vim","sql.vim","pam.vim","kickstart.vim","mdl.vim","gor.vim","yaml.vim","sbutils","movewin.vim","SwapHeader","svn.vim","dhcpd.vim","curcmdmode","cmdalias.vim","Intellisense-for-Vim","HelpExtractor","pic.vim","aiseered.vim","winhelp","opengl.vim","ttcn-syntax","ttcn-indent","VDLGBX.DLL","python_encoding.vim","showpairs-mutated","dusk","LogCVSCommit","peaksea","lpc.vim","hlcontext.vim","dont-click","gvim-with-tabs","VHDL-indent","ttcn-dict","mis.vim","table.vim","Source-Control","ocamlhelp.vim","umber-green","vgrep","lebrief.vim","vimcdoc","whereis.vim","highlight_cursor.vim","ntp.vim","php_console.vim","sessions.vim","pyfold","oasis.vim","gdm.vim","fluka.vim","vartabs.vim","delek.vim","qt2vimsyntax","tokens.vim","set_utf8.vim","python.vim","Relaxed-Green","simpleandfriendly.vim","ttcn-ftplugin","promela.vim","xterm16.vim","bmichaelsen","preview.vim","Walk.vim","FindMakefile","MixCase.vim","javaDoc.vim","gramadoir.vim","XQuery-syntax","expand.vim","zrf.vim","truegrid.vim","dks-il2-tex.vim","vimcommander","Smart-Diffsplit","robinhood.vim","darkblue2.vim","billw.vim","mail.vim","white.vim","HHCS_D","enumratingptn","HHCS","ephtml","rgbasm.vim","Mouse-Toggle","BlockWork","avrasm.vim","yum.vim","asmM68k.vim","find_in_files","mp.vim","Intellisense","VimNotes","gq","TT2-syntax","xmaslights.vim","smartmake","httpclog","RTF-1.6-Spec-in-Vim-Help-Format","systemc_syntax.tar.gz","selected-resizer","PureBasic-Syntax-file","macro.vim","python.vim","text.py","yo-speller","increment.vim","nasl.vim","ptl.vim","pyab","mars.vim","howto-ftplugin","SrchRplcHiGrp.vim","latex-mik.vim","Pydiction","Posting","Gothic","File-local-variables","less.vim","FX-HLSL","NSIS-2.0--Syntax","table_format.vim","LocateOpen","Destructive-Paste","inform.vim","VikiDeplate","cscope-quickfix","BlackBeauty","visual_studio.vim","unmswin.vim","Israelli-hebrew-shifted","phoneticvisual-hebrew-keyboard-mapphone","Redundant-phoneticvisual-Hebrew-keyboar","changesqlcase.vim","changeColorScheme.vim","allout.vim","Syntax-context-abbreviations","srec.vim","emacsmode","bufman.vim","automation.vim","GVColors","Posting","RegExpRef","passwd","buttercream.vim","fluxkeys.vim","ods.vim","AutoAlign","FormatBlock","FormatComment.vim","docbkhelper","armasm","EvalSelection.vim","edo_sea","pylint.vim","winpos.vim","gtags.vim","Viewing-Procmail-Log","Toggle","perl_synwrite.vim","ViewOutput","CharTab","nesC","Tower-of-Hanoi","sharp-Plugin-Added","ratfor.vim","fvl.vim","yiheb-il.vim","sql.vim","Editable-User-Interface-EUI-eui_vim","html_umlaute","nvi.vim","unicodeswitch.vim","pydoc.vim","nedit2","adam.vim","po.vim","sieve.vim","AsNeeded","Nibble","fdcc.vim","CSS-2.1-Specification","sqlldr.vim","tex_autoclose.vim","bufmenu2","svncommand.vim","timestamp.vim","html_portuquese","AutoFold.vim","russian-phonetic_utf-8.vim","colorsel.vim","XpMenu","timelog.vim","virata.vim","VimIRC.vim","TogFullscreen.vim","database-client","ftpsync","svg.vim","Karma-Decompiler","autosession.vim","newheader.vim","sccs.vim","screen.vim","edifact.vim","pqmagic.vim","ProjectBrowse","n3.vim","groovy.vim","StyleChecker--perl","2tex.vim","Scons-compiler-plugin","qf.vim","af.vim","aspnet.vim","psql.vim","multiselect","xml2latex","ToggleComment","php-doc","YAPosting","blugrine","latex_pt","replace","DumpStr.vim","RemoteSaveAll.vim","FTP-Completion","nexus.vim","uptime.vim","asmx86","php.vim-for-php5","autoit.vim","pic18fxxx","IncrediBuild.vim","folds.vim","chela_light","rest.vim","indentpython.vim","Siebel-VB-Script-SVB","Tibet","Maxscript","svn-diff.vim","idf.vim","ssa.vim","GtkFileChooser","Simple-templates","onsgmls.vim","mappinggroup.vim","metacosm.vim","ASPJScript","DoxygenToolkit.vim","VHT","pdftotext","rpl","rpl","rpl","aspvbs.vim","FiletypeRegisters","nant-compiler-script","tbf-vimfiles","Window-Sizes","menu_pt_br.vimfix","TransferChinese.vim","gtk-vim-syntax","2htmlj","glsl.vim","SearchInBuffers.vim","Docbook-XSL-compiler-file","Phrases","Olive","Lynx-Offline-Documentation-Browser","srec.vim","srec.vim","lingo.vim","buflist","lingodirector.vim","PLI-Tools","clipbrd","check-mutt-attachments.vim","corewars.vim","redcode.vim","potwiki.vim","updt.vim","revolutions.vim","feralstub.vim","Phoenity-discontinued","aftersyntax.vim","IndentHL","xmlwf.vim","Visual-Mark","errsign","log.vim","msvc2003","scalefont","uc.vim","commenter","OOP.vim","cream-iso639.vim","cream-iso3166-1","HTMLxC.vim","vimgrep.vim","array.vim","vimtabs.vim","CodeReviewer.vim","cube.vim","uc.vim","uc.vim","sf.vim","monday","ST20-compiler-plugin","R.vim","octave.vim","delete.py","groff-keymap","The-Mail-Suite-tms","browser.vim","InteractHL.vim","curBuf.vim","vsutil.vim","DavesVimPack","Menu-Autohide","pygtk_color","Vive.vim","actionscript.vim","greputils","HC12-syntax-highlighting","asp.vim","click.vim","cecutil","mingw.vim","abap.vim","vimsh","dsPIC30f","BufOnly.vim","ConfirmQuit.vim","fasm-compiler","python_calltips","netrw.vim","cscope_win","lindo.vim","VUT","replvim.sh","xmms.vim","HiColors","MS-Word-from-VIM","multiwin.vim","multiAPIsyntax","earth.vim","Black-Angus","tpp.vim","cfengine.vim","sas.vim","InsertTry.vim","VimRegEx.vim","blitzbasic.vim","Archive","cream-statusline-prototype","TabLaTeX","buffer-perlpython.pl","txt2tags-menu","hamster.vim","hamster.vim","clearsilver","hamster.vim","VB.NET-Syntax","VB.NET-Indent","ACScope","ptu","java_src_link.vim","AutumnLeaf","WhatsMissing.vim","bulgarian.vim","edifile.vim","rcs.vim","pydoc.vim","TWiki-Syntax","pmd.vim","BodySnatcher","MapleSyrup","ooosetup.vim","reverse.vim","mod_tcsoft.vim","PHP-correct-Indenting","anttestreport","lingo.vim","lpl.vim","UpdateModDate.vim","vimUnit","lxTrace","vim2ansi","synmark.vim","vim_faq.vim","jhlight.vim","javascript.vim","css.vim","scratch.vim","Japanese-Keymapping","vcbc.vim","scilab.tar.gz","scilab.tar.gz","tree","FileTree","Cisco-ACL-syntax-highlighting-rules","header.vim","inkpot","jhdark","C-fold","ccimpl.vim","bufkill.vim","perl-test-manage.vim","GetFDCText.vim","cygwin_utils.vim","globalreplace.vim","remote-PHP-debugger","xbl.vim","JavaKit","ledger.vim","ledger.vim","txt2tags","unhtml","pagemaker6","tSkeleton","foldcol.vim","jexplorer","html_danish","EditJava","tolerable.vim","Wiked","substitute.vim","sharp-Indent","GoboLinux-ColorScheme","Abc-Menu","DetectIndent","templates.vim","tComment","Rhythmbox-Control-Plugin","sharp-Syntax","oceanlight","OAL-Syntax","PVCS-access","context_complete.vim","fileaccess","avr.vim","tesei.vim","MultipleSearch2.vim","uniface.vim","turbo.vim","rotate.vim","cream-replacemulti","cleanswap","matrix.vim","hcc.vim","wc.vim","AutoUpload","expander.vim","vfp8.vim","vis","omlet.vim","ocaml.annot.pl","nodiff.vim","increment_new.vim","namazu.vim","c.vim","bsh.vim","WhereFrom","oo","Java-Syntax-and-Folding","ProvideX-Syntax","DNA-Tools","vimCU","cvsvimdiff","latexmenu","XML-Indent","AddIfndefGuard","Vim-JDE","cvsdiff.vim","Super-Shell-Indent","cool.vim","Perldoc-from-VIM","The-NERD-Commenter","darkblack.vim","OpenGLSL","monkeyd-configuration-syntax","OCaml-instructions-signature---parser","plist.vim","my-_vimrc-for-Windows-2000XP7-users","DotOutlineTree","Vim-klip-for-Serence-Klipfolio-Windows","explorer-reader.vim","recent.vim","crontab.freebsd.vim","Rainbow-Parenthesis","mom.vim","DoTagStuff","gentypes.py","YankRing.vim","mathml.vim","xhtml.vim","MS-SQL-Server-Syntax","Mark","autoit.vim","Guardian","octave.vim","Markdown-syntax","desert256.vim","Embedded-Vim-Preprocessor","cvsmenu.vim-updated","Omap.vim","swig","cccs.vim","vc_diff","Teradata-syntax","timekeeper","trt.vim","greens","VIMEN","pike.vim","aspvbs.vim","wood.vim","custom","sienna","tmda_filter.vim","cstol.vim","tex_umlaute","Quick-access-file-Menu","IComplete","Emacs-outline-mode","teol.vim","acsb","drcstubs","drc_indent","rubikscube.vim","php_check_syntax.vim","Mathematica-Syntax-File","Mathematica-Indent-File","SpotlightOpen","autoscroll","vsearch.vim","quantum.vim","ToggleOptions.vim","crontab.vim","tagselect","TinyBufferExplorer","TortoiseSVN.vim","nasl.vim","sadic.tgz","tabs.vim","otherfile.vim","otherfile.vim","LogiPat","luarefvim","keywords.vim","Pida","nightshade.vim","form.vim","rsl.vim","Color-Scheme-Explorer","Project-Browser-or-File-explorer-for-vim","Shortcut-functions-for-KeepCase-script-","maximize.dll","recycle.dll-and-recycle.vim","php_funcinfo.vim","T7ko","cguess","php_template","another-dark-scheme","java_fold","DataStage-Universe-Basic","vimplate","vimplate","bwftmenu.vim","asmM6502.vim","udvm.vim","bwHomeEndAdv.vim","bwUtility.vim","snippetsEmu","perlprove.vim","Dynamic-Keyword-Highlighting","CSVTK","ps2vsm","advantage","The-Stars-Color-Scheme","bufferlist.vim","Impact","Windows-PowerShell-Syntax-Plugin","xslt","verilogams.vim","XHTML-1.0-strict-help-file","sudoku","tidy","Pleasant-colorscheme","VST","A-soft-mellow-color-scheme","Professional-colorscheme-for-Vim","pluginfonts.vim","TabBar","Autoproject","last_change","last_change","AutoTag","switchtags.vim","dmd","VIM-Email-Client","cxxcomplete","The-Vim-Gardener","Colortest","Mud","Mud","Modelines-Bundle","syntaxada.vim","Night-Vision-Colorscheme","PDV--phpDocumentor-for-Vim","eraseSubword","larlet.vim","Cthulhian","SmartCase","HP-41-syntax-file","HP-41-file-type-plugin","Last-Modified","cloudy","xslhelper.vim","adobe.vim","Peppers","syntaxconkyrc.vim","bookmarks.vim","Zopedav","CVSconflict","TextMarker","ldap.vim","asmh8300","TailMinusF","QFixToggle","fpc.vim","Chars2HTML","cfengine-log-file-highlighting","syntaxuil.vim","cHeaderFinder","syntaxudev.vim","charon","SessionMgr","UniCycle","interfaces","gdbvim","build.vim","jay-syntax","d.vim","GreedyBackspace.vim","BuildWin","py_jump.vim","motus.vim","fish.vim","Processing-Syntax","range-search.vim","xml.vim","tagSetting.vim","javap.vim","desertedocean.vim","Zen-Color-Scheme","DarkZen-Color-Scheme","gnupg-symmetric.vim","desertedocean.vim","understated","impactG","DesertedOceanBurnt","Local-configuration","OMNeTpp-NED-syntax-file","Workspace-Manager","bwTemplate","vim_colors","brsccs.vim","bibFindIndex","Auto-debug-your-vim","shorewall.vim","carvedwood","avs.vim","jadl.vim","openvpn","softblue","bufmap.vim","corn","dtdmenu","iptables","CarvedWoodCool","darkerdesert","selection_eval.vim","cfname","checksyntax","textutil.vim","haml.zip","Dev-Cpp-Scheme","HiMtchBrkt","Compiler-Plugin-for-msbuild-csc","XML-Folding","compilerpython.vim","winmanager","xsl-fo","XML-Completion","telstar.vim","colors","AllBuffersToOneWindow.vim","MoveLine","Altair-OptiStruct-Syntax","Low-Contrast-Color-Schemes","vera.vim","VHDL-indent-93-syntax","svn_commit","cecscope","baycomb","VCard-syntax","copypath.vim","CycleColor","Grape-Color","moin.vim","glark.vim","syntaxm4.vim","dtd2vim","docbook44","moria","Ant","netrw.vim","far","bayQua","promela","lbnf.vim","watermark","Sift","vim7-install.sh","yellow","maude.vim","Modeliner","Surveyor","muttrc.vim","CmdlineCompl.vim","cvops-aut.vim","kid.vim","marklar.vim","spectro.vim","StickyCursor","fasm.vim","django.vim","ScrollColors","PluginKiller","jr.vim","JavaScript-syntax","pyte","Sudoku-Solver","Efficient-python-folding","derefined","initng","Align.vim","all-colors-pack","rfc2html","delins.vim","slr.vim","Vimball","Search-unFold","jbase.vim","jbase.vim","LargeFile","TabLineSet.vim","XHTML-1.0-Strict-vim7-xml-data-file","autohi","manuscript.vim","screenpaste.vim","VimVS6","SwitchExt","VhdlNav","smcl.vim","changelog","ClassTree","icalendar.vim","OmniCppComplete","maven2.vim","WinWalker.vim","cmaxx","magic.vim","vbnet.vim","javaimports.vim","habiLight","comments.vim","FlexWiki-syntax-highlighting","timing.vim","backburnerEdit_Visual_Block.vim","txt.vim","amarok.vim","vimproject","TagsParser","remind","pluginbackup.vim","colorsmartin_krischik.vim","Highlighter.vim","mousefunc-option-patch","GetChar-event-patch","pythoncomplete","Tabline-wrapping-patch","foxpro.vim","abolish.vim","perl_search_lib","compilergnat.vim","ftpluginada.vim","bluez","jVim","Simple-Color-Scheme","ScreenShot","autoproto.vim","autoloadadacomplete.vim","CD_Plus","xul.vim","Toggle-Window-Size","icansee.vim","KDE-GVIM-vimopen","Neverness-colour-scheme","Rainbow-Parenthsis-Bundle","patchreview.vim","forth.vim","ftdetectada.vim","gtd","rails.vim","abnf","montz.vim","redstring.vim","php.vim","SQLComplete.vim","systemverilog.vim","settlemyer.vim","findstr.vim","crt.vim","css.vim","tcl.vim","cr-bs-del-space-tab.vim","FlagIt","lookupfile","vim-addon-background-cmd","tobase","Erlang-plugin-package","actionscript.vim","verilog_systemverilog.vim","myghty.vim","ShowFunc","skk.vim","unimpaired.vim","octave.vim","crestore.vim","comment.vim","showhide.vim","warsow.vim","blacklight","color_toon","yanktmp.vim","highlight.vim","pop11.vim","Smooth-Scroll","developer","tcl.vim","colornames","gsl.vim","HelpWords","color_peruse","Chrome-syntax-script","Ada-Bundle","IncRoman.vim","Access-SQL-Syntax-file","vj","phps","Satori-Color-Scheme","SWIG-syntax","tdl.vim","afterimage.vim","cshelper","vimtips_with_comments","scvim","phpx","TIMEIT","phpfolding.vim","pastie.vim","x12-syntax","liquid.vim","doriath.vim","findfuncname.vim","XChat-IRC-Log","gnuchangelog","sh.vim","svncommand-tng","matlab_run.vim","candycode.vim","JDL-syntax-file","myfold.vim","SourceCodeObedience","MultiTabs","cpp.vim","AfterColors.vim","zzsplash","SuperTab-continued.","switch_headers.vim","tikiwiki.vim","str2numchar.vim","addexecmod.vim","ASL","scrollfix","asmx86_64","freya","highlight_current_line.vim","proe.vim","git.zip","cobol.zip","quilt","doxygenerator","The-NERD-tree","dw_colors","mint","redocommand","rubycomplete.vim","asm8051.vim","buftabs","tavi.vim","Alternate-workspace","campfire","blink","doorhinge.vim","darktango.vim","blueprint.vim","pdf.vim","Drupal-5.0-function-dictionary","toggle_words.vim","twilight","Tab-Name","tidy-compiler-script","Vexorian-color-scheme","ekvoli","IndexedSearch","Darcs","DNA-sequence-highlighter","plaintex.vim","Tango-colour-scheme","jdox","MakeInBuilddir","mail_indenter","IndentConsistencyCop","IndentConsistencyCopAutoCmds","tailtab.vim","desertEx","SnippetsMgr","StateExp","VPars","surround.vim","C_Epita","vimGTD","vimksh","Remove-Trailing-Spaces","edc-support","vdb.vim","vdb-duplicated","redcode.vim","Marks-Browser","php_getset.vim","FencView.vim","scons.vim","SWIFT-ATE-Syntax","Business-Objects-Syntax","Test.Base-syntax","darker-robin","Tail-Bundle","tcl_snit.vim","tcl_sqlite.vim","tcl.vim","tabula.vim","WLS-Mode","gvimext.dll--support-tabs-under-VIM-7","renamer.vim","cf.vim","vimpager","pyljvim","capslock.vim","ruby_imaps","Templeet","sal-syntax","exUtility","tAssert","perlcritic-compiler-script","rdark","aedit","vbugle","echofunc.vim","applescript.vim","gnuplot.vim","RunVim.applescript","Info.plist","filetype.vim","R-MacOSX","Utility","vst_with_syn","nightflight.vim","amifmt.vim","compilerflex.vim","javascript.vim","toggle_word.vim","GotoFileArg.vim","kib_darktango.vim","tGpg","kib_plastic","surrparen","TTrCodeAssistor","sparql.vim","BinarySearchMove","lbdbq","kate.vim","conlangs","lojban","surrogat","aspnetcs","lua-support","code_complete","tcl_itcl.vim","tcl_togl.vim","recent.vim","SnipSnap","lispcomplete.vim","etk-vim-syntax","woc","DAMOS-tools","Haml","Menu_SQL_Templates.vim","tcl_critcl.vim","Vimgrep-Replace","cvsdiff","Wombat","tcmdbar.vim","scala.vim","mlint.vim","polycl.vim","cscope-wrapper","apachestyle","javacomplete","hexsearch.vim","wikipedia.vim","Bexec","Audacious-Control","tagscan","erm.vim","fcsh-tools","vibrantink","autoloadTemplate.vim","SETL2","svnvimdiff","smarty.vim","polycfg.vim","IndentHL","c16gui","eclipse.vim","compview","brief2","SearchFold","MultiEnc.vim","calmar256-lightdark.vim","Vimplate-Enhanced","guicolorscheme.vim","Infobasic-Set-Syntax-FTDetect-FTPlugi","Random-Tip-Displayer","gotofile","greplace.vim","sqlvim.sh","Windows-PowerShell-Indent-File","Windows-PowerShell-File-Type-Plugin","buffers_search_and_replace","Yankcode","vimbuddy.vim","NAnt-completion","NAnt-syntax","incfilesearch.vim","NetSend.vim","Hints-for-C-Library-Functions","Hints-for-C-Library-Functions","smp","writebackup","writebackupVersionControl","html-improved-indentation","VimSpy","asciidoc.vim","des3.vim","st.vim","RDF-Namespace-complete","bufpos","BlitzBasic-syntax-and-indentation","tEchoPair","IndentAnything","Javascript-Indentation","nicotine.vim","screenplay","jman.vim","OceanBlack256","haproxy","gitdiff.vim","NesC-Syntax-Highlighting","arpalert","AutoClose","carrot.vim","SearchSyntaxError","clarity.vim","Twitter","Xdebugxs-dictionary-of-functions","textmate16.vim","Jinja","native.vim","mako.vim","eZVim","Directory-specific-settings","errormarker.vim","kpl.vim","tlib","tmru","tselectfiles","tselectbuffer","doctest-syntax","simplefold","genshi.vim","django.vim","fruity.vim","summerfruit.vim","projtags.vim","psql.vim","verilog_emacsauto.vim","securemodelines","voodu.vim","vimoutliner-colorscheme-fix","AutoComplPop","ck.vim","svndiff","Increment-and-Decrement-number","felix.vim","python_import.vim","scmCloseParens","nginx.vim","AnyPrinter","DiffGoFile","automated-rafb.net-uploader-plugin","LustyExplorer","vividchalk.vim","CimpTabulate.vim","vmake","Vim-Setup-system","gmcs.vim","ragtag.vim","synic.vim","vcsnursery","FindFile","ael.vim","freefem.vim","skill_comment.vim","REPL","ReloadScript","camelcasemotion","tmboxbrowser","snipper","creole.vim","QuickBuf","SuperPre","in.vim","perlhelp.vim","tbibtools","vdm.vim","mySqlGenQueryMenu.vim","Scheme-Mode","clibs.vim","cvsps-syntax","javalog.vim","ChocolatePapaya","vpp.vim","omniperl","context-complier-plugin","bbs.vim","syntaxalgol68.vim","Rename","DBGp-client","maxscript.vim","svndiff.vim","visSum.vim","html_french","git-commit","rectcut","OOP-javascript-indentation","Syntax-for-XUL","todo.vim","autofmt","drools.vim","fx.vim","stingray","JSON.vim","QuickFixFilterUtil","outline","Dictionary","VimExplorer","gvim-pdfsync","systemverilog.vim","Vimpress","yavdb","doxygen-support.vim","smart_cr","yasnippets","SmartX","CharSort","cimpl","Tabmerge","Simple256","vimscript-coding-aids","tie.vim","lodgeit.vim","Ruby-Snippets","gvim-extensions-for-TALpTAL","indenthaskell.vim","Highlight-and-Mark-Lines","deb.vim","trivial256","Parameter-Helpers","JET_toggle","pyconsole_vim.vim","lettuce.vim","rcscript","rcscript","Easy-alignment-to-column","Sass","vimremote.sh","halfmove","vimff","GtagsClient","FuzzyFinder","runtests.vim","mosalisp.vim","khaki.vim","two2tango","gitvimdiff","kwiki.vim","Shell-History","triangle.vim","NightVision","confluencewiki.vim","railscasts","bruce.vim","undo_tags","iast.vim","sas.vim","blinking_cursor","lookup.vim","python_ifold","gobgen","ColorSchemeMenuMaker","karma.vim","progressbar-widget","greplist.vim","buffer-status-menu.vim","AutoClose","sessionman.vim","dbext4rdb","openssl.vim","DrillCtg","ttoc","cheat.vim","no_quarter","tregisters","ttags","3DGlasses.vim","Gettext-PO-file-compiler","headerguard.vim","Tailf","erlang-indent-file","brew.vim","camlanot.vim","motion.vim","taskpaper.vim","MarkLines","4NT-Bundle","vimblog.vim","makeprgs","swap-parameters","trag","colorful256.vim","F6_Comment-old","F6_Comment","hookcursormoved","narrow_region","QuickComment","tcalc","AutoScrollMode","of.vim","VimPdb","myvim.vim","mips.vim","Flash-Live-Support-Agent-and-Chatroom","nosql.vim","BlockDiff","vimpp","LustyJuggler","enscript-highlight","idlang.vim","asmc54xx","TranslateIt","ttagecho","soso.vim","PropBank-Semantic-Role-Annotations","matchparenpp","winwkspaceexplorer","Warm-grey","haskell.vim","coq-syntax","xemacs-mouse-drag-copy","checksum.vim","executevimscript","newlisp","yate","ttagcomplete","bbcode","yet-another-svn-script","switch-files","rcg_gui","rcg_term","indenthtml.vim","setsyntax","phtml.vim","industrial","Coq-indent","autoresize.vim","mysqlquery","comments.vim","javascript.vim","gen_vimoptrc.vim","TI-Basic-Syntax","code-snippet","refactor","WuYe","Acpp","view_diff","verilog.vim","reloaded.vim","complval.vim","Puppet-Syntax-Highlighting","Smartput","Tab-Menu","narrow","fakeclip","xml_autons","textobj-user","textobj-datetime","EnvEdit.vim","kwbdi.vim","R.vim","oberon2","hiveminder.vim","scratch","csv-reader","BBCode","chords","robocom","autohotkey-ahk","pspad-colors-scheme","Torquescript-syntax-highlighting","Processing","Io-programming-language-syntax","GCov-plugin","gcov.vim","webpreview","speeddating.vim","HeaderCVS","bg.py","basic-colors","Twitter","SDL-library-syntax-for-C","accurev","Wikidoc-syntax-highlighting","symfony.vim","Noweb","XmlPretty","Socialtext-wiki-syntax-highlighting","byter","tintin.vim","tabpage_sort.vim","syntax-highlighting-for-tintinttpp","repeat.vim","Css-Pretty","PBwiki-syntax-highlighting","sgf.vim","xoria256.vim","undobranche_viewer.vim","showmarks","unibasic.vim","nice-vim","GOBject-Builder-gob2","prmths","VimTrac","quiltdiff","ncss.vim","css_color.vim","sessions.vim","snippets.vim","RecentFiles","marvim","greenvision","leo256","altfile","diffchanges.vim","timestamp","VFT--VIM-Form-Toolkit","DataStage-Server-and-Parallel","sharp-Syntax","GNU-R","renamec.vim","ukrainian-enhanced.vim","patran.vim","dakota.vim","Doxygen-via-Doxygen","jammy.vim","osx_like","PERLDOC2","head.vim","repmo.vim","Railscasts-Theme-GUIand256color","cwiki","rdhelp.txt","cqml.vim","Source-Explorer-srcexpl.vim","ColorSchemeEditor","reliable","vimlatex","smoothPageScroll.vim","file-line","git-file.vim","pig.vim","Latex-Text-Formatter","earendel","Luinnar","dtrace-syntax-file","MountainDew.vim","Syntax-for-Fasta","fpdf.vim","number-marks","Unicode-Macro-Table","antlr3.vim","beauty256","rastafari.vim","gauref.vim","northland.vim","SCMDiff","Boost-Build-v2-BBv2-syntax","vimgen","TwitVim","CoremoSearch","runzip","Relativize","Txtfmt-The-Vim-Highlighter","pyrex.vim","Shobogenzo","seoul","Obvious-Mode","VimTAP","Switch","darkspectrum","qfn","groovy.vim","debugger.py","Limp","bensday","Allegro-4.2-syntax-file","CmdlineComplete","tinymode.vim","STL-improved","sort-python-imports","vimwiki","browser.vim","autopreview","pacific.vim","beachcomber.vim","WriteRoom-for-Vim","h80","nc.vim","rtorrent-syntax-file","previewtag","WarzoneResourceFileSyntax","useful-optistruct-functions","StringComplete","darkrobot.vim","256-jungle","vcsbzr.vim","openser.vim","RemoveDups.VIM","less.bat","upf.vim","darkroom","FFeedVim","xml_taginsert","pac.vim","common_vimrc","journal.vim","publish.vim","railstab.vim","musicbox.vim","buffergrep","dark-ruby","bpel.vim","Git-Branch-Info","Named-Buffers","Contrasty","nagios-syntax","occur.vim","xtemplate","EZComment","vera.vim","silent.vim","colorful","apachelogs.vim","vim-rpcpaste","pygdb","AutoInclude","nightflight2.vim","gladecompletion.vim","flydiff","textobj-fold","textobj-jabraces","DevEiate-theme","jptemplate","cmdlinehelp","blackboard.vim","pink","brook.vim","huerotation.vim","cup.vim","vmv","Specky","fgl.vim","ctags.exe","loremipsum","smartchr","skeleton","linglang","Resolve","SwapIt","Glob-Edit","sipngrep","sipngrep-helper","codepad","fortran.vim","perl-mauke.vim","Gembase-dml-plugins","foldsearch","spring.vim","vimdb.vim","Textile-for-VIM","Text-Especially-LaTeX-Formatter","Clever-Tabs","portablemsys","GoogleSearchVIM","Indent-Highlight","softlight.vim","sofu.vim","QuickName","thegoodluck","auto_wc.vim","zoom.vim","zshr.vim","TextFormat","LaTeX-error-filter","batch.vim","catn.vim","nopaste.vim","Tumblr","log.vim","chlordane.vim","pathogen.vim","session.vim","backup.vim","metarw","metarw-git","ku","bundle","simple-pairs","molokai","postmail.vim","dictview.vim","ku-bundle","ku-metarw","Vimchant","bufmru.vim","trinity.vim","Chimp","indentgenie.vim","rootwater.vim","RltvNmbr.vim","stlrefvim","FastGrep","textobj-lastpat","Superior-Haskell-Interaction-Mode-SHIM","Nekthuth","tags-for-std-cpp-STL-streams-...","clue","louver.vim","diff_navigator","simplewhite.vim","vimxmms2","autoincludex.vim","ScopeVerilog","vcsc.py","darkbone.vim","CCTree","vimmp","Duplicated","sqloracle.vim","automatic-for-Verilog","ClosePairs","dokuwiki.vim","if_v8","vim-addon-sql","htmlspecialchars","mlint.vim","win9xblueback.vim","Verilog-constructs-plugin","RemoveIfdef","Note-Maker","winter.vim","buf2html.vim","sqlite_c","endwise.vim","cern_root.vim","conomode.vim","pdc.vim","CSApprox","MPC-syntax","Django-Projects","QuickTemplate","darkeclipse.vim","Fly-Between-Projects","Cutting-and-pasting-txt-file-in-middle","Fly-Between-Projects","hfile","cheat","sqlplsql","Russian-PLansliterated","advice","stackreg","Pit-Configuration","Robotbattle-Scripting-Language","Lissard-syntax","MatlabFilesEdition","Refactor-Color-Scheme","sql_iabbr-2","ku-args","Yow","lastchange","Miranda-syntax-highlighting","Tango2","textobj-diff","jQuery","Merb-and-Datamapper","Format-Helper","quickrun","gadgetxml.vim","PySmell","Wordnet.vim","Gist.vim","Transmit-FTP","arpeggio","nour.vim","code_complete-new-update","LineCommenter","autocorrect.vim","literal_tango.vim","commentToggle","corporation","W3AF-script-syntax-file","Side-C","Php-Doc","fuzzyjump.vim","shymenu","EasyGrep","Php-Doc","TagManager-BETA","pyflakes.vim","VimLocalHistory","Python-Documentation","Download-Vim-Scripts-as-Cron-Task","UpdateDNSSerial","narrow","Pago","PylonsCommand","sqlserver.vim","msdn_help.vim","nightsky","miko","eyapp","google","outputz","mtys-vimrc","unibox","enzyme.vim","AutoTmpl","AutoTmpl","Python-Syntax-Folding","kellys","session_dialog.vim","wombat256.vim","cdargs","submode","sandbox","translit","smartword","paintbox","Csound-compiler-plugin","python_open_module","Gentooish","ini-syntax-definition","cbackup.vim","Persistent-Abbreviations","ActionScript-3-Omnicomplete","grsecurity.vim","maroloccio","pygtk_syntax","Quagmire","Gorilla","textobj-indent","python_check_syntax.vim","proc.vim","fortran_codecomplete.vim","Rack.Builder-syntax","maroloccio2","eclm_wombat.vim","maroloccio3","ViBlip","pty.vim","Fruidle","Pimp","Changed","shellinsidevim.vim","blood","toggle_unit_tests","VimClojure","fly.vim","lightcolors","vanzan_color","tetragrammaton","VimIM","0scan","DBGp-Remote-Debugger-Interface","Spiderhawk","proton","RunView","guepardo.vim","charged-256.vim","ctxabbr","widower.vim","lilydjwg_green","norwaytoday","WOIM.vim","Dpaste.com-Plugin","reorder-tabs","searchfold.vim","wokmarks.vim","Jifty-syntax","Scratch","Thousand-separator","Perl-MooseX.Declare-Syntax","jpythonfold.vim","Thesaurus","IndentCommentPrefix","po.vim","slimv.vim","nxc.vim","muttaliasescomplete.vim","d.vim","cca.vim","Lucius","earthburn","ashen.vim","css-color-preview","snipMate","Mastermind-board-game","StarRange","SearchCols.vim","EditSimilar","Buffer-grep","repy.vim","xsltassistant.vim","php.vim","BusyBee","wps.vim","Vicle","jam.vim","irssilog.vim","CommentAnyWay","jellybeans.vim","myprojects","gitignore","Match-Bracket-for-Objective-C","gams.vim","numbertotext","NumberToEnglish","ansi_blows.vim","bufMenuToo","simple_comments.vim","runVimTests","utf8-math","Vim-Rspec","Blazer","LogMgr","vimdecdef","apidock.vim","ack.vim","Darkdevel","codeburn","std-includes","WinMove","summerfruit256.vim","lint.vim","Session-manager","spec.vim","Fdgrep","blogit.vim","popup_it","quickfixsigns","lilydjwg_dark","upAndDown","PDV-revised","glimpse","vylight","FSwitch","HTML-AutoCloseTag","Zmrok","LBufWin","tmarks","Skittles-Dark","gvimfullscreen_win32","lighttpd-syntax","reorder.vim","todolist.vim","Symfony","wargreycolorscheme","paster.vim","Haskell-Cuteness","svk","nextfile","vimuiex","TaskList.vim","send.vim","PA_translator","textobj-entire","xptemplate","Rubytest.vim","vimstall","sdticket","vimtemplate","graywh","SpamAssassin-syntax","ctk.vim","textobj-function","neocomplcache","up2picasaweb","ku-quickfix","TODO-List","ProtoDef","Cabal.vim","Vimya","exVim","Vim-R-plugin","explorer","compilerjsl.vim","dosbatch-indent","nimrod.vim","csindent.vim","SearchPosition","smartmatcheol.vim","google.vim","ScmFrontEnd-former-name--MinSCM","blogger","jlj.vim","tango-morning.vim","haskell.vim","PLI-Auto-Complete","python_coverage.vim","Erlang_detectVariable","bandit.vim","TagHighlight","Templates-for-Files-and-Function-Groups","darkburn","PBASIC-syntax","darkZ","fitnesse.vim","bblean.vim","cuteErrorMarker","Arduino-syntax-file","squirrel.vim","Simple-R-Omni-Completion","VOoM","Changing-color-script","g15vim","clips.vim","plumbing.vim","ywvim","mako.vim","HtmlHelper","Mark","setget","shell_it","fastlane","TuttiColori-Colorscheme","tango-desert.vim","Hoogle","smarttill","cocoa.vim","altercmd","supercat.vim","nature.vim","GoogleReader.vim","textobj-verticalbar","cursoroverdictionary","Colorzone","colorsupport.vim","FastLadder.vim","herald.vim","zOS-Enterprise-Compiler-PLI","cuteTodoList","iabassist","dual.vim","kalt.vim","kaltex.vim","fbc.vim","operator-user","ats-lang-vim","MediaWiki-folding-and-syntax-highlight","EnhancedJumps","elise.vim","elisex.vim","Dictionary-file-for-Luxology-Modo-Python","argtextobj.vim","PKGBUILD","editsrec","regreplop.vim","ReplaceWithRegister","mrpink","tiddlywiki","PA_ruby_ri","EnumToCase","commentop.vim","SudoEdit.vim","vimrc","Screen-vim---gnu-screentmux","sign-diff","nextCS","Tag-Signature-Balloons","UltiSnips","textobj-syntax","mutt-aliases","mutt-canned","Proj","arc.vim","AutoFenc.vim","cssvar","math","Rename2","translit_converter","Syntax-Highlighting-for-db2diag.log","jsbeautify","tkl.vim","jslint.vim","donbass.vim","sherlock.vim","Notes","Buffer-Reminder-Remake","PreviewDialog","Logcat-syntax-highlighter","Syntastic","bib_autocomp.vim","v2.vim","bclear","vimper","blue.vim","ruby.vim","greek_polytonic.vim","git-cheat","falcon.vim","nuweb-multi-language","d8g_01","d8g_02","d8g_03","d8g_04","vimdiff-vcs","falcon.vim","banned.vim","delimitMate.vim","evening_2","color-chooser.vim","forneus","Mustang2","Quich-Filter","Tortoise","qtmplsel.vim","falcon.vim","falcon.vim","dull","Better-Javascript-Indentation","Join.vim","emv","vimscript","pipe.vim","JumpInCode","Conque-Shell","Crazy-Home-Key","grex","whitebox.vim","logpad.vim","vilight.vim","tir_black","gui2term.py","moss","python-tag-import","Django-helper-utils","operator-replace","DumbBuf","template-init.vim","wwwsearch","cpan.vim","Melt-Vim","InsertList","rargs.vim","cmdline-increment.vim","popup_it","perdirvimrc--Autoload-vimrc-files-per-di","hybridevel","phpErrorMarker","Functionator","CheckAttach.vim","SoftTabStops","Pasto","tango.vim","Windows-PowerShell-indent-enhanced","NERD_tree-Project","JavaScript-syntax-add-E4X-support","php_localvarcheck.vim","chocolate.vim","assistant","md5.vim","Nmap-syntax-highlight","haxe_plugin","fontsize.vim","InsertChar","hlasm.vim","term.vim","MailApp","PyMol-syntax","hornet.vim","Execute-selection-in-Python-and-append","testname","Asneeded-2","smarty-syntax","DBGp-client","sqlplus.vim","unicode.vim","baan.vim","libperl.vim","filter","multisearch.vim","RTM.vim","Cobalt-Colour-scheme","roo.vim","csv.vim","mimicpak","xmms2ctrl","buf_it","template.vim","phpcodesniffer.vim","wikinotes","powershellCall","HiVim","QuickFixHighlight","noused","coldgreen.vim","vorg","FlipLR","simple-comment","ywchaos","haskellFold","pod-helper.vim","Script-Walker","color-codes-SQL-keywords-from-Oracle-11g","FindInNERDTree","Speedware","perlomni.vim","go.vim","go.vim","github-theme","vimmpc","exjumplist","textobj-fatpack","grey2","prettyprint.vim","JumpInCode-new-update","GNU-as-syntax","NSIS-syntax-highlighting","colqer","gemcolors","Go-Syntax","fortran_line_length","Ruby-Single-Test","OmniTags","FindMate","signature_block.vim","record-repeat.vim","php.vim","signal_dec_VHDL","HTML-menu-for-GVIM","spinner.vim","RDoc","XPstatusline","rc.vim","mib_translator","Markdown","growlnotify.vim","JavaAspect","gsession.vim","cgc.vim","manuscript","CodeOverview","bluechia.vim","slurper.vim","create_start_fold_marker.vim","doubleTap","filetype-completion.vim","vikitasks","PyPit","open-terminal-filemanager","Chrysoprase","circos.vim","TxtBrowser","gitolite.vim","ShowFunc.vim","AuthorInfo","Cfengine-3-ftplugin","Cfengine-version-3-syntax","vim-addon-manager","Vim-Condensed-Quick-Reference","hlint","Enhanced-Ex","Flex-Development-Support","restart.vim","selfdot","syntaxGemfile.vim","spidermonkey.vim","pep8","startup_profile","extended-help","tplugin","SpitVspit","Preamble","Mercury-compiler-support","FirstEffectiveLine.vim","vimomni","std.vim","tocterm","apt-complete.vim","SnippetComplete","Dictionary-List-Replacements","Vimrc-Version-Numbering","mark_tools","rfc-syntax","fontzoom.vim","histwin.vim","vim-addon-fcsh","vim-addon-actions","superSnipMate","bzr-commit","hexHighlight.vim","Multi-Replace","strawimodo","vim-addon-mw-utils","actionscript3id.vim","RubySinatra","ccvext.vim","visualstar.vim","AutomaticLaTeXPlugin","AGTD","bvemu.vim","GoogleSuggest-Complete","The-Max-Impact-Experiment","cflow-output-colorful","SaneCL","c-standard-functions-highlight","Wavefronts-obj","hypergit.vim","hex.vim","csp.vim","load_template","emoticon.vim","emoticon.vim","bisect","groovyindent","liftweb.vim","line-number-yank","neutron.vim","SyntaxMotion.vim","Doxia-APT","daemon_saver.vim","ikiwiki-nav","ucf.vim","ISBN-10-to-EAN-13-converter","sha1.vim","hmac.vim","cucumber.zip","mrkn256.vim","fugitive.vim","blowfish.vim","underwater","trogdor","Parameter-Text-Objects","php-doc-upgrade","ZenCoding.vim","jumphl.vim","qmake--syntax.vim","R-syntax-highlighting","BUGS-language","AddCppClass","loadtags","OpenCL-C-syntax-highlighting","pummode","stickykey","rcom","SaveSigns","ywtxt","Rackup","colorselector","TranslateEnToCn","utlx_interwiki.vim","BackgroundColor.vim","django-template-textobjects","html-advanced-text-objects","candyman.vim","tag_in_new_tab","indentpython","vxfold.vim","simplecommenter","CSSMinister","Twee-Integration-for-Vim","httplog","treemenu.vim","delete-surround-html","tumblr.vim","vspec","tcommand","ColorX","alex.vim","happy.vim","Cppcheck-compiler","vim-addon-completion","spin.vim","EasyOpts","Find-files","Bookmarking","tslime.vim","vimake","Command-T","PickAColor.vim","grsecurity","rename.vim","tex-turkce","motpat.vim","orange","Mahewincs","Vim-Title-Formatter","syntaxhaskell.vim","tesla","XTermEsc","vim-indent-object","noweb.vim","vimgdb","cmd.vim","RST-Tables","css3","clevercss.vim","compilerpython.vim","cmakeref","operator-camelize","scalacommenter.vim","vicom","acomment","smartmove.vim","vimform","changesPlugin","Maynard","Otter.vim","ciscoasa.vim","translit3","vimsizer","tex_mini.vim","lastpos.vim","Manuals","VxLib","256-grayvim","mdark.vim","aftersyntaxc.vim","mayansmoke","repeater.vim","ref.vim","recover.vim","Slidedown-Syntax","ShowMultiBase","reimin","self.vim","kiss.vim","Trac-Wikimarkup","NrrwRgn","ego.vim","Delphi-7-2010","CodeFactory","JavaScript-Indent","tagmaster","qiushibaike","dc.vim","tf2.vim","glyph.vim","OutlookVim","GetFile","vimtl","RTL","Sessions","autocomp.vim","TortoiseTyping","syntax-codecsconf","cvsdiff.vim","yaifa.vim","Silence","PNote","mflrename","nevfn","Tumble","vplinst","tony_light","pyref.vim","legiblelight","truebasic.vim","writebackupToAdjacentDir","GUI-Box","LaTeX-Box","mdx.vim","leglight2","RemoveFile.vim","formatvim","easytags.vim","SingleCompile","CFWheels-Dictionary","fu","skk.vim","tcbuild.vim","grails-vim","django_templates.vim","PySuite","shell.vim","vim-addon-sbt","PIV","xpcomplete","gams","Search-in-Addressbook","teraterm","CountJump","darkBlue","underwater-mod","open-browser.vim","rvm.vim","Vim-Script-Updater","beluga-syntax","tac-syntax","datascript.vim","phd","obsidian","ez_scroll","vim-snipplr","vim-haxe","hgrev","zetavim","quickrun.vim","wmgraphviz","reload.vim","Smooth-Center","session.vim","pytestator","sablecc.vim","CSS-one-line--multi-line-folding","vorax","slang_syntax","ikiwiki-syntax","opencl.vim","gitview","ekini-dark-colorscheme","pep8","pyflakes","tabops","endline","pythondo","obviously-insert","toggle_mouse","regbuf.vim","mojo.vim","luainspect.vim","pw","phpcomplete.vim","SyntaxComplete","vimgcwsyntax","JsLint-Helper","Haskell-Highlight-Enhanced","typeredeemer","BusierBee","Shapley-Values","help_movement","diff_movement","fortunes_movement","mail_movement","CSS3-Highlights","vimpluginloader","jsonvim","vimstuff","vimargumentchec","vimcompcrtr","vimoop","yamlvim","DokuVimKi","jade.vim","v4daemon","ovim","Starting-.vimrc","gedim","current-func-info.vim","undofile.vim","vim-addon-ocaml","Haskell-Conceal","trailing-whitespace","rdark-terminal","mantip","htip","python_showpydoc.vim","tangoshady","bundler","cHiTags","Quotes","Smart-Parentheses","operator-reverse","python_showpydoc","rslTools","presets","View-Ports","Replay.vim","qnamebuf","processing-snipmate","ProjectTag","Better-CSS-Syntax-for-Vim","indexer.tar.gz","285colors-with-az-menu","LanguageTool","VIM-Color-Picker","Flex-4","lodestone","Simple-Javascript-Indenter","porter-stem","stem-search","TeX-PDF","PyInteractive","HTML5-Syntax-File","VimgrepBuffer","ToggleLineNumberMode","showcolor.vim","html5.vim","blockinsert","LimitWindowSize","minibufexplorerpp","tdvim_FoldDigest","bufsurf","Open-associated-programs","aspnetide.vim","Timer-routine","Heliotrope","CaptureClipboard","Shades-of-Amber","Zephyr-Color-Scheme","Jasmine-snippets-for-snipMate","swap","RubyProxy","L9","makesd.vim","ora-workbench","sequence","phaver","Say-Time","pyunit","clang","Son-of-Obisidian","Selenitic","diff-fold.vim","Bird-Syntax","Vimtodo","cSyntaxAfter","Code.Blocks-Dark","omnetpp","command-list","open_file_from_clip_board","CommandWithMutableRange","RangeMacro","tchaba","kirikiri.vim","Liquid-Carbon","actionscript.vim","ProjectCTags","Python-2.x-Standard-Library-Reference","Python-3.x-Standard-Library-Reference","ProjectParse","Tabbi","run_python_tests","eregex.vim","OMNeTpp4.x-NED-Syntax-file","Quotes","looks","Lite-Tab-Page","Show-mandictperldocpydocphpdoc-use-K","newsprint.vim","pf_earth.vim","RevealExtends","openurl.vim","southernlights","numbered.vim","grass.vim","toggle_option","idp.vim","sjump.vim","vim_faq","Sorcerer","up.vim","TrimBlank","clang-complete","smartbd","Gundo","altera_sta.vim","altera.vim","vim-addon-async","vim-refact","vydark","gdb4vim","savemap.vim","operator-html-escape","Mizore","maxivim","vim-addon-json-encoding","tohtml_wincp","vim-addon-signs","unite-colorscheme","unite-font","vim-addon-xdebug","VimCoder.jar","FTPDEV","lilypink","js-mask","vim-fileutils","stakeholders","PyScratch","Blueshift","VimCalc","unite-locate","lua_omni","verilog_systemverilog_fix","mheg","void","VIP","Smart-Home-Key","tracwiki","newspaper.vim","rdist-syntax","zenesque.vim","auto","VimOrganizer","stackoverflow.vim","preview","inccomplete","screen_line_jumper","chance-of-storm","unite-gem","devbox-dark-256","lastchange.vim","qthelp","auto_mkdir","jbosslog","wesnothcfg.vim","UnconditionalPaste","unite-yarm","NERD_Tree-and-ack","tabpagecolorscheme","Figlet.vim","Peasy","Indent-Guides","janitor.vim","southwest-fog","Ceasy","txt.vim","Shebang","vimblogger_ft","List-File","softbluev2","eteSkeleton","hdl_plugin","blockle.vim","ColorSelect","notes.vim","FanVim","Vimblr","vcslogdiff","JumpNextLongLine","vimorator","emacsmodeline.vim","textobj-rubyblock","StatusLineHighlight","shadow.vim","csc.vim","JumpToLastOccurrence","perfect.vim","polytonic.utf-8.spl","opencl.vim","iim.vim","line-based_jump_memory.vim","hdl_plugin","localrc.vim","BOOKMARKS--Mark-and-Highlight-Full-Lines","chapa","unite.vim","neverland.vim--All-colorschemes-suck","fokus","phpunit","vim-creole","Search-Google","mophiaSmoke","mophiaDark","Google-translator","auto-kk","update_perl_line_directives","headerGatesAdd.vim","JellyX","HJKL","nclipper.vim","syntax_check_embedded_perl.vim","xterm-color-table.vim","zazen","bocau","supp.vim","w3cvalidator","toner.vim","QCL-syntax-hilighting","kkruby.vim","hdl_plugin","Mind_syntax","Comment-Squawk","neco-ghc","pytest.vim","Enhanced-Javascript-syntax","LispXp","Nazca","obsidian2.vim","vim-addon-sml","pep8","AsyncCommand","lazysnipmate","Biorhythm","IniParser","codepath.vim","twilight256.vim","PreciseJump","cscope_plus.vim","Cobaltish","neco-look","XFST-syntax-file","Royal-Colorschemes","pbcopy.vim","golded.vim","Getafe","ParseJSON","activity-log","File-Case-Enforcer","Microchip-Linker-Script-syntax-file","RST-Tables-works-with-non-english-langu","lexctwolc-Syntax-Highlighter","mxl.vim","fecompressor.vim","Flog","Headlights","Chess-files-.pgn-extension","vim-paint","vundle","funprototypes.vim","SVF-syntax","indentpython.vim","Compile","dragon","Tabular","Tagbar","vimake-vim-programmers-ide","align","windows-sif-syntax","csc.snippets","tidydiff","latte","thermometer","Clean","Neopro","Vim-Blog","bitly.vim","bad-apple","robokai","makebg","asp.net","Atom","vim-remote","IPC-syntax-highlight","PyREPL.vim","phrase.vim","virtualenv.vim","reporoot.vim","rebar","urilib","visualctrlg","textmanip.vim","compilerg95.vim","Risto-Color-Scheme","underlinetag","paper","compilergfortran.vim","compilerifort.vim","Scala-argument-formatter","FindEverything","vim_etx","emacs-like-macro-recorder","To-Upper-case-case-changer","vim-erlang-skeleteons","taglist-plus","PasteBin.vim","compilerpcc.vim","scrnpipe.vim","TeX-9","extradite.vim","VimRepress","text-object-left-and-right","Scala-Java-Edit","vim-stylus","vim-activator","VimOutliner","avr8bit.vim","iconv","accentuate.vim","Solarized","Gravity","SAS-Syntax","gem.vim","vim-scala","Rename","EasyMotion","boost.vim","ciscoacl.vim","Distinguished","mush.vim","cmdline-completion","UltraBlog","GetFilePlus","strange","vim-task","Tab-Manager","XPath-Search","plantuml-syntax","rvmprompt.vim","Save-Current-Font","fatrat.vim","Sesiones.vim","opener.vim","cascading.vim","Google-Translate","molly.vim","jianfan","Dagon","plexer","vim-online","gsearch","Message-Formatter","sudoku_game","emacscommandline","fso","openscad.vim","editqf","visual-increment","gtrans.vim","PairTools","Table-Helper","DayTimeColorer","Amethyst","hier","Javascript-OmniCompletion-with-YUI-and-j","m2sh.vim","colorizer","Tabs-only-for-indentation","modelica","terse","dogmatic.vim","ro-when-swapfound","quit-another-window","gitv","Enter-Indent","jshint.vim","pacmanlog.vim","lastmod.vim","ignore-me","vim-textobj-quoted","simplenote.vim","Comceal","checklist.vim","typofree.vim","Redhawk-Vim-Plugin","vim-soy","Find-XML-Tags","cake.vim","vim-coffee-script","browserprint","jovial.vim","pdub","ucompleteme","ethna-switch","Fanfou.vim","colorv.vim","Advancer-Abbreviation","Auto-Pairs","octave.vim","cmdline-insertdatetime","reorder-columns","calm","nicer-vim-regexps","listtag","Diablo3","vim_django","nautilus-py-vim","IDLE","operator-star","XQuery-indentomnicompleteftplugin","browsereload-mac.vim","splitjoin.vim","vimshell-ssh","ShowMarks7","warez-colorscheme","Quicksilver.vim","wikilink","Buffergator","Buffersaurus","ri-viewer","beautiful-pastebin","chef.vim","indsas","lua.vim","AutoSaveSetting","resizewin","cpp_gnuchlog.vim","tangolight","IDSearch","frawor","git_patch_tags.vim","snipmate-snippets","widl.vim","WinFastFind","ReplaceFile","gUnit-syntax","Handlebars","svnst.vim","The-Old-Ones","Atomic-Save","vim-orgmode","Vimper-IDE","vimgtd","gnupg.vim","Filesearch","VimLite","AutoCpp","simpleRGB","cakephp.vim","googleclosurevim","vim-task-org","brep","vrackets","xorium.vim","transpose-words","Powershell-FTDetect","LycosaExplorer","ldap_schema.vim","Lookup","Intelligent-Tags","lemon.vim","SnipMgr","repeat-motion","skyWeb","Toxic","sgmlendtag","rake.vim","orangeocean256","cdevframework","textgenshi.vim","aldmeris","univresal-blue-scheme","cab.vim","copy-as-rtf","baobaozhu","rfc5424","saturn.vim","tablistlite.vim","functionlist.vim","hints_opengl.vim","wikiatovimhelp","ctags_cache","werks.vim","RegImap","Calm-Breeze","Rst-edit-block-in-tab","Ambient-Color-Scheme","golden-ratio","annotatedmarks","quickhl.vim","FixCSS.vim","enablelvimrc.vim","commentary.vim","prefixer.vim","cssbaseline.vim","html_emogrifier.vim","Premailer.vim","tryit.vim","fthook.vim","sql.vim","zim-syntax","Transcription-Name-Helper","Rcode","obvious-resize","lemon256","swapcol.vim","vim-ipython","EasyPeasy","chinachess.vim","tabpage.vim","tabasco","light2011","numlist.vim","fuzzee.vim","SnippetySnip","melt-syntax","diffwindow_movement","noweboutline.vim","Threesome","quickfixstatus.vim","SimpylFold","indent-motion","mcabberlog.vim","easychair","right_align","galaxy.vim","vim-pandoc","putcmd.vim","vim-rpsl","olga_key","statusline.vim","bad-whitespace","ctrlp.vim","sexy-railscasts","TagmaTips","blue_sky","gccsingle.vim","kiwi.vim","mediawiki","Vimerl","MarkdownFootnotes","linediff.vim","watchdog.vim","syntaxdosini.vim","pylint-mode","NagelfarVim","TclShell","google_prettify.vim","Vimpy","vim-pad","baancomplete","racket.vim","scribble.vim","racket-auto-keywords.vim","Ambient-Theme","White","vim-dokuwiki","slide-show","Speech","vim-google-scribe","fcitx.vim","TagmaTasks","vimroom.vim","MapFinder","mappingmanager","ahkcomplete","Python-mode-klen","tagfinder.vim","rainbow_parentheses.vim","Lyrics","abbott.vim","wiki.vim","todotxt.vim","RST-Tables-CJK","utags","mango.vim","indentfolds","Twilight-for-python","Python-Syntax","vim-json-bundle","VIM-Metaprogramming","statline","SonicTemplate.vim","vim-mnml","Tagma-Buffer-Manager","desert-warm-256","html-source-explorer","codepaper","php-doc","Cpp11-Syntax-Support","node.js","Cleanroom","anwolib","fontforge_script.vim","prop.vim","vim-symbols-strings","vim-diff","openrel.vim","apg.vim","TFS","ipi","RSTO","project.vim","tex_AutoKeymap","log.vim","mirodark","vim-kickstart","MatchTag","Lisper.vim","Dart","vim-ocaml-conceal","csslint.vim","nu42dark-color-scheme","Colour-theme-neon-pk","simple_bookmarks.vim","modeleasy-vim-plugin","aurum","inline_edit.vim","better-snipmate-snippet","LastBuf.vim","SchemeXp","TVO--The-Vim-Outliner-with-asciidoc-supp","yankstack","vim-octopress","ChickenMetaXp","ChickenSetupXp","nscripter.vim","weibo.vim","vim-python-virtualenv","vim-django-support","nose.vim","nodeunit.vim","SpellCheck","lrc.vim","cue.vim","visualrepeat","git-time-lapse","boolpat.vim","Mark-Ring","Festoon","dokuwiki","unite-scriptenames","ide","tocdown","Word-Fuzzy-Completion","rmvim","Xoria256m","shelp","Lawrencium","grads.vim","epegzz.vim","Eddie.vim","behat.zip","phidgets.vim","gtags-multiwindow-browsing","lightdiff","vm.vim","SmartusLine","vimprj","turbux.vim","html-xml-tag-matcher","git-diff","ft_improved","nerdtree-ack","ambicmd.vim","fountain.vim","Powerline","EasyDigraph.vim","autosess","DfrankUtil","ruscmd","textobj-line","Independence","qtpy.vim","switch-buffer-quickly","simple-dark","gf-user","gf-diff","viewdoc","Limbo-syntax","rhinestones","buffet.vim","pwdstatus.vim","gtk-mode","indentjava.vim","coffee-check.vim-B","coffee-check.vim","compot","xsnippet","nsl.vim","vombato-colorscheme","ocamlMultiAnnot","mozpp.vim","mozjs.vim","e2.lua","gmlua.vim","vim-punto-switcher","toggle_comment","CapsulaPigmentorum.vim","CompleteHelper","CamelCaseComplete","vim-addon-haskell","tagport","cd-hook","pfldap.vim","WhiteWash","TagmaLast","Gummybears","taskmanagementvim","flymaker","ditaa","lout.vim","vim-flake8","phpcs.vim","badwolf","jbi.vim","Vim-Support","murphi.vim","argumentative.vim","editorconfig-vim","thinkpad.vim","Coverity-compiler-plugin","vim-wmfs","Trailer-Trash","ipyqtmacvim.vim","writebackupAutomator","CodeCommenter","sandbox_hg","pdv-standalone","Yii-API-manual-for-Vim","fountainwiki.vim","hop-language-syntax-highlight","Skittles-Berry","django.vim","pyunit.vim","EasyColour","tmpclip.vim","Improved-paragraph-motion","tortex","Add-to-Word-Search","fwk-notes","calendar.vim","mystatusinfo.vim","workflowish","tabman.vim","flashdevelop.vim","hammer.vim","Colorizer--Brabandt","less-syntax","DynamicSigns","ShowTrailingWhitespace","DeleteTrailingWhitespace","JumpToTrailingWhitespace","source.vim","mediawiki.vim","regexroute.vim","css3-syntax-plus","diff-toggle","showmarks2","Finder-for-vim","vim-human-dates","vim-addon-commenting","cudajinja.vim","vim-pomodoro","phpqa","TaskMotions","ConflictMotions","Sauce","gitvimrc.vim","instant-markdown.vim","vroom","portmon","spacebox.vim","paredit.vim","Ayumi","Clam","vim_movement","vbs_movement","dosbatch_movement","TextTransform","HyperList","python-imports.vim","youdao.dict","XDebug-DBGp-client-for-PHP","Vim-Gromacs","vimux","Vimpy--Stoner","readnovel","Vitality","close-duplicate-tabs","StripWhiteSpaces","vim-jsbeautify","clean_imports","WebAPI.vim","flipwords.vim","restore_view.vim","SpaceBetween","autolink","vim-addon-rdebug","DBGp-X-client","Splice","vim-htmldjango_omnicomplete","vim-addon-ruby-debug-ide","a-new-txt2tags-syntax","vim-cpp-auto-include","rstatusline","muxmate","vim4rally","SAS-Indent","modx","ucpp-vim-syntax","bestfriend.vim","vim-dasm","evervim","Fortune-vimtips","VDBI.vim","Ideone.vim","neocomplcache-snippets_complete","RbREPL.vim","AmbiCompletion","london.vim","jsruntime.vim","maven-plugin","vim-mou","Transpose","PHPUnit-QF","TimeTap","jsoncodecs.vim","jsflakes.vim","jsflakes","DBGPavim","nosyntaxwords","mathematic.vim","vtimer.vim","_jsbeautify","license-loader","cmdpathup","matchindent.vim","automatic-for-Verilog--guo","lingodirector.vim--Pawlik","Ubloh-Color-Scheme","html_FileCompletion","PyChimp","sonoma.vim","highlights-for-radiologist","Xdebug","burnttoast256","vmark.vim--Visual-Bookmarking","gprof.vim","jshint.vim--Stelmach","sourcebeautify.vim","HgCi","EscapeBchars","cscope.vim","php-cs-fixer","cst","OnSyntaxChange","python_fold_compact","EditPlus"] \ No newline at end of file diff --git a/vim/bundle/ctrlp.vim/readme.md b/vim/bundle/ctrlp.vim/readme.md index bcd07c7..d495fff 100644 --- a/vim/bundle/ctrlp.vim/readme.md +++ b/vim/bundle/ctrlp.vim/readme.md @@ -1,3 +1,6 @@ +#**This project is unmaintained** +**You should use [this fork](https://github.com/ctrlpvim/ctrlp.vim) instead.** + # ctrlp.vim Full path fuzzy __file__, __buffer__, __mru__, __tag__, __...__ finder for Vim. diff --git a/vim/bundle/dart-vim-plugin b/vim/bundle/dart-vim-plugin new file mode 160000 index 0000000..41c48d7 --- /dev/null +++ b/vim/bundle/dart-vim-plugin @@ -0,0 +1 @@ +Subproject commit 41c48d79385f4c61318887d89703e09102628c86 diff --git a/vim/bundle/dash.vim b/vim/bundle/dash.vim index 4b01b6c..25b17d9 160000 --- a/vim/bundle/dash.vim +++ b/vim/bundle/dash.vim @@ -1 +1 @@ -Subproject commit 4b01b6cd20fb77089b4222133c791602d140d901 +Subproject commit 25b17d9488454a1fcdbb2cbe829a23226f95e3c2 diff --git a/vim/bundle/gist-vim b/vim/bundle/gist-vim index 6130b8e..f0d6357 160000 --- a/vim/bundle/gist-vim +++ b/vim/bundle/gist-vim @@ -1 +1 @@ -Subproject commit 6130b8ee438ad55572c5de1cb974ef824163a1f4 +Subproject commit f0d63579eab7548cf12f979dc52ef5a370ecbe63 diff --git a/vim/bundle/phoenix.vim b/vim/bundle/phoenix.vim new file mode 160000 index 0000000..723be12 --- /dev/null +++ b/vim/bundle/phoenix.vim @@ -0,0 +1 @@ +Subproject commit 723be122f14a97246023190cee5f2f473ee8ec7b diff --git a/vim/bundle/quickfixsigns_vim/.gitignore b/vim/bundle/quickfixsigns_vim/.gitignore index b9a9d10..281c01d 100644 --- a/vim/bundle/quickfixsigns_vim/.gitignore +++ b/vim/bundle/quickfixsigns_vim/.gitignore @@ -8,3 +8,5 @@ TODO_archived.viki .last_* test test_* +tmp +var diff --git a/vim/bundle/quickfixsigns_vim/LICENSE.TXT b/vim/bundle/quickfixsigns_vim/LICENSE.TXT new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/vim/bundle/quickfixsigns_vim/LICENSE.TXT @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/vim/bundle/quickfixsigns_vim/README b/vim/bundle/quickfixsigns_vim/README index f34a235..844c199 100644 --- a/vim/bundle/quickfixsigns_vim/README +++ b/vim/bundle/quickfixsigns_vim/README @@ -9,8 +9,10 @@ Display |signs| at interesting lines: - relative line numbers (show numbers only until the cursor moves; this requires that you add the following command to |vimrc|: > noremap :call quickfixsigns#RelNumbersOnce() - - long lines (see |g:quickfixsigns_class_longlines| for details) -< - etc. +< - long lines (see |g:quickfixsigns_class_longlines| for details) + - VCS merge conflict markers (Users have to enable this sign class + by adding 'vcsmerge' to |g:quickfixsigns_classes|) + - etc. Other lists can be configured via the |g:quickfixsigns_lists| variable. @@ -57,8 +59,27 @@ http://openiconlibrary.sourceforge.net for details. ----------------------------------------------------------------------- +Install~ + +Edit the vba file and type: > + + :so % + +See :help vimball for details. If you have difficulties or use vim 7.0, +please make sure, you have the current version of vimball +(vimscript #1502) installed or update your runtime. + + +Optional enhancements~ + +If tinykeymap (vimscript #4199) is installed, a map (see +|g:tinykeymap#map#quickfixsigns#map|, which defaults to ms) can be used +to jump from sign to sign or between sign groups. + + + + + +License: GPLv3 or later -Status: Works for me (there may be some minor quirks) -Install: See http://github.com/tomtom/vimtlib/blob/master/INSTALL.TXT -See http://github.com/tomtom for related plugins. diff --git a/vim/bundle/quickfixsigns_vim/_tplugin.vim b/vim/bundle/quickfixsigns_vim/_tplugin.vim deleted file mode 100644 index c180fc2..0000000 --- a/vim/bundle/quickfixsigns_vim/_tplugin.vim +++ /dev/null @@ -1,2 +0,0 @@ -TPluginBefore \ 0 - hi QuickFixSignsDiffAdd ctermfg=0 ctermbg=2 guifg=black guibg=green - hi QuickFixSignsDiffDelete ctermfg=0 ctermbg=1 guifg=yellow guibg=red - hi QuickFixSignsDiffChange ctermfg=0 ctermbg=3 guifg=black guibg=yellow +if !exists('g:quickfixsigns#vcsdiff#use_hidef') + let g:quickfixsigns#vcsdiff#use_hidef = 1 "{{{2 +endif + + +if !exists('g:quickfixsigns#vcsdiff#revision') + " Choose a different branch/revision instead of the latest change. + " By default, the head/last/master branch is selected -- see also + " |g:quickfixsigns#vcsdiff#vcs|. + " Can also be buffer local b:quickfixsigns_vcsdiff_revision or vcs + " specific as g:quickfixsigns#vcsdiff#revision_{type}. + let g:quickfixsigns#vcsdiff#revision = s:UNSET_STRING "{{{2 +endif + + +if !exists('g:quickfixsigns#vcsdiff#extra_args') + " Extra arguments. + " Can also be buffer local b:quickfixsigns_vcsdiff_extra_args or vcs + " specific as g:quickfixsigns#vcsdiff#extra_args_{type}. + let g:quickfixsigns#vcsdiff#extra_args = s:UNSET_STRING "{{{2 +endif + + +if g:quickfixsigns#vcsdiff#use_hidef && len(filter(values(g:quickfixsigns#vcsdiff#highlight), 'v:val =~# ''^QuickFixSignsDiff''')) > 0 + function! s:SetHighlight() abort + hi QuickFixSignsDiffAdd ctermfg=0 ctermbg=2 guifg=black guibg=green + hi QuickFixSignsDiffDelete ctermfg=0 ctermbg=1 guifg=yellow guibg=red + hi QuickFixSignsDiffChange ctermfg=0 ctermbg=3 guifg=black guibg=yellow + endf + + augroup QuickFixSigns + autocmd ColorScheme * call s:SetHighlight() + augroup END + + call s:SetHighlight() endif @@ -119,7 +153,7 @@ if g:quickfixsigns#vcsdiff#del_numbered let g:quickfixsigns#vcsdiff#highlight['DEL'. s:i] = g:quickfixsigns#vcsdiff#highlight.DEL endif if index(g:quickfixsigns_signs, 'QFS_VCS_DEL'. s:i) == -1 - let s:text = s:i == 'M' ? '-' : s:i + let s:text = s:i ==# 'M' ? '-' : s:i exec 'sign define QFS_VCS_DEL'. s:i 'text=-'. s:text 'texthl='. g:quickfixsigns#vcsdiff#highlight.DEL endif unlet! s:i s:text @@ -128,17 +162,16 @@ endif function! s:Config(vcs_type) abort "{{{3 + let cfg = get(g:quickfixsigns#vcsdiff#vcs, a:vcs_type, {}) if exists('g:quickfixsigns#vcsdiff#vcs_'. a:vcs_type) - let cfg = g:quickfixsigns#vcsdiff#vcs_{a:vcs_type} - else - let cfg = get(g:quickfixsigns#vcsdiff#vcs, a:vcs_type, {}) + let cfg = extend(cfg, g:quickfixsigns#vcsdiff#vcs_{a:vcs_type}) endif return cfg endf " :nodoc: -function! quickfixsigns#vcsdiff#Signs(item) "{{{3 +function! quickfixsigns#vcsdiff#Signs(item) abort "{{{3 return 'QFS_VCS_'. a:item.change endf @@ -151,7 +184,7 @@ endf " - b:VCSCommandVCSType " " If none of these variables is defined, try to guess the vcs type. -function! quickfixsigns#vcsdiff#GuessType() "{{{3 +function! quickfixsigns#vcsdiff#GuessType() abort "{{{3 if exists('b:vcs_type') let type = b:vcs_type else @@ -200,41 +233,49 @@ endf " Get the list of vcsdiff signs (uncached). -function! quickfixsigns#vcsdiff#GetList(filename) "{{{3 - let list_type = g:quickfixsigns#vcsdiff#list_type - if !(type(list_type) == 0 && list_type >= 0 && list_type <= 1) - throw "Quickfixsigns: g:quickfixsigns#vcsdiff#list_type must be 0 or 1 but was ". list_type - endif - unlet! b:qfs_vcsdiff_hunkstat b:qfs_vcsdiff_list b:qfs_vcsdiff_hunkstat_str - return quickfixsigns#vcsdiff#GetList{list_type}(a:filename) +function! quickfixsigns#vcsdiff#GetList(filename) abort "{{{3 + call quickfixsigns#vcsdiff#ClearCache() + return quickfixsigns#vcsdiff#GetListCached(a:filename) endf " Get the list of vcsdiff signs (cached). " The cache is invalidated wthen quickfixsigns#vcsdiff#GetList is called. -function! quickfixsigns#vcsdiff#GetListCached(filename) "{{{3 - if !exists('b:qfs_vcsdiff_list') - let b:qfs_vcsdiff_list = quickfixsigns#vcsdiff#GetList(a:filename) +function! quickfixsigns#vcsdiff#GetListCached(filename) abort "{{{3 + if get(b:, 'qfs_vcsdiff_list', s:UNSET_LIST) is s:UNSET_LIST + let list_type = g:quickfixsigns#vcsdiff#list_type + if !(type(list_type) == 0 && list_type >= 0 && list_type <= 1) + throw 'Quickfixsigns: g:quickfixsigns#vcsdiff#list_type must be 0 or 1 but was '. list_type + endif + let b:qfs_vcsdiff_list = quickfixsigns#vcsdiff#GetList{list_type}(a:filename) endif return b:qfs_vcsdiff_list endf +function! quickfixsigns#vcsdiff#ClearCache(...) abort + let bufnr = a:0 ? a:1 : bufnr('%') + call setbufvar(bufnr, 'qfs_vcsdiff_list', s:UNSET_LIST) + call setbufvar(bufnr, 'qfs_vcsdiff_hunkstat', s:UNSET_LIST) + call setbufvar(bufnr, 'qfs_vcsdiff_hunkstat_str', s:UNSET_STRING) +endfunction + + " Get status of VCS changes as [added, modified, removed]. -function! quickfixsigns#vcsdiff#GetHunkSummary(...) "{{{3 - let filename = a:0 ? a:1 : expand("%") - if filename == '' +function! quickfixsigns#vcsdiff#GetHunkSummary(...) abort "{{{3 + let filename = a:0 ? a:1 : expand('%') + if empty(filename) return [0, 0, 0] endif - if !exists('b:qfs_vcsdiff_hunkstat') + if get(b:, 'qfs_vcsdiff_hunkstat', s:UNSET_LIST) is s:UNSET_LIST let list = quickfixsigns#vcsdiff#GetListCached(filename) let r = [0, 0, 0] " added, modified, removed. for item in list - if item.change == 'ADD' + if item.change ==# 'ADD' let r[0] += 1 - elseif item.change == 'CHANGE' + elseif item.change ==# 'CHANGE' let r[1] += 1 - elseif item.change == 'DEL' + elseif item.change[0:2] ==# 'DEL' let r[2] += 1 endif endfor @@ -245,8 +286,8 @@ endf " Get status of VCS changes as string. -function! quickfixsigns#vcsdiff#GetHunkSummaryAsString(...) "{{{3 - if !exists('b:qfs_vcsdiff_hunkstat_str') +function! quickfixsigns#vcsdiff#GetHunkSummaryAsString(...) abort "{{{3 + if get(b:, 'qfs_vcsdiff_hunkstat_str', s:UNSET_STRING) is s:UNSET_STRING let r = call('quickfixsigns#vcsdiff#GetHunkSummary', a:000) if r[0] + r[1] + r[2] == 0 let b:qfs_vcsdiff_hunkstat_str = '' @@ -260,31 +301,24 @@ endf " quickfixsigns#vcsdiff#GuessType() must return the name of a supported " VCS (see |g:quickfixsigns#vcsdiff#vcs|). -function! quickfixsigns#vcsdiff#GetList0(filename) "{{{3 - if &buftype =~ '\<\(nofile\|quickfix\|help\)\>' || &previewwindow || exists('b:fugitive_type') +function! quickfixsigns#vcsdiff#GetList0(filename) abort "{{{3 + if &buftype =~# '\<\(nofile\|quickfix\|help\)\>' || &previewwindow || exists('b:fugitive_type') return [] endif let vcs_type = quickfixsigns#vcsdiff#GuessType() " TLogVAR a:filename, vcs_type " Ignore files that are not readable if !empty(s:Config(vcs_type)) && filereadable(a:filename) - let cmdt = s:Config(vcs_type).cmd - let dir = fnamemodify(a:filename, ':h') - let file = fnamemodify(a:filename, ':t') - let cmds = join([ - \ printf("%s %s", g:quickfixsigns#vcsdiff#cd, shellescape(dir)), - \ printf(cmdt, shellescape(file)) - \ ], g:quickfixsigns#vcsdiff#cmd_separator) " TLogVAR cmds - let diff = system(cmds) + let diff = s:Diff(a:filename, vcs_type) " TLogVAR diff - let bufnr = bufnr('%') - let bufdiff = exists('b:quickfixsigns_vcsdiff') ? b:quickfixsigns_vcsdiff : '' if !empty(diff) + let bufnr = bufnr('%') + let bufdiff = exists('b:quickfixsigns_vcsdiff') ? b:quickfixsigns_vcsdiff : '' if diff != bufdiff || !exists('b:quickfixsigns_vcsdiff_signs') let b:quickfixsigns_vcsdiff = diff if g:quickfixsigns_debug && bufnr != bufnr(a:filename) - echom "QuickFixSigns DEBUG: bufnr mismatch:" a:filename bufnr bufnr(a:filename) + echom 'QuickFixSigns DEBUG: bufnr mismatch:' a:filename bufnr bufnr(a:filename) endif let lastlnum = line('$') let lines = split(diff, '\n') @@ -294,14 +328,14 @@ function! quickfixsigns#vcsdiff#GetList0(filename) "{{{3 let last_change_lnum = 0 let last_del = 0 for line in lines - if line =~ '^@@\s' + if line =~# '^@@\s' let m = matchlist(line, '^@@ -\(\d\+\)\(,\d\+\)\? +\(\d\+\)\(,\d\+\)\? @@') " TLogVAR line, m let to = str2nr(m[3]) " TLogVAR "@@", to " let change_lnum = m[1] let from = to - elseif line =~ '^@@@\s' + elseif line =~# '^@@@\s' let m = matchlist(line, '^@@@ -\(\d\+\)\(,\d\+\)\? -\(\d\+\)\(,\d\+\)\? +\(\d\+\)\(,\d\+\)\? @@@') " TLogVAR line, m let to = str2nr(m[5]) @@ -311,12 +345,12 @@ function! quickfixsigns#vcsdiff#GetList0(filename) "{{{3 elseif from < 0 continue else - if line[0] == '-' + if line[0] ==# '-' let change = 'DEL' let text = line let change_lnum = from let from += 1 - elseif line[0] == '+' + elseif line[0] ==# '+' let change = 'ADD' let text = line let change_lnum = to @@ -334,18 +368,18 @@ function! quickfixsigns#vcsdiff#GetList0(filename) "{{{3 let change_lnum = lastlnum endif if !empty(change) && has_key(change_defs, change_lnum) - if change_defs[change_lnum].change == 'CHANGE' || change_defs[change_lnum].change != change + if change_defs[change_lnum].change ==# 'CHANGE' || change_defs[change_lnum].change != change let change = 'CHANGE' endif let text = s:BalloonJoin(change_defs[change_lnum].text, line) endif - if last_change_lnum > 0 && last_del > 0 && change_lnum == last_del + 1 && change == 'DEL' && change_defs[last_change_lnum].change == 'DEL' + if last_change_lnum > 0 && last_del > 0 && change_lnum == last_del + 1 && change ==# 'DEL' && change_defs[last_change_lnum].change ==# 'DEL' let change_defs[last_change_lnum].text = s:BalloonJoin(change_defs[last_change_lnum].text, text) else let change_defs[change_lnum] = {'change': change, 'text': text} let last_change_lnum = change_lnum endif - if change == 'DEL' || change == 'CHANGE' + if change ==# 'DEL' || change ==# 'CHANGE' let last_del = change_lnum endif endif @@ -359,10 +393,10 @@ function! quickfixsigns#vcsdiff#GetList0(filename) "{{{3 " if change_def.change == 'DEL' && lnum < line('$') && !has_key(change_defs, lnum + 1) " let lnum += 1 " endif - let text = s:BalloonJoin(change_def.change .":", change_def.text) + let text = s:BalloonJoin(change_def.change .':', change_def.text) " TLogVAR bufnr, lnum, change_def.change, text - call add(signs, {"bufnr": bufnr, "lnum": lnum, - \ "change": change_def.change, "text": text}) + call add(signs, {'bufnr': bufnr, 'lnum': lnum, + \ 'change': change_def.change, 'text': text}) endfor " TLogVAR signs let b:quickfixsigns_vcsdiff_signs = copy(signs) @@ -381,31 +415,24 @@ endf " This version by Chronial works more like diff -y (see " https://github.com/Chronial/vim-quickfixsigns/commit/1cf739c790746157c3cb9b6234c1454333397c9e " for details). -function! quickfixsigns#vcsdiff#GetList1(filename) "{{{3 - if &buftype =~ '\<\(nofile\|quickfix\|help\)\>' || &previewwindow || exists('b:fugitive_type') +function! quickfixsigns#vcsdiff#GetList1(filename) abort "{{{3 + if &buftype =~# '\<\(nofile\|quickfix\|help\)\>' || &previewwindow || exists('b:fugitive_type') return [] endif let vcs_type = quickfixsigns#vcsdiff#GuessType() " TLogVAR a:filename, vcs_type " Ignore files that are not readable if !empty(s:Config(vcs_type)) && filereadable(a:filename) - let cmdt = s:Config(vcs_type).cmd - let dir = fnamemodify(a:filename, ':h') - let file = fnamemodify(a:filename, ':t') - let cmds = join([ - \ printf("%s %s", g:quickfixsigns#vcsdiff#cd, shellescape(dir)), - \ printf(cmdt, shellescape(file)) - \ ], g:quickfixsigns#vcsdiff#cmd_separator) " TLogVAR cmds - let diff = system(cmds) + let diff = s:Diff(a:filename, vcs_type) " TLogVAR diff - let bufnr = bufnr('%') - let bufdiff = exists('b:quickfixsigns_vcsdiff') ? b:quickfixsigns_vcsdiff : '' if !empty(diff) + let bufnr = bufnr('%') + let bufdiff = exists('b:quickfixsigns_vcsdiff') ? b:quickfixsigns_vcsdiff : '' if diff != bufdiff || !exists('b:quickfixsigns_vcsdiff_signs') let b:quickfixsigns_vcsdiff = diff if g:quickfixsigns_debug && bufnr != bufnr(a:filename) - echom "QuickFixSigns DEBUG: bufnr mismatch:" a:filename bufnr bufnr(a:filename) + echom 'QuickFixSigns DEBUG: bufnr mismatch:' a:filename bufnr bufnr(a:filename) endif let lastlnum = line('$') let lines = split(diff, '\n') @@ -413,14 +440,14 @@ function! quickfixsigns#vcsdiff#GetList1(filename) "{{{3 let from = -1 let to = -1 let block_start = -1 - let block_text = "" + let block_text = '' for line in lines - if line =~ '^@' - if line =~ '^@@\s' + if line =~# '^@' + if line =~# '^@@\s' let m = matchlist(line, '^@@ -\(\d\+\)\(,\d\+\)\? +\(\d\+\)\(,\d\+\)\? @@') let to = str2nr(m[3]) " TLogVAR "@@", to - elseif line =~ '^@@@\s' + elseif line =~# '^@@@\s' let m = matchlist(line, '^@@@ -\(\d\+\)\(,\d\+\)\? -\(\d\+\)\(,\d\+\)\? +\(\d\+\)\(,\d\+\)\? @@@') let to = str2nr(m[5]) " TLogVAR "@@@", to @@ -434,12 +461,12 @@ function! quickfixsigns#vcsdiff#GetList1(filename) "{{{3 else " Note: This algorithm assumes that all the deletions " per hunk will come before the insertions - if line[0] == '-' + if line[0] ==# '-' let change = 'DEL' let block_text = s:BalloonJoin(block_text, line) let change_lnum = from let from += 1 - elseif line[0] == '+' + elseif line[0] ==# '+' let change = to > from - 1 ? 'ADD' : 'CHANGE' let change_lnum = to let to += 1 @@ -455,7 +482,7 @@ function! quickfixsigns#vcsdiff#GetList1(filename) "{{{3 elseif change_lnum > lastlnum let change_lnum = lastlnum endif - if change == 'DEL' + if change ==# 'DEL' if g:quickfixsigns#vcsdiff#del_numbered let ldiff = from - block_start " TLogVAR block_start, from, to, ldiff @@ -485,8 +512,8 @@ function! quickfixsigns#vcsdiff#GetList1(filename) "{{{3 " let lnum += 1 " endif " TLogVAR bufnr, lnum, change_def.change, change_def.text - call add(signs, {"bufnr": bufnr, "lnum": lnum, - \ "change": change_def.change, "text": change_def.text}) + call add(signs, {'bufnr': bufnr, 'lnum': lnum, + \ 'change': change_def.change, 'text': change_def.text}) endfor " TLogVAR signs let b:quickfixsigns_vcsdiff_signs = copy(signs) @@ -500,7 +527,7 @@ function! quickfixsigns#vcsdiff#GetList1(filename) "{{{3 endf -function! s:BalloonJoin(...) "{{{3 +function! s:BalloonJoin(...) abort "{{{3 if has('balloon_multiline') return join(a:000, "\n") else @@ -509,7 +536,70 @@ function! s:BalloonJoin(...) "{{{3 endf -if exists(':TStatusregister1') - TStatusregister1 --event=BufRead,BufWritePost vcs quickfixsigns#vcsdiff#GetHunkSummaryAsString() +function! s:GetParam(name, type, default) abort "{{{3 + let b = substitute(a:name, '#', '_', 'g') + if exists('b:'. b) + let bval = b:{b} + if !empty(bval) + return bval + endif + endif + let gt = a:name .'_'. a:type + if exists('g:'. gt) + let gtval = g:{gt} + if !(gtval is s:UNSET_STRING) + return gtval + endif + endif + let g = a:name + if exists('g:'. g) + let gval = g:{g} + if !(gval is s:UNSET_STRING) + return gval + endif + endif + return a:default +endf + + +function! s:Diff(filename, vcs_type) abort "{{{3 + let cfg = s:Config(a:vcs_type) + if !empty(cfg) + let cmdt = cfg.cmd + let rev_arg = cfg.rev_arg + let revision= s:GetParam('quickfixsigns#vcsdiff#revision', a:vcs_type, '') + let extra = s:GetParam('quickfixsigns#vcsdiff#extra_args', a:vcs_type, '') + let dir = fnamemodify(a:filename, ':h') + let file = fnamemodify(a:filename, ':t') + " Create command string + if !empty(revision) + let rev = printf('%s %s', rev_arg, revision) + else + let rev = '' + endif + let cmds = join([ + \ printf('%s %s', g:quickfixsigns#vcsdiff#cd, shellescape(dir)), + \ printf(cmdt, extra, rev, shellescape(file)) + \ ], g:quickfixsigns#vcsdiff#cmd_separator) + " Return command result + return system(cmds) + else + return '' + endif +endf + + +function! s:QuickfixsignsMaybeRegisterTStatus() abort "{{{3 + if exists(':TStatusregister1') == 2 + TStatusregister1 --event=BufRead,BufWritePost vcs quickfixsigns#vcsdiff#GetHunkSummaryAsString() + TStatusregister --event=BufEnter,BufWinEnter,CmdwinLeave b:quickfixsigns_vcsdiff_revision=branch + endif +endf + + +if has('vim_starting') + autocmd VimEnter * call s:QuickfixsignsMaybeRegisterTStatus() +else + call s:QuickfixsignsMaybeRegisterTStatus() endif diff --git a/vim/bundle/quickfixsigns_vim/autoload/quickfixsigns/vcsmerge.vim b/vim/bundle/quickfixsigns_vim/autoload/quickfixsigns/vcsmerge.vim new file mode 100644 index 0000000..53e44aa --- /dev/null +++ b/vim/bundle/quickfixsigns_vim/autoload/quickfixsigns/vcsmerge.vim @@ -0,0 +1,89 @@ +" @Author: Sergey Vlasov (sergey@vlasov.me) +" @git: http://github.com/tomtom/quickfixsigns_vim/ +" @License: GPL (see http://www.gnu.org/licenses/gpl.txt) +" @Last Change: 2016-02-12 +" @Revision: 9 + + +" :doc: +" *quickfixsigns-vcsmerge* +" Add signs for merge conflicts produced by VCS like Git. + +if exists('g:quickfixsigns#vcsmerge#loaded') + finish +endif +let g:quickfixsigns#vcsmerge#loaded = 1 +scriptencoding utf-8 + + +if index(g:quickfixsigns_classes, 'vcsmerge') == -1 + finish +endif + + +if !exists('g:quickfixsigns_class_vcsmerge') + " VCS merge conflict markers. + " + " Users have to enable this sign class by adding 'vcsmerge' to + " |g:quickfixsigns_classes|. + let g:quickfixsigns_class_vcsmerge = { + \ 'sign': '*quickfixsigns#vcsmerge#Signs', + \ 'get': 'quickfixsigns#vcsmerge#GetList(%s)', + \ 'event': ['BufRead', 'BufWritePost'] + \ } +endif + + +if !exists('g:quickfixsigns#vcsmerge#regex') + " Expressions to match conflict hunks. + let g:quickfixsigns#vcsmerge#regex = {'TOP': '^<<<<<<< \@=', 'MID': '^=======$', 'BOT': '^>>>>>>> \@='} "{{{2 +endif + + +if !exists('g:quickfixsigns#vcsmerge#sign') + " Signs to mark conflict hunks. + let g:quickfixsigns#vcsmerge#sign = {'TOP': '<<', 'MID': '==', 'BOT': '>>'} "{{{2 +endif + + +if index(g:quickfixsigns_signs, 'QFS_VCSMERGE_TOP') == -1 + exec 'sign define QFS_VCSMERGE_TOP text='. g:quickfixsigns#vcsmerge#sign.TOP .' texthl=Error' +endif + +if index(g:quickfixsigns_signs, 'QFS_VCSMERGE_MID') == -1 + exec 'sign define QFS_VCSMERGE_MID text='. g:quickfixsigns#vcsmerge#sign.MID .' texthl=Error' +endif + +if index(g:quickfixsigns_signs, 'QFS_VCSMERGE_BOT') == -1 + exec 'sign define QFS_VCSMERGE_BOT text='. g:quickfixsigns#vcsmerge#sign.BOT .' texthl=Error' +endif + + +" :nodoc: +function! quickfixsigns#vcsmerge#Signs(item) + return 'QFS_VCSMERGE_'. a:item.change +endf + + +" :nodoc: +function! quickfixsigns#vcsmerge#GetList(filename) + let bufnr = bufnr('%') + let signs = [] + if bufnr != bufnr(a:filename) + if g:quickfixsigns_debug + throw "QuickFixSigns DEBUG: bufnr mismatch:" a:filename bufnr bufnr(a:filename) + endif + else + let pos = getpos('.') + try + exec 'silent g/'. g:quickfixsigns#vcsmerge#regex.TOP. '/ call add(signs, {"bufnr": bufnr, "lnum": line("."), "change": "TOP", "text": "Conflict top hunk"})' + exec 'silent g/'. g:quickfixsigns#vcsmerge#regex.MID. '/ call add(signs, {"bufnr": bufnr, "lnum": line("."), "change": "MID", "text": "Conflict middle hunk"})' + exec 'silent g/'. g:quickfixsigns#vcsmerge#regex.BOT. '/ call add(signs, {"bufnr": bufnr, "lnum": line("."), "change": "BOT", "text": "Conflict bottom hunk"})' + finally + call setpos('.', pos) + endtry + endif + " TLogVAR signs + return signs +endf + diff --git a/vim/bundle/quickfixsigns_vim/doc/quickfixsigns.txt b/vim/bundle/quickfixsigns_vim/doc/quickfixsigns.txt index 286d226..cce10f6 100644 --- a/vim/bundle/quickfixsigns_vim/doc/quickfixsigns.txt +++ b/vim/bundle/quickfixsigns_vim/doc/quickfixsigns.txt @@ -12,8 +12,10 @@ Display |signs| at interesting lines: - relative line numbers (show numbers only until the cursor moves; this requires that you add the following command to |vimrc|: > noremap :call quickfixsigns#RelNumbersOnce() - - long lines (see |g:quickfixsigns_class_longlines| for details) -< - etc. +< - long lines (see |g:quickfixsigns_class_longlines| for details) + - VCS merge conflict markers (Users have to enable this sign class + by adding 'vcsmerge' to |g:quickfixsigns_classes|) + - etc. Other lists can be configured via the |g:quickfixsigns_lists| variable. @@ -86,52 +88,41 @@ Contents~ :QuickfixsignsEnable ........................... |:QuickfixsignsEnable| :QuickfixsignsToggle ........................... |:QuickfixsignsToggle| :QuickfixsignsSelect ........................... |:QuickfixsignsSelect| + :Quickfixsignsecho ............................. |:Quickfixsignsecho| + g:quickfixsigns_echo_map ....................... |g:quickfixsigns_echo_map| g:quickfixsigns_classes ........................ |g:quickfixsigns_classes| - g:quickfixsign_timeout ......................... |g:quickfixsign_timeout| + g:quickfixsigns_timeout ........................ |g:quickfixsigns_timeout| g:quickfixsigns_events ......................... |g:quickfixsigns_events| g:quickfixsigns_class_rel ...................... |g:quickfixsigns_class_rel| g:quickfixsigns_class_qfl ...................... |g:quickfixsigns_class_qfl| g:quickfixsigns_class_loc ...................... |g:quickfixsigns_class_loc| - g:quickfixsign_list_types ...................... |g:quickfixsign_list_types| + g:quickfixsigns_sign_may_use_double ............ |g:quickfixsigns_sign_may_use_double| g:quickfixsigns_class_cursor ................... |g:quickfixsigns_class_cursor| g:quickfixsigns_balloon ........................ |g:quickfixsigns_balloon| g:quickfixsigns_echo_balloon ................... |g:quickfixsigns_echo_balloon| g:quickfixsigns_max ............................ |g:quickfixsigns_max| g:quickfixsigns_blacklist_buffer ............... |g:quickfixsigns_blacklist_buffer| - g:quickfixsign_type_rx ......................... |g:quickfixsign_type_rx| + g:quickfixsigns_type_rx ........................ |g:quickfixsigns_type_rx| + g:quickfixsigns_protect_sign_rx ................ |g:quickfixsigns_protect_sign_rx| g:quickfixsigns_icons .......................... |g:quickfixsigns_icons| - g:quickfixsign_use_dummy ....................... |g:quickfixsign_use_dummy| - QuickfixsignsSelect ............................ |QuickfixsignsSelect()| - QuickfixsignsUpdate ............................ |QuickfixsignsUpdate()| + g:quickfixsigns_use_dummy ...................... |g:quickfixsigns_use_dummy| QuickfixsignsSet ............................... |QuickfixsignsSet()| - QuickfixsignsUnique ............................ |QuickfixsignsUnique()| - QuickfixsignsBalloon ........................... |QuickfixsignsBalloon()| - QuickfixsignsToggle ............................ |QuickfixsignsToggle()| QuickfixsignsClear ............................. |QuickfixsignsClear()| - QuickfixsignsListBufferSigns ................... |QuickfixsignsListBufferSigns()| g:quickfixsigns#use_relativenumber ............. |g:quickfixsigns#use_relativenumber| - quickfixsigns#CompleteSelect ................... |quickfixsigns#CompleteSelect()| quickfixsigns#RelNumbersOnce ................... |quickfixsigns#RelNumbersOnce()| - quickfixsigns#AssertUniqueSigns ................ |quickfixsigns#AssertUniqueSigns()| - quickfixsigns#AssertNoObsoleteBuffers .......... |quickfixsigns#AssertNoObsoleteBuffers()| - quickfixsigns#MoveSigns ........................ |quickfixsigns#MoveSigns()| + g:quickfixsigns_class_longlines ................ |g:quickfixsigns_class_longlines| g:quickfixsigns_class_marks .................... |g:quickfixsigns_class_marks| g:quickfixsigns#marks#buffer ................... |g:quickfixsigns#marks#buffer| g:quickfixsigns#marks#global ................... |g:quickfixsigns#marks#global| g:quickfixsigns#marks#texthl ................... |g:quickfixsigns#marks#texthl| - quickfixsigns#marks#GetList .................... |quickfixsigns#marks#GetList()| - quickfixsigns#marks#GetSign .................... |quickfixsigns#marks#GetSign()| - g:quickfixsigns_class_longlines ................ |g:quickfixsigns_class_longlines| - g:quickfixsigns#longlines#width_expr ........... |g:quickfixsigns#longlines#width_expr| - quickfixsigns#longlines#GetList ................ |quickfixsigns#longlines#GetList()| g:quickfixsigns#vcsdiff#vcs .................... |g:quickfixsigns#vcsdiff#vcs| - g:quickfixsigns_class_vcsdiff .................. |g:quickfixsigns_class_vcsdiff| - g:quickfixsigns#vcsdiff#cd ..................... |g:quickfixsigns#vcsdiff#cd| g:quickfixsigns#vcsdiff#cmd_separator .......... |g:quickfixsigns#vcsdiff#cmd_separator| g:quickfixsigns#vcsdiff#guess_type ............. |g:quickfixsigns#vcsdiff#guess_type| g:quickfixsigns#vcsdiff#list_type .............. |g:quickfixsigns#vcsdiff#list_type| g:quickfixsigns#vcsdiff#highlight .............. |g:quickfixsigns#vcsdiff#highlight| g:quickfixsigns#vcsdiff#del_numbered ........... |g:quickfixsigns#vcsdiff#del_numbered| + g:quickfixsigns#vcsdiff#revision ............... |g:quickfixsigns#vcsdiff#revision| + g:quickfixsigns#vcsdiff#extra_args ............. |g:quickfixsigns#vcsdiff#extra_args| quickfixsigns#vcsdiff#GuessType ................ |quickfixsigns#vcsdiff#GuessType()| quickfixsigns#vcsdiff#GetList .................. |quickfixsigns#vcsdiff#GetList()| quickfixsigns#vcsdiff#GetListCached ............ |quickfixsigns#vcsdiff#GetListCached()| @@ -139,17 +130,12 @@ Contents~ quickfixsigns#vcsdiff#GetHunkSummaryAsString ... |quickfixsigns#vcsdiff#GetHunkSummaryAsString()| quickfixsigns#vcsdiff#GetList0 ................. |quickfixsigns#vcsdiff#GetList0()| quickfixsigns#vcsdiff#GetList1 ................. |quickfixsigns#vcsdiff#GetList1()| - g:quickfixsigns#breakpoints#filetypes .......... |g:quickfixsigns#breakpoints#filetypes| - g:quickfixsigns_class_breakpoints .............. |g:quickfixsigns_class_breakpoints| - quickfixsigns#breakpoints#GetList .............. |quickfixsigns#breakpoints#GetList()| - quickfixsigns#breakpoints#Vim .................. |quickfixsigns#breakpoints#Vim()| - g:tinykeymap#map#quickfixsigns#map ............. |g:tinykeymap#map#quickfixsigns#map| - g:tinykeymap#map#quickfixsigns#options ......... |g:tinykeymap#map#quickfixsigns#options| + g:quickfixsigns#vcsmerge#regex ................. |g:quickfixsigns#vcsmerge#regex| + g:quickfixsigns#vcsmerge#sign .................. |g:quickfixsigns#vcsmerge#sign| -======================================================================== -plugin/quickfixsigns.vim~ - +------------------------------------------------------------------------ + *plugin/quickfixsigns.vim* *:QuickfixsignsSet* :QuickfixsignsSet [SIGN ...] Reset the signs in the current buffer. @@ -171,6 +157,15 @@ plugin/quickfixsigns.vim~ Select the sign classes that should be displayed and reset the signs in the current buffer. + *:Quickfixsignsecho* +:Quickfixsignsecho + Print the text for the signs at the current line. + + *g:quickfixsigns_echo_map* +g:quickfixsigns_echo_map (default: 'qq') + Call |:Quickfixsignsecho|. Print the text for the signs at the + current line. + *g:quickfixsigns_classes* g:quickfixsigns_classes (default: ['qfl', 'loc', 'marks', 'vcsdiff', 'breakpoints']) A list of sign classes that should be displayed. @@ -181,6 +176,7 @@ g:quickfixsigns_classes (default: ['qfl', 'loc', 'marks', 'vcsdiff', 'bre qfl ... |quickfix| list loc ... |location| list vcsdiff ... mark changed lines (see |quickfixsigns#vcsdiff#GetList()|) + vcsmerge .. merge conflicts produced by VCS like Git marks ... marks |'a|-zA-Z (see also " |g:quickfixsigns_marks|) The sign classes are defined in g:quickfixsigns_class_{NAME}. @@ -200,16 +196,16 @@ g:quickfixsigns_classes (default: ['qfl', 'loc', 'marks', 'vcsdiff', 'bre the one with the higher level will be displayed) maxsigns: Override the value of |g:quickfixsigns_max| timeout: Update the sign at most every X seconds (defaults to - |g:quickfixsign_timeout|) + |g:quickfixsigns_timeout|) test: Update the sign only if the expression is true. - *g:quickfixsign_timeout* -g:quickfixsign_timeout (default: 0) + *g:quickfixsigns_timeout* +g:quickfixsigns_timeout (default: 0) The default number of seconds for the timeout option for sign class definitions (see |g:quickfixsigns_classes|). *g:quickfixsigns_events* -g:quickfixsigns_events (default: ['BufReadPost', 'BufEnter', 'CursorHold', 'CursorHoldI', 'InsertLeave', 'InsertEnter']) +g:quickfixsigns_events (default: g:quickfixsigns_events_base + ['BufReadPost', 'InsertEnter', 'InsertLeave']) List of events for signs that should be frequently updated. *g:quickfixsigns_class_rel* @@ -220,18 +216,20 @@ g:quickfixsigns_class_rel (default: {'sign': '*s:RelSign', 'get': 's:GetRel See also |quickfixsigns#RelNumbersOnce()|. *g:quickfixsigns_class_qfl* -g:quickfixsigns_class_qfl (default: {'sign': '*s:QflSign', 'get': 's:GetQFList(%s)', 'event': ['BufEnter', 'CursorHold', 'CursorHoldI', 'QuickFixCmdPost'], 'level': 7, 'scope': 'vim'}) +g:quickfixsigns_class_qfl (default: {'sign': '*s:QflSign', 'get': 's:GetQFList(%s)', 'event': g:quickfixsigns_events_base + ['QuickFixCmdPost'], 'level': 7, 'scope': 'vim'}) Signs for |quickfix| lists. *g:quickfixsigns_class_loc* -g:quickfixsigns_class_loc (default: {'sign': '*s:LocSign', 'get': 's:GetLocList(%s)', 'event': ['BufEnter', 'CursorHold', 'CursorHoldI', 'QuickFixCmdPost'], 'level': 8}) +g:quickfixsigns_class_loc (default: {'sign': '*s:LocSign', 'get': 's:GetLocList(%s)', 'event': g:quickfixsigns_events_base + ['QuickFixCmdPost'], 'level': 8}) Signs for |location| lists. - *g:quickfixsign_list_types* -g:quickfixsign_list_types (default: 'EW') + *g:quickfixsigns_sign_may_use_double* +g:quickfixsigns_sign_may_use_double (default: !exists('&ambiwidth') || &ambiwidth ==# 'single') + FIX Confliction between quickfixsigns_vim and ambiwidth=double + https://github.com/tomtom/quickfixsigns_vim/issues/72 *g:quickfixsigns_class_cursor* -g:quickfixsigns_class_cursor (default: {'sign': 'QFS_CURSOR', 'get': 's:GetCursor(%s)', 'event': ['BufEnter', 'CursorHold', 'CursorHoldI', 'CursorMoved', 'CursorMovedI'], 'timeout': 1, 'level': 3}) +g:quickfixsigns_class_cursor (default: {'sign': 'QFS_CURSOR', 'get': 's:GetCursor(%s)', 'event': g:quickfixsigns_events_base + ['CursorMoved', 'CursorMovedI'], 'timeout': 1, 'level': 3}) Sign for the current cursor position. The cursor position is lazily updated. If you want something more precise, consider setting 'cursorline'. @@ -252,34 +250,33 @@ g:quickfixsigns_max (default: 500) Don't display signs if the list is longer than n items. *g:quickfixsigns_blacklist_buffer* -g:quickfixsigns_blacklist_buffer (default: '\(^\|[\/]\)\(__.*__\|NERD_tree_.*\|-MiniBufExplorer-\|\[unite\] - .*\)$') +g:quickfixsigns_blacklist_buffer (default: '\(^\|[\/]\)\(__.*__\|ControlP\|NERD_tree_.*\|-MiniBufExplorer-\|\[unite\] - .*\)$') Don't show signs in buffers matching this |regexp|. - *g:quickfixsign_type_rx* -g:quickfixsign_type_rx (default: {'*': [['E', '\c\'], ['W', '\c\']]}) + *g:quickfixsigns_type_rx* +g:quickfixsigns_type_rx (default: {'*': [['E', '\c\'], ['W', '\c\']]}) A dictionary of {&filetype: [[TYPE, REGEXP] ...]}. If a qfl or loc list item has no type defined, match the item against the |regexp| and assume TYPE if it matches. Use "*" for default values. This way, users can patch suboptimal 'errorformat' definitions. + *g:quickfixsigns_protect_sign_rx* +g:quickfixsigns_protect_sign_rx (default: '') + Don't set signs at lines with signs whose name match this + |regexp|. + *g:quickfixsigns_icons* g:quickfixsigns_icons (default: {}) A dictionary {TYPE => IMAGE_FILENAME} that is used to select icons that should be displayed as signs. Defaults to empty on windows and non-gui versions. - *g:quickfixsign_use_dummy* -g:quickfixsign_use_dummy (default: index(g:quickfixsigns_classes, 'marks') == -1) + *g:quickfixsigns_use_dummy* +g:quickfixsigns_use_dummy (default: index(g:quickfixsigns_classes, 'marks') == -1) If true, set a dummy sign. It's recommended to use dummy signs when |g:quickfixsigns_classes| does not contain "marks". - *QuickfixsignsSelect()* -QuickfixsignsSelect(list) - - *QuickfixsignsUpdate()* -QuickfixsignsUpdate(?class="") - *QuickfixsignsSet()* QuickfixsignsSet(event, ?classes=[], ?filename=expand('%:p')) (Re-)Set the signs that should be updated at a certain event. If event @@ -291,26 +288,13 @@ QuickfixsignsSet(event, ?classes=[], ?filename=expand('%:p')) strings) exists, sign classes in that list won't be displayed for the current buffer. - *QuickfixsignsUnique()* -QuickfixsignsUnique(list) - - *QuickfixsignsBalloon()* -QuickfixsignsBalloon() - - *QuickfixsignsToggle()* -QuickfixsignsToggle() - *QuickfixsignsClear()* QuickfixsignsClear(class) Clear all signs with name SIGN. - *QuickfixsignsListBufferSigns()* -QuickfixsignsListBufferSigns(bufnr) - - -======================================================================== -autoload/quickfixsigns.vim~ +------------------------------------------------------------------------ + *autoload/quickfixsigns.vim* *g:quickfixsigns#use_relativenumber* g:quickfixsigns#use_relativenumber (default: v:version >= 703) VIM 7.3 and later: If non-zero, |quickfixsigns#RelNumbersOnce()| @@ -318,27 +302,25 @@ g:quickfixsigns#use_relativenumber (default: v:version >= 703) other signs and is faster, but it could cause the visible text area to be temporarily moved to the right. - *quickfixsigns#CompleteSelect()* -quickfixsigns#CompleteSelect(ArgLead, CmdLine, CursorPos) - *quickfixsigns#RelNumbersOnce()* quickfixsigns#RelNumbersOnce() Display relative line numbers. Remove the signs when the cursor moves. From vim 7.3 on, this uses the 'relativenumber' option. - *quickfixsigns#AssertUniqueSigns()* -quickfixsigns#AssertUniqueSigns(bufnr, bufsigns) - - *quickfixsigns#AssertNoObsoleteBuffers()* -quickfixsigns#AssertNoObsoleteBuffers(register) - *quickfixsigns#MoveSigns()* -quickfixsigns#MoveSigns(n, ?pattern="", ?blockwise=0) "{{{3 +------------------------------------------------------------------------ + *autoload/quickfixsigns/longlines.vim* + *g:quickfixsigns_class_longlines* +g:quickfixsigns_class_longlines (default: {'sign': 'QFS_LONGLINES', 'get': 'quickfixsigns#longlines#GetList(%s)', 'event': ['BufRead', 'BufWritePost']}) + Mark long lines (see |g:quickfixsigns#longlines#width_expr|) with + a sign. + Users have to enable this sign class by adding 'longlines' to + |g:quickfixsigns_classes|. -======================================================================== -autoload/quickfixsigns/marks.vim~ +------------------------------------------------------------------------ + *autoload/quickfixsigns/marks.vim* *g:quickfixsigns_class_marks* g:quickfixsigns_class_marks (default: {...}) The definition of signs for marks. @@ -357,34 +339,9 @@ g:quickfixsigns#marks#global (default: split('ABCDEFGHIJKLMNOPQRSTUVWXYZ<>^', g:quickfixsigns#marks#texthl (default: 'Identifier') Highlight group for mark signs. - *quickfixsigns#marks#GetList()* -quickfixsigns#marks#GetList(filename) - - *quickfixsigns#marks#GetSign()* -quickfixsigns#marks#GetSign(item) - - -======================================================================== -autoload/quickfixsigns/longlines.vim~ - - *g:quickfixsigns_class_longlines* -g:quickfixsigns_class_longlines (default: {'sign': 'QFS_LONGLINES', 'get': 'quickfixsigns#longlines#GetList(%s)', 'event': ['BufRead', 'BufWritePost']}) - Mark long lines (see |g:quickfixsigns#longlines#width_expr|) with - a sign. - - Users have to enable this sign class by adding 'longlines' to - |g:quickfixsigns_classes|. - - *g:quickfixsigns#longlines#width_expr* -g:quickfixsigns#longlines#width_expr (default: '&tw') - - *quickfixsigns#longlines#GetList()* -quickfixsigns#longlines#GetList(filename) - - -======================================================================== -autoload/quickfixsigns/vcsdiff.vim~ +------------------------------------------------------------------------ + *autoload/quickfixsigns/vcsdiff.vim* *g:quickfixsigns#vcsdiff#vcs* g:quickfixsigns#vcsdiff#vcs (default: {...}) Show signs for new (+), changed (=), or deleted (-) lines. @@ -398,13 +355,11 @@ g:quickfixsigns#vcsdiff#vcs (default: {...}) cmd ... command templates that generate a unified diff file. "%s" is replaced with the filename. dir ... the directory name + rev_arg ... argument to selection revision to diff against Currently supported vcs: git, hg, svn, bzr - *g:quickfixsigns_class_vcsdiff* -g:quickfixsigns_class_vcsdiff (default: {'sign': '*quickfixsigns#vcsdiff#Signs', 'get': 'quickfixsigns#vcsdiff#GetList(%s)', 'event': ['BufRead', 'BufWritePost'], 'level': 6}) - - *g:quickfixsigns#vcsdiff#cd* -g:quickfixsigns#vcsdiff#cd (default: 'cd') + Users can also use g:quickfixsigns#vcsdiff#vcs_{vcs_type} for + configuration. *g:quickfixsigns#vcsdiff#cmd_separator* g:quickfixsigns#vcsdiff#cmd_separator (default: '&&') @@ -438,6 +393,20 @@ g:quickfixsigns#vcsdiff#del_numbered (default: 1) If true, add an indicator for how many lines were deleted next to the sign for deleted lines. + *g:quickfixsigns#vcsdiff#revision* +g:quickfixsigns#vcsdiff#revision (default: s:UNSET_STRING) + Choose a different branch/revision instead of the latest change. + By default, the head/last/master branch is selected -- see also + |g:quickfixsigns#vcsdiff#vcs|. + Can also be buffer local b:quickfixsigns_vcsdiff_revision or vcs + specific as g:quickfixsigns#vcsdiff#revision_{type}. + + *g:quickfixsigns#vcsdiff#extra_args* +g:quickfixsigns#vcsdiff#extra_args (default: s:UNSET_STRING) + Extra arguments. + Can also be buffer local b:quickfixsigns_vcsdiff_extra_args or vcs + specific as g:quickfixsigns#vcsdiff#extra_args_{type}. + *quickfixsigns#vcsdiff#GuessType()* quickfixsigns#vcsdiff#GuessType() Return the name of a VCS system based on the values of the following @@ -480,30 +449,19 @@ quickfixsigns#vcsdiff#GetList1(filename) for details). -======================================================================== -autoload/quickfixsigns/breakpoints.vim~ - - *g:quickfixsigns#breakpoints#filetypes* -g:quickfixsigns#breakpoints#filetypes (default: {...}) - - *g:quickfixsigns_class_breakpoints* -g:quickfixsigns_class_breakpoints (default: {...}) - - *quickfixsigns#breakpoints#GetList()* -quickfixsigns#breakpoints#GetList(filename) +------------------------------------------------------------------------ + *autoload/quickfixsigns/vcsmerge.vim* - *quickfixsigns#breakpoints#Vim()* -quickfixsigns#breakpoints#Vim() - - -======================================================================== -autoload/tinykeymap/map/quickfixsigns.vim~ + *quickfixsigns-vcsmerge* +Add signs for merge conflicts produced by VCS like Git. - *g:tinykeymap#map#quickfixsigns#map* -g:tinykeymap#map#quickfixsigns#map (default: g:tinykeymap#mapleader .'s') + *g:quickfixsigns#vcsmerge#regex* +g:quickfixsigns#vcsmerge#regex (default: {'TOP': '^<<<<<<< \@=', 'MID': '^=======$', 'BOT': '^>>>>>>> \@='}) + Expressions to match conflict hunks. - *g:tinykeymap#map#quickfixsigns#options* -g:tinykeymap#map#quickfixsigns#options (default: {...}) + *g:quickfixsigns#vcsmerge#sign* +g:quickfixsigns#vcsmerge#sign (default: {'TOP': '<<', 'MID': '==', 'BOT': '>>'}) + Signs to mark conflict hunks. diff --git a/vim/bundle/quickfixsigns_vim/etc/tpl_quickfixsigns.txt b/vim/bundle/quickfixsigns_vim/etc/tpl_quickfixsigns.txt index f22d229..a0922f2 100644 --- a/vim/bundle/quickfixsigns_vim/etc/tpl_quickfixsigns.txt +++ b/vim/bundle/quickfixsigns_vim/etc/tpl_quickfixsigns.txt @@ -12,8 +12,10 @@ Display |signs| at interesting lines: - relative line numbers (show numbers only until the cursor moves; this requires that you add the following command to |vimrc|: > noremap :call quickfixsigns#RelNumbersOnce() - - long lines (see |g:quickfixsigns_class_longlines| for details) -< - etc. +< - long lines (see |g:quickfixsigns_class_longlines| for details) + - VCS merge conflict markers (Users have to enable this sign class + by adding 'vcsmerge' to |g:quickfixsigns_classes|) + - etc. Other lists can be configured via the |g:quickfixsigns_lists| variable. diff --git a/vim/bundle/quickfixsigns_vim/plugin/quickfixsigns.vim b/vim/bundle/quickfixsigns_vim/plugin/quickfixsigns.vim index 0f7cec5..5bd5d11 100755 --- a/vim/bundle/quickfixsigns_vim/plugin/quickfixsigns.vim +++ b/vim/bundle/quickfixsigns_vim/plugin/quickfixsigns.vim @@ -4,19 +4,20 @@ " @GIT: http://github.com/tomtom/quickfixsigns_vim/ " @License: GPL (see http://www.gnu.org/licenses/gpl.txt) " @Created: 2009-03-14. -" @Last Change: 2015-04-24. -" @Revision: 1419 +" @Last Change: 2017-10-12. +" @Revision: 1517 " GetLatestVimScripts: 2584 1 :AutoInstall: quickfixsigns.vim if &cp || exists("g:loaded_quickfixsigns") || !has('signs') finish endif -let g:loaded_quickfixsigns = 105 +let g:loaded_quickfixsigns = 106 scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim + " :display: :QuickfixsignsSet [SIGN ...] " Reset the signs in the current buffer. command! -bar -nargs=* QuickfixsignsSet call QuickfixsignsSet('', split(, '\s\+')) @@ -34,12 +35,25 @@ command! -bar QuickfixsignsToggle call QuickfixsignsToggle() " in the current buffer. command! -bar -nargs=+ -complete=customlist,quickfixsigns#CompleteSelect QuickfixsignsSelect call QuickfixsignsSelect([]) | call QuickfixsignsUpdate() +" Print the text for the signs at the current line. +command! -bar Quickfixsignsecho call QuickfixsignsEcho(bufnr("%"), line(".")) + if !exists('g:quickfixsigns_debug') let g:quickfixsigns_debug = 0 endif +if !exists('g:quickfixsigns_echo_map') + " Call |:Quickfixsignsecho|. Print the text for the signs at the + " current line. + let g:quickfixsigns_echo_map = 'qq' "{{{2 +endif +if !empty(g:quickfixsigns_echo_map) + exec 'nnoremap' g:quickfixsigns_echo_map ':Quickfixsignsecho' +endif + + if !exists('g:quickfixsigns_classes') " A list of sign classes that should be displayed. " Can be one of: @@ -49,7 +63,9 @@ if !exists('g:quickfixsigns_classes') " qfl ... |quickfix| list " loc ... |location| list " vcsdiff ... mark changed lines (see |quickfixsigns#vcsdiff#GetList()|) - " marks ... marks |'a|-zA-Z (see also " |g:quickfixsigns_marks|) + " vcsmerge .. merge conflicts produced by VCS like Git + " marks ... marks |'a|-zA-Z (see also |g:quickfixsigns#marks#global| + " and |g:quickfixsigns#marks#buffer|) " " The sign classes are defined in g:quickfixsigns_class_{NAME}. " @@ -68,23 +84,33 @@ if !exists('g:quickfixsigns_classes') " the one with the higher level will be displayed) " maxsigns: Override the value of |g:quickfixsigns_max| " timeout: Update the sign at most every X seconds (defaults to - " |g:quickfixsign_timeout|) + " |g:quickfixsigns_timeout|) " test: Update the sign only if the expression is true. let g:quickfixsigns_classes = ['qfl', 'loc', 'marks', 'vcsdiff', 'breakpoints'] "{{{2 " let g:quickfixsigns_classes = ['rel', 'qfl', 'loc', 'marks'] "{{{2 endif -if !exists('g:quickfixsign_timeout') +if !exists('g:quickfixsigns_timeout') " The default number of seconds for the timeout option for sign " class definitions (see |g:quickfixsigns_classes|). - let g:quickfixsign_timeout = 0 "{{{2 + let g:quickfixsigns_timeout = 0 "{{{2 +endif + + +if !exists('g:quickfixsigns_events_default') + let g:quickfixsigns_events_default = exists('g:loaded_ArgsAndMore') || exists('g:loaded_EnhancedJumps') ? [] : ['BufEnter'] "{{{2 +endif + + +if !exists('g:quickfixsigns_events_base') + let g:quickfixsigns_events_base = g:quickfixsigns_events_default + ['CursorHold', 'CursorHoldI'] "{{{2 endif if !exists('g:quickfixsigns_events') " List of events for signs that should be frequently updated. - let g:quickfixsigns_events = ['BufReadPost', 'BufEnter', 'CursorHold', 'CursorHoldI', 'InsertLeave', 'InsertEnter'] "{{{2 + let g:quickfixsigns_events = g:quickfixsigns_events_base + ['BufReadPost', 'InsertEnter', 'InsertLeave'] "{{{2 endif @@ -106,18 +132,25 @@ endif if !exists('g:quickfixsigns_class_qfl') " Signs for |quickfix| lists. - let g:quickfixsigns_class_qfl = {'sign': '*s:QflSign', 'get': 's:GetQFList(%s)', 'event': ['BufEnter', 'CursorHold', 'CursorHoldI', 'QuickFixCmdPost'], 'level': 7, 'scope': 'vim'} "{{{2 + let g:quickfixsigns_class_qfl = {'sign': '*s:QflSign', 'get': 's:GetQFList(%s)', 'event': g:quickfixsigns_events_base + ['QuickFixCmdPost'], 'level': 7, 'scope': 'vim'} "{{{2 endif if !exists('g:quickfixsigns_class_loc') " Signs for |location| lists. - let g:quickfixsigns_class_loc = {'sign': '*s:LocSign', 'get': 's:GetLocList(%s)', 'event': ['BufEnter', 'CursorHold', 'CursorHoldI', 'QuickFixCmdPost'], 'level': 8} "{{{2 + let g:quickfixsigns_class_loc = {'sign': '*s:LocSign', 'get': 's:GetLocList(%s)', 'event': g:quickfixsigns_events_base + ['QuickFixCmdPost'], 'level': 8} "{{{2 endif -if !exists('g:quickfixsign_list_types') - let g:quickfixsign_list_types = 'EW' "{{{2 +if !exists('g:quickfixsigns_list_types') + let g:quickfixsigns_list_types = 'EW' "{{{2 +endif + + +if !exists('g:quickfixsigns_sign_may_use_double') + " FIX Confliction between quickfixsigns_vim and ambiwidth=double + " https://github.com/tomtom/quickfixsigns_vim/issues/72 + let g:quickfixsigns_sign_may_use_double = !exists('&ambiwidth') || &ambiwidth ==# 'single' "{{{2 endif @@ -125,7 +158,7 @@ if !exists('g:quickfixsigns_class_cursor') " Sign for the current cursor position. The cursor position is " lazily updated. If you want something more precise, consider " setting 'cursorline'. - let g:quickfixsigns_class_cursor = {'sign': 'QFS_CURSOR', 'get': 's:GetCursor(%s)', 'event': ['BufEnter', 'CursorHold', 'CursorHoldI', 'CursorMoved', 'CursorMovedI'], 'timeout': 1, 'level': 3} "{{{2 + let g:quickfixsigns_class_cursor = {'sign': 'QFS_CURSOR', 'get': 's:GetCursor(%s)', 'event': g:quickfixsigns_events_base + ['CursorMoved', 'CursorMovedI'], 'timeout': 1, 'level': 3} "{{{2 endif @@ -152,17 +185,24 @@ endif if !exists('g:quickfixsigns_blacklist_buffer') " Don't show signs in buffers matching this |regexp|. - let g:quickfixsigns_blacklist_buffer = '\(^\|[\/]\)\(__.*__\|NERD_tree_.*\|-MiniBufExplorer-\|\[unite\] - .*\)$' "{{{2 + let g:quickfixsigns_blacklist_buffer = '\(^\|[\/]\)\(__.*__\|ControlP\|NERD_tree_.*\|-MiniBufExplorer-\|\[unite\] - .*\)$' "{{{2 endif -if !exists('g:quickfixsign_type_rx') +if !exists('g:quickfixsigns_type_rx') " A dictionary of {&filetype: [[TYPE, REGEXP] ...]}. " If a qfl or loc list item has no type defined, match the item " against the |regexp| and assume TYPE if it matches. " Use "*" for default values. " This way, users can patch suboptimal 'errorformat' definitions. - let g:quickfixsign_type_rx = {'*': [['E', '\c\'], ['W', '\c\']]} "{{{2 + let g:quickfixsigns_type_rx = {'*': [['E', '\c\'], ['W', '\c\']]} "{{{2 +endif + + +if !exists('g:quickfixsigns_protect_sign_rx') + " Don't set signs at lines with signs whose name match this + " |regexp|. + let g:quickfixsigns_protect_sign_rx = '' "{{{2 endif @@ -194,10 +234,10 @@ if !exists('g:quickfixsigns_icons') endif -if !exists('g:quickfixsign_use_dummy') +if !exists('g:quickfixsigns_use_dummy') " If true, set a dummy sign. It's recommended to use dummy signs " when |g:quickfixsigns_classes| does not contain "marks". - let g:quickfixsign_use_dummy = index(g:quickfixsigns_classes, 'marks') == -1 "{{{2 + let g:quickfixsigns_use_dummy = index(g:quickfixsigns_classes, 'marks') == -1 "{{{2 endif @@ -242,61 +282,36 @@ let g:quickfixsigns_signs = split(s:Redir('sign list'), '\n') call filter(g:quickfixsigns_signs, 'v:val =~ ''^sign QFS_''') call map(g:quickfixsigns_signs, 'matchstr(v:val, ''^sign \zsQFS_\w\+'')') -if index(g:quickfixsigns_signs, 'QFS_QFL') == -1 - if exists('g:quickfixsigns_icons.qfl') - exec 'sign define QFS_QFL text=* texthl=WarningMsg icon='. escape(g:quickfixsigns_icons.qfl, ' \') - else - sign define QFS_QFL text=* texthl=WarningMsg - endif -endif - -if index(g:quickfixsigns_signs, 'QFS_LOC') == -1 - if exists('g:quickfixsigns_icons.loc') - exec 'sign define QFS_LOC text=> texthl=Special icon='. escape(g:quickfixsigns_icons.loc, ' \') - else - sign define QFS_LOC text=> texthl=Special - endif -endif -for s:char in split(g:quickfixsign_list_types, '\zs') - let s:sign = 'QFS_QFL_'. s:char - if index(g:quickfixsigns_signs, s:sign) == -1 - let s:icon = 'qfl_'. s:char - if has_key(g:quickfixsigns_icons, s:icon) - exec 'sign define' s:sign 'text=*'. s:char 'texthl=WarningMsg icon='. escape(g:quickfixsigns_icons[s:icon], ' \') - else - exec 'sign define' s:sign 'text=*'. s:char 'texthl=WarningMsg' - endif - endif - let s:sign = 'QFS_LOC_'. s:char - if index(g:quickfixsigns_signs, s:sign) == -1 - let s:icon = 'loc_'. s:char - if has_key(g:quickfixsigns_icons, s:icon) - exec 'sign define' s:sign 'text=>'. s:char 'texthl=Special icon='. escape(g:quickfixsigns_icons[s:icon], ' \') - else - exec 'sign define' s:sign 'text=>'. s:char 'texthl=Special' +function! s:DefineSign(name, text, texthl, icon_name) abort "{{{3 + if index(g:quickfixsigns_signs, a:name) == -1 + let cmd = 'sign define '. a:name .' text='. a:text .' texthl='. a:texthl + if !empty(a:icon_name) && has_key(g:quickfixsigns_icons, a:icon_name) + let cmd .= ' icon='. escape(g:quickfixsigns_icons[a:icon_name], ' \') endif + exec cmd + call add(g:quickfixsigns_signs, a:name) endif -endfor -unlet! s:char s:sign s:icon +endf -if index(g:quickfixsigns_signs, 'QFS_CURSOR') == -1 - if exists('g:quickfixsigns_icons.cursor') - exec 'sign define QFS_CURSOR text=- texthl=Question icon='. escape(g:quickfixsigns_icons.cursor, ' \') - else - sign define QFS_CURSOR text=- texthl=Question - endif -endif +call s:DefineSign('QFS_CURSOR', '-', 'Question', 'cursor') +" ╠►☼☺‡ +" ├⇒→◊☻† +call s:DefineSign('QFS_QFL', (g:quickfixsigns_sign_may_use_double && &enc ==? 'utf-8' ? '►' : '*'),'WarningMsg', 'qfl') +call s:DefineSign('QFS_LOC', (g:quickfixsigns_sign_may_use_double && &enc ==? 'utf-8' ? '◊' : '>'), 'Special', 'loc') -sign define QFS_DUMMY text=. texthl=NonText +for s:char in split(g:quickfixsigns_list_types, '\zs') + call s:DefineSign('QFS_QFL_'. s:char, (g:quickfixsigns_sign_may_use_double && &enc ==? 'utf-8' ? '║' : '*') . s:char, 'WarningMsg', 'qfl_'. s:char) + call s:DefineSign('QFS_LOC_'. s:char, (g:quickfixsigns_sign_may_use_double && &enc ==? 'utf-8' ? '│' : '>') . s:char, 'Special', 'loc_'. s:char) +endfor +unlet! s:char let s:relmax = -1 function! s:GenRel(num) "{{{3 " TLogVAR a:num - " echom "DBG ". s:relmax if a:num > s:relmax && a:num < 100 for n in range(s:relmax + 1, a:num) - exec 'sign define QFS_REL_'. n .' text='. n .' texthl=LineNr' + call s:DefineSign('QFS_REL_'. n, n, 'LineNr', '') endfor let s:relmax = a:num endif @@ -345,6 +360,9 @@ function! QuickfixsignsSet(event, ...) "{{{3 if exists("b:noquickfixsigns") && b:noquickfixsigns return endif + if exists("g:noquickfixsigns") && g:noquickfixsigns + return + endif let bufsignclasses = s:ListValues() " TLogVAR bufsignclasses if empty(bufsignclasses) @@ -367,10 +385,16 @@ function! QuickfixsignsSet(event, ...) "{{{3 " TLogVAR class, def if anyway let set = 1 - elseif index(get(def, 'event', ['BufEnter']), a:event) != -1 - let set = !has_key(def, 'test') || eval(def.test) else - let set = 0 + let set = index(get(def, 'event', g:quickfixsigns_events_default), a:event) != -1 + if set + if has_key(def, 'test') + let set = eval(def.test) + endif + elseif exists('b:quickfixsigns_needs_update') && b:quickfixsigns_needs_update + let set = 1 + let b:quickfixsigns_needs_update = 0 + endif endif if a:0 >= 1 && !empty(a:1) let select = index(a:1, class) != -1 @@ -379,7 +403,7 @@ function! QuickfixsignsSet(event, ...) "{{{3 endif if set && select " TLogVAR class, set, select - let t_d = get(def, 'timeout', g:quickfixsign_timeout) + let t_d = get(def, 'timeout', g:quickfixsigns_timeout) if t_d != 0 let t_l = localtime() let t_s = string(def) @@ -539,25 +563,41 @@ function! QuickfixsignsUnique(list) "{{{3 endf +function! s:GetSignsAtLine(bufnr, lnum) abort "{{{3 + " TLogVAR a:bufnr, a:lnum + let bufname = bufname(a:bufnr) + let acc = [] + for [class, def] in s:ListValues() + let list = s:GetList(def, bufname) + " TLogVAR class, len(list) + call filter(list, 'v:val.bufnr == a:bufnr && v:val.lnum == a:lnum') + " TLogVAR len(list), g:quickfixsigns_max + if !empty(list) && len(list) < g:quickfixsigns_max + let acc += list + endif + endfor + return acc +endf + + +function! s:GetSignsTextAtLine(bufnr, lnum) abort "{{{3 + let acc = s:GetSignsAtLine(a:bufnr, a:lnum) + " TLogVAR acc + let text = join(map(acc, 'v:val.text'), "\n") + return text +endf + + +function! QuickfixsignsEcho(bufnr, lnum) abort "{{{3 + let l:text = s:GetSignsTextAtLine(a:bufnr, a:lnum) + echo l:text +endf + + function! QuickfixsignsBalloon() "{{{3 " TLogVAR v:beval_lnum, v:beval_col if v:beval_col <= 1 - let lnum = v:beval_lnum - let bufnr = bufnr('%') - " TLogVAR bufnr, lnum - let bufname = bufname(bufnr) - let acc = [] - for [class, def] in s:ListValues() - let list = s:GetList(def, bufname) - " TLogVAR class, len(list) - call filter(list, 'v:val.bufnr == bufnr && v:val.lnum == lnum') - " TLogVAR len(list), g:quickfixsigns_max - if !empty(list) && len(list) < g:quickfixsigns_max - let acc += list - endif - endfor - " TLogVAR acc - let text = join(map(acc, 'v:val.text'), "\n") + let text = s:GetSignsTextAtLine(bufnr('%'), v:beval_lnum) " TLogVAR text elseif exists('b:quickfixsigns_balloonexpr') && !empty(b:quickfixsigns_balloonexpr) let text = eval(b:quickfixsigns_balloonexpr) @@ -634,7 +674,7 @@ function! s:ListSign(item, base) "{{{3 let ft = '*' endif let text = a:item.text - for [t, rx] in get(g:quickfixsign_type_rx, ft, []) + for [t, rx] in get(g:quickfixsigns_type_rx, ft, []) if text =~ rx let type = t break @@ -642,7 +682,7 @@ function! s:ListSign(item, base) "{{{3 endfor endif " TLogVAR a:item, a:base, type - if empty(type) || stridx(g:quickfixsign_list_types, type) == -1 + if empty(type) || stridx(g:quickfixsigns_list_types, type) == -1 return a:base else return a:base .'_'. type @@ -748,7 +788,7 @@ function! s:CreateBufferSignsCache() "{{{3 if exists('s:buffer_signs') return 0 else - let s:buffer_signs = {} + let s:buffer_signs = {'blacklist': {}} return 1 endif endf @@ -761,22 +801,50 @@ function! s:RemoveBufferSignsCache(cbs) "{{{3 endf -function! s:SignExistsAt(bufnr, lnum, sign) "{{{3 - " TLogVAR a:bufnr, a:lnum, a:sign - if !has_key(s:buffer_signs, a:bufnr) - let s:buffer_signs[a:bufnr] = QuickfixsignsListBufferSigns(a:bufnr) +function! s:GetBufferSignsBlacklist(bufnr) abort "{{{3 + if !has_key(s:buffer_signs.blacklist, a:bufnr) + " TODO + let s:buffer_signs.blacklist[a:bufnr] = s:BlacklistedLnums(QuickfixsignsListBufferSigns(a:bufnr)) endif - let bsigns = copy(s:buffer_signs[a:bufnr]) - " TLogVAR bsigns - if empty(a:sign) - call filter(bsigns, 'v:val.lnum == a:lnum') - else - call filter(bsigns, 'v:val.lnum == a:lnum && v:val.name == a:sign') + return s:buffer_signs.blacklist[a:bufnr] +endf + + +function! s:BlacklistedLnums(qfs) abort "{{{3 + let lnums = {} + if !empty(g:quickfixsigns_protect_sign_rx) + for signdef in a:qfs + if signdef.name =~ g:quickfixsigns_protect_sign_rx + let lnums[signdef.lnum] = 1 + endif + endfor endif - return len(bsigns) > 0 + return lnums +endf + + +function! s:CheckOtherSigns(bufnr, lnum) "{{{3 + " TLogVAR a:bufnr, a:lnum + return !has_key(s:GetBufferSignsBlacklist(a:bufnr), a:lnum) endf +" function! s:SignExistsAt(bufnr, lnum, sign) "{{{3 +" " TLogVAR a:bufnr, a:lnum, a:sign +" if !has_key(s:buffer_signs, a:bufnr) +" let s:buffer_signs[a:bufnr] = QuickfixsignsListBufferSigns(a:bufnr) +" endif +" let bsigns = copy(s:buffer_signs[a:bufnr]) +" " TLogVAR bsigns +" if empty(a:sign) +" call filter(bsigns, 'v:val.lnum == a:lnum') +" else +" call filter(bsigns, 'v:val.lnum == a:lnum && v:val.name == a:sign') +" endif +" return len(bsigns) > 0 +" endf + + function! QuickfixsignsListBufferSigns(bufnr) "{{{3 if a:bufnr == -1 return [] @@ -839,7 +907,7 @@ function! s:PlaceSign(class, sign, list) "{{{3 let item = extend(item, {'class': a:class, 'sign': sign}) let item = s:SetItemId(item) " TLogVAR item - if !empty(item) && bufloaded(item.bufnr) + if !empty(item) && bufloaded(item.bufnr) && s:CheckOtherSigns(item.bufnr, item.lnum) let ikey = item.ikey " TLogVAR ikey, item call add(keep_ikeys, ikey) @@ -861,7 +929,7 @@ endf function! s:GetSign(sign, item) "{{{3 - if a:sign[0] == '*' + if a:sign[0] ==# '*' let sign = call(a:sign[1 : -1], [a:item]) " TLogVAR sign else @@ -937,7 +1005,8 @@ augroup QuickFixSigns autocmd BufLeave * if !v:dying | call s:PurgeRegister() | endif autocmd BufDelete * call s:RemoveBuffer(expand(""), 1) - if g:quickfixsign_use_dummy + if g:quickfixsigns_use_dummy + call s:DefineSign('QFS_DUMMY', '.', 'NonText', '') exec "autocmd BufRead,BufNewFile * exec 'sign place' (". s:quickfixsigns_base ." - expand('')) 'name=QFS_DUMMY line=1 buffer='. expand('')" endif autocmd User WokmarksChange if index(g:quickfixsigns_classes, 'marks') != -1 | call QuickfixsignsUpdate("marks") | endif diff --git a/vim/bundle/supertab b/vim/bundle/supertab index c8bfece..40fe711 160000 --- a/vim/bundle/supertab +++ b/vim/bundle/supertab @@ -1 +1 @@ -Subproject commit c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7 +Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172 diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic index cc440f1..0295d82 160000 --- a/vim/bundle/syntastic +++ b/vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit cc440f1b40adcdc0a5aabbc786a8d1750eefd3ee +Subproject commit 0295d8241db23e24b120e0360a899cb375793a1e diff --git a/vim/bundle/tabular b/vim/bundle/tabular new file mode 160000 index 0000000..00e1e7f --- /dev/null +++ b/vim/bundle/tabular @@ -0,0 +1 @@ +Subproject commit 00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367 diff --git a/vim/bundle/tcomment_vim b/vim/bundle/tcomment_vim index 0262fdc..508848f 160000 --- a/vim/bundle/tcomment_vim +++ b/vim/bundle/tcomment_vim @@ -1 +1 @@ -Subproject commit 0262fdc53df2e6a24be91c10311dfaf1acd048fc +Subproject commit 508848fca02d04c9cbcfd9ba46cee65d0ebe755b diff --git a/vim/bundle/tlib_vim b/vim/bundle/tlib_vim index ecf9e08..ced8f3e 160000 --- a/vim/bundle/tlib_vim +++ b/vim/bundle/tlib_vim @@ -1 +1 @@ -Subproject commit ecf9e08de8b8ed8cf5e1f69f69471b04b7d55652 +Subproject commit ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b diff --git a/vim/bundle/vim-addon-mw-utils b/vim/bundle/vim-addon-mw-utils index 0c5612f..295862b 160000 --- a/vim/bundle/vim-addon-mw-utils +++ b/vim/bundle/vim-addon-mw-utils @@ -1 +1 @@ -Subproject commit 0c5612fa31ee434ba055e21c76f456244b3b5109 +Subproject commit 295862ba6be47ec3b11b6c85c10d982ffd9bc0b2 diff --git a/vim/bundle/vim-arduino b/vim/bundle/vim-arduino new file mode 160000 index 0000000..edabf5c --- /dev/null +++ b/vim/bundle/vim-arduino @@ -0,0 +1 @@ +Subproject commit edabf5c2ace0957fc5e9edb84661757dd044f5df diff --git a/vim/bundle/vim-bundler b/vim/bundle/vim-bundler index 83cc90f..a996611 160000 --- a/vim/bundle/vim-bundler +++ b/vim/bundle/vim-bundler @@ -1 +1 @@ -Subproject commit 83cc90f8d044d6a220c87bd78395faebcc54ce1b +Subproject commit a9966117fea4595f320a80163cc4adf2e2bc0e30 diff --git a/vim/bundle/vim-coffee-script b/vim/bundle/vim-coffee-script index 32fe889..9e3b4de 160000 --- a/vim/bundle/vim-coffee-script +++ b/vim/bundle/vim-coffee-script @@ -1 +1 @@ -Subproject commit 32fe889b8cafd3a4921ef8e6485156453ff58c42 +Subproject commit 9e3b4de2a476caeb6ff21b5da20966d7c67a98bb diff --git a/vim/bundle/vim-cucumber/indent/cucumber.vim b/vim/bundle/vim-cucumber/indent/cucumber.vim index 965c778..ff5d590 100644 --- a/vim/bundle/vim-cucumber/indent/cucumber.vim +++ b/vim/bundle/vim-cucumber/indent/cucumber.vim @@ -27,6 +27,7 @@ function! GetCucumberIndent() let line = getline(prevnonblank(v:lnum-1)) let cline = getline(v:lnum) let nline = getline(nextnonblank(v:lnum+1)) + let sw = exists('*shiftwidth') ? shiftwidth() : &sw let syn = s:syn(prevnonblank(v:lnum-1)) let csyn = s:syn(v:lnum) let nsyn = s:syn(nextnonblank(v:lnum+1)) @@ -35,38 +36,38 @@ function! GetCucumberIndent() return 0 elseif csyn ==# 'cucumberExamples' || cline =~# '^\s*\%(Examples\|Scenarios\):' " examples heading - return 2 * &sw + return 2 * sw elseif csyn =~# '^cucumber\%(Background\|Scenario\|ScenarioOutline\)$' || cline =~# '^\s*\%(Background\|Scenario\|Scenario Outline\):' " background, scenario or outline heading - return &sw + return sw elseif syn ==# 'cucumberFeature' || line =~# '^\s*Feature:' " line after feature heading - return &sw + return sw elseif syn ==# 'cucumberExamples' || line =~# '^\s*\%(Examples\|Scenarios\):' " line after examples heading - return 3 * &sw + return 3 * sw elseif syn =~# '^cucumber\%(Background\|Scenario\|ScenarioOutline\)$' || line =~# '^\s*\%(Background\|Scenario\|Scenario Outline\):' " line after background, scenario or outline heading - return 2 * &sw + return 2 * sw elseif cline =~# '^\s*[@#]' && (nsyn == 'cucumberFeature' || nline =~# '^\s*Feature:' || indent(prevnonblank(v:lnum-1)) <= 0) " tag or comment before a feature heading return 0 elseif cline =~# '^\s*@' " other tags - return &sw + return sw elseif cline =~# '^\s*[#|]' && line =~# '^\s*|' " mid-table " preserve indent return indent(prevnonblank(v:lnum-1)) elseif cline =~# '^\s*|' && line =~# '^\s*[^|]' " first line of a table, relative indent - return indent(prevnonblank(v:lnum-1)) + &sw + return indent(prevnonblank(v:lnum-1)) + sw elseif cline =~# '^\s*[^|]' && line =~# '^\s*|' " line after a table, relative unindent - return indent(prevnonblank(v:lnum-1)) - &sw + return indent(prevnonblank(v:lnum-1)) - sw elseif cline =~# '^\s*#' && getline(v:lnum-1) =~ '^\s*$' && (nsyn =~# '^cucumber\%(Background\|Scenario\|ScenarioOutline\)$' || nline =~# '^\s*\%(Background\|Scenario\|Scenario Outline\):') " comments on scenarios - return &sw + return sw endif return indent(prevnonblank(v:lnum-1)) endfunction diff --git a/vim/bundle/vim-dispatch b/vim/bundle/vim-dispatch index 5d9d94f..4566b88 160000 --- a/vim/bundle/vim-dispatch +++ b/vim/bundle/vim-dispatch @@ -1 +1 @@ -Subproject commit 5d9d94f6997e38a0c04313cb0d748b1fb149f4cc +Subproject commit 4566b8892715361f9952fa4c29c05035fdede09d diff --git a/vim/bundle/vim-elixir b/vim/bundle/vim-elixir index 85593b1..0a847f0 160000 --- a/vim/bundle/vim-elixir +++ b/vim/bundle/vim-elixir @@ -1 +1 @@ -Subproject commit 85593b118bae081538943640648e5d57f22f0aba +Subproject commit 0a847f0faed5ba2d94bb3d51f355c50f37ba025b diff --git a/vim/bundle/vim-endwise b/vim/bundle/vim-endwise index bba43b8..f41ebc2 160000 --- a/vim/bundle/vim-endwise +++ b/vim/bundle/vim-endwise @@ -1 +1 @@ -Subproject commit bba43b831ae0485cf9b86d16340a6a314b927391 +Subproject commit f41ebc27b7042760c7812da9f33d5167b33a874e diff --git a/vim/bundle/vim-eunuch b/vim/bundle/vim-eunuch index e36b9a7..10da325 160000 --- a/vim/bundle/vim-eunuch +++ b/vim/bundle/vim-eunuch @@ -1 +1 @@ -Subproject commit e36b9a701dd3d8054e6b8a77b14710276a1d93c8 +Subproject commit 10da325fb032a1acfa9222d273459f53bad30ba4 diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive index 4cc201c..d4fb2a2 160000 --- a/vim/bundle/vim-fugitive +++ b/vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 4cc201cbe3a0c3faa4cde1b82ba941d410e5e81c +Subproject commit d4fb2a2f5c2023f477beae6aef47cf0457351e6e diff --git a/vim/bundle/vim-haml b/vim/bundle/vim-haml index 204e327..ca22091 160000 --- a/vim/bundle/vim-haml +++ b/vim/bundle/vim-haml @@ -1 +1 @@ -Subproject commit 204e32721154766e03e99ff857bc798aa5b741dc +Subproject commit ca22091688b108beafbe02fcc874eaf8d077b1ca diff --git a/vim/bundle/vim-heroku b/vim/bundle/vim-heroku index 13351fa..1dce1fb 160000 --- a/vim/bundle/vim-heroku +++ b/vim/bundle/vim-heroku @@ -1 +1 @@ -Subproject commit 13351fae74cc9e9e86d6421bab8499a1c9359cef +Subproject commit 1dce1fb62e0f100c70c2d101b47bd4acc8c1c81c diff --git a/vim/bundle/vim-indent-guides b/vim/bundle/vim-indent-guides index 49bde6f..54d889a 160000 --- a/vim/bundle/vim-indent-guides +++ b/vim/bundle/vim-indent-guides @@ -1 +1 @@ -Subproject commit 49bde6fa30648345ffabfe55b3a095a293568a2e +Subproject commit 54d889a63716ee2f1818aa2ec5082db47147147b diff --git a/vim/bundle/vim-javascript b/vim/bundle/vim-javascript index 8a409f7..dd84369 160000 --- a/vim/bundle/vim-javascript +++ b/vim/bundle/vim-javascript @@ -1 +1 @@ -Subproject commit 8a409f7fd89de746296a92218183dc69fb6e3d93 +Subproject commit dd84369d731bcb8feee0901cbb9b63a2b219bf28 diff --git a/vim/bundle/vim-jsx b/vim/bundle/vim-jsx index b1047b0..ffc0bfd 160000 --- a/vim/bundle/vim-jsx +++ b/vim/bundle/vim-jsx @@ -1 +1 @@ -Subproject commit b1047b07504c90c73f82c7f2de3a75688240d2ab +Subproject commit ffc0bfd9da15d0fce02d117b843f718160f7ad27 diff --git a/vim/bundle/vim-markdown b/vim/bundle/vim-markdown index 409c37b..e2d7fcd 160000 --- a/vim/bundle/vim-markdown +++ b/vim/bundle/vim-markdown @@ -1 +1 @@ -Subproject commit 409c37b205afa2f9d590e23de8171482d66770e2 +Subproject commit e2d7fcd682a461a3951e8b5067cc8a0083e75e35 diff --git a/vim/bundle/vim-mustache-handlebars b/vim/bundle/vim-mustache-handlebars new file mode 160000 index 0000000..065b0be --- /dev/null +++ b/vim/bundle/vim-mustache-handlebars @@ -0,0 +1 @@ +Subproject commit 065b0be69415ed7f7bdd8b46a80f07f73b1f6cfa diff --git a/vim/bundle/vim-projectionist b/vim/bundle/vim-projectionist new file mode 160000 index 0000000..ee68be4 --- /dev/null +++ b/vim/bundle/vim-projectionist @@ -0,0 +1 @@ +Subproject commit ee68be42d26a8879b871c051e85ce0dfae7364f0 diff --git a/vim/bundle/vim-ragtag b/vim/bundle/vim-ragtag index bef689a..678ef37 160000 --- a/vim/bundle/vim-ragtag +++ b/vim/bundle/vim-ragtag @@ -1 +1 @@ -Subproject commit bef689a4d5ceb10bbe1b5aa216394bc3197a1258 +Subproject commit 678ef376132f0c9dc882b1f299d2d7fd66caedc1 diff --git a/vim/bundle/vim-rails b/vim/bundle/vim-rails index 41380b1..30a5719 160000 --- a/vim/bundle/vim-rails +++ b/vim/bundle/vim-rails @@ -1 +1 @@ -Subproject commit 41380b11dcf7695d20f22c23eca32e56713db6c9 +Subproject commit 30a5719dc9f66c49db7cd2c521ed56c6bee8bb04 diff --git a/vim/bundle/vim-rake b/vim/bundle/vim-rake index ba2a9cf..3beb150 160000 --- a/vim/bundle/vim-rake +++ b/vim/bundle/vim-rake @@ -1 +1 @@ -Subproject commit ba2a9cf9266189d542abdd860a5ac282249dcdfe +Subproject commit 3beb1504493931da4405a1aac5f2f42b1e9ee554 diff --git a/vim/bundle/vim-rhubarb b/vim/bundle/vim-rhubarb index 3772a98..b6cbbb0 160000 --- a/vim/bundle/vim-rhubarb +++ b/vim/bundle/vim-rhubarb @@ -1 +1 @@ -Subproject commit 3772a98b3a2f4e7440d0924e923aca7187234e7b +Subproject commit b6cbbb0ad3e22870a3cd8d79a22722c63d98d18b diff --git a/vim/bundle/vim-rspec b/vim/bundle/vim-rspec index f733ab3..52a7259 160000 --- a/vim/bundle/vim-rspec +++ b/vim/bundle/vim-rspec @@ -1 +1 @@ -Subproject commit f733ab32702577ad799e3cd4095aa0bd5bcaf582 +Subproject commit 52a72592b6128f4ef1557bc6e2e3eb014d8b2d38 diff --git a/vim/bundle/vim-ruby b/vim/bundle/vim-ruby index ef2deea..68aa43c 160000 --- a/vim/bundle/vim-ruby +++ b/vim/bundle/vim-ruby @@ -1 +1 @@ -Subproject commit ef2deeae81f540a17a3da5907146b3579c8ee0d6 +Subproject commit 68aa43c524b20aaaa269265d315a87b89e6d0148 diff --git a/vim/bundle/vim-rubytest b/vim/bundle/vim-rubytest index 58f7830..fd11caf 160000 --- a/vim/bundle/vim-rubytest +++ b/vim/bundle/vim-rubytest @@ -1 +1 @@ -Subproject commit 58f7830cd9e4ac357d269826b7396594258e70ab +Subproject commit fd11caf94ac6c39497139fdfdba6929e7d6f070d diff --git a/vim/bundle/vim-slim/README.md b/vim/bundle/vim-slim/README.md index a2c277b..a67e6ce 100644 --- a/vim/bundle/vim-slim/README.md +++ b/vim/bundle/vim-slim/README.md @@ -10,16 +10,14 @@ If you are already using pathogen, you can skip to step 3. 1. Install pathogen (if you haven't already) - mkdir -p ~/.vim/autoload ~/.vim/bundle; \ - curl -so ~/.vim/autoload/pathogen.vim \ - https://raw.github.com/tpope/vim-pathogen/master/autoload/pathogen.vim + mkdir -p ~/.vim/autoload ~/.vim/bundle && \ + curl -LSso ~/.vim/autoload/pathogen.vim https://tpo.pe/pathogen.vim 2. Edit `~/.vimrc` to run pathogen as the first line of the file (if you haven't already) ```vim - call pathogen#infect() - - syntax enable + execute pathogen#infect() + syntax on filetype plugin indent on ``` @@ -30,26 +28,28 @@ If you are already using pathogen, you can skip to step 3. popd -Install with vbundle +Install with Vundle -------------------- 1. [Install Vundle] into `~/.vim/bundle/`. -[Install Vundle]: https://github.com/gmarik/vundle#quick-start +[Install Vundle]: https://github.com/gmarik/Vundle.vim#quick-start mkdir -p ~/.vim/bundle; pushd ~/.vim/bundle; \ - git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle + git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim popd 2. Configure your vimrc for Vundle. Here's a bare-minimum vimrc that enables vim-slim : ```vim - set rtp+=~/.vim/bundle/vundle/ - call vundle#rc() + set rtp+=~/.vim/bundle/Vundle.vim + call vundle#begin() - Bundle 'slim-template/vim-slim.git' + Plugin 'gmarik/Vundle.vim' + Plugin 'slim-template/vim-slim.git' + call vundle#end() syntax enable filetype plugin indent on ``` @@ -57,6 +57,33 @@ Install with vbundle If you're adding Vundle to a built-up vimrc, just make sure all these calls are in there and that they occur in this order. -3. Open vim and run `:BundleInstall`. +3. Open vim and run `:PluginInstall`. + +To update, open vim and run `:PluginInstall!` (notice the bang!) + + +Known Issues +------------ + +We use `setfiletype` upon autodetect, which does not overrides filetype once it +was set. That leads into an issue when filetype is set to `html` before we took +our chance (happens when slim file has `doctype html` header): + +> Vim's `filetype.vim` has an `autocmd` that tries to detect *html* files based +> on *doctype* and this is triggered **before** scripts in `ftdetect/*` +> are sourced. +> +> -- https://github.com/slim-template/vim-slim/issues/38#issuecomment-23760100 + +To avoid that you have two options. Either using `doctype 5` instead of +`doctype html` or adding your own enforced version of `autocmd` to your +`.vimrc`: + +```vim +autocmd BufNewFile,BufRead *.slim setlocal filetype=slim +``` + +See Also: -To update, open vim and run `:BundleInstall!` (notice the bang!) +- https://github.com/slim-template/vim-slim/issues/38 +- https://github.com/slim-template/vim-slim/commit/1ac9ebd51467ddbe0f12f01cdac57a76483a00af diff --git a/vim/bundle/vim-slim/ftdetect/slim.vim b/vim/bundle/vim-slim/ftdetect/slim.vim index 17723d8..cf6054f 100644 --- a/vim/bundle/vim-slim/ftdetect/slim.vim +++ b/vim/bundle/vim-slim/ftdetect/slim.vim @@ -1 +1 @@ -autocmd BufNewFile,BufRead *.slim set filetype=slim +autocmd BufNewFile,BufRead *.slim setfiletype slim diff --git a/vim/bundle/vim-slim/ftplugin/slim.vim b/vim/bundle/vim-slim/ftplugin/slim.vim new file mode 100644 index 0000000..4a0989c --- /dev/null +++ b/vim/bundle/vim-slim/ftplugin/slim.vim @@ -0,0 +1,25 @@ +if exists("b:did_ftplugin") + finish +endif + +" Define some defaults in case the included ftplugins don't set them. +let s:undo_ftplugin = "" + +" Override our defaults if these were set by an included ftplugin. +if exists("b:undo_ftplugin") + let s:undo_ftplugin = b:undo_ftplugin + unlet b:undo_ftplugin +endif + +runtime! ftplugin/ruby.vim ftplugin/ruby_*.vim ftplugin/ruby/*.vim +let b:did_ftplugin = 1 + +" Combine the new set of values with those previously included. +if exists("b:undo_ftplugin") + let s:undo_ftplugin = b:undo_ftplugin . " | " . s:undo_ftplugin +endif + +let b:undo_ftplugin = "setl isk<" . " | " . s:undo_ftplugin + +setlocal iskeyword+=- +setlocal commentstring=/%s diff --git a/vim/bundle/vim-slim/syntax/slim.vim b/vim/bundle/vim-slim/syntax/slim.vim index b8d7b6a..bf4850e 100644 --- a/vim/bundle/vim-slim/syntax/slim.vim +++ b/vim/bundle/vim-slim/syntax/slim.vim @@ -66,6 +66,12 @@ syn region slimInterpolation matchgroup=slimInterpolationDelimiter start="#{" en syn region slimInterpolation matchgroup=slimInterpolationDelimiter start="#{{" end="}}" contains=@hamlRubyTop containedin=javascriptStringS,javascriptStringD,slimWrappedAttrs syn match slimInterpolationEscape "\\\@ /dev/null") + call VimuxRunCommand("(cd ".shellescape(expand('%:p:h'), 1)." && ".a:command." ".l:file.")") endfunction function! VimuxRunLastCommand() @@ -53,12 +53,12 @@ function! VimuxRunCommand(command, ...) endfunction function! VimuxSendText(text) - call VimuxSendKeys('"'.escape(a:text, '"$').'"') + call VimuxSendKeys('"'.escape(a:text, '\"$`').'"') endfunction function! VimuxSendKeys(keys) if exists("g:VimuxRunnerIndex") - call system("tmux send-keys -t ".g:VimuxRunnerIndex." ".a:keys) + call _VimuxTmux("send-keys -t ".g:VimuxRunnerIndex." ".a:keys) else echo "No vimux runner pane/window. Create one with VimuxOpenRunner" endif @@ -73,19 +73,19 @@ function! VimuxOpenRunner() if _VimuxRunnerType() == "pane" let height = _VimuxOption("g:VimuxHeight", 20) let orientation = _VimuxOption("g:VimuxOrientation", "v") - call system("tmux split-window -p ".height." -".orientation) + call _VimuxTmux("split-window -p ".height." -".orientation) elseif _VimuxRunnerType() == "window" - call system("tmux new-window") + call _VimuxTmux("new-window") endif let g:VimuxRunnerIndex = _VimuxTmuxIndex() - call system("tmux last-"._VimuxRunnerType()) + call _VimuxTmux("last-"._VimuxRunnerType()) endif endfunction function! VimuxCloseRunner() if exists("g:VimuxRunnerIndex") - call system("tmux kill-"._VimuxRunnerType()." -t ".g:VimuxRunnerIndex) + call _VimuxTmux("kill-"._VimuxRunnerType()." -t ".g:VimuxRunnerIndex) unlet g:VimuxRunnerIndex endif endfunction @@ -93,10 +93,10 @@ endfunction function! VimuxTogglePane() if exists("g:VimuxRunnerIndex") if _VimuxRunnerType() == "window" - call system("tmux join-pane -d -s ".g:VimuxRunnerIndex." -p "._VimuxOption("g:VimuxHeight", 20)) + call _VimuxTmux("join-pane -d -s ".g:VimuxRunnerIndex." -p "._VimuxOption("g:VimuxHeight", 20)) let g:VimuxRunnerType = "pane" elseif _VimuxRunnerType() == "pane" - let g:VimuxRunnerIndex=substitute(system("tmux break-pane -d -t ".g:VimuxRunnerIndex." -P -F '#{window_index}'"), "\n", "", "") + let g:VimuxRunnerIndex=substitute(_VimuxTmux("break-pane -d -t ".g:VimuxRunnerIndex." -P -F '#{window_index}'"), "\n", "", "") let g:VimuxRunnerType = "window" endif endif @@ -105,27 +105,27 @@ endfunction function! VimuxZoomRunner() if exists("g:VimuxRunnerIndex") if _VimuxRunnerType() == "pane" - call system("tmux resize-pane -Z -t ".g:VimuxRunnerIndex) + call _VimuxTmux("resize-pane -Z -t ".g:VimuxRunnerIndex) elseif _VimuxRunnerType() == "window" - call system("tmux select-window -t ".g:VimuxRunnerIndex) + call _VimuxTmux("select-window -t ".g:VimuxRunnerIndex) endif endif endfunction function! VimuxInspectRunner() - call system("tmux select-"._VimuxRunnerType()." -t ".g:VimuxRunnerIndex) - call system("tmux copy-mode") + call _VimuxTmux("select-"._VimuxRunnerType()." -t ".g:VimuxRunnerIndex) + call _VimuxTmux("copy-mode") endfunction function! VimuxScrollUpInspect() call VimuxInspectRunner() - call system("tmux last-"._VimuxRunnerType()) + call _VimuxTmux("last-"._VimuxRunnerType()) call VimuxSendKeys("C-u") endfunction function! VimuxScrollDownInspect() call VimuxInspectRunner() - call system("tmux last-"._VimuxRunnerType()) + call _VimuxTmux("last-"._VimuxRunnerType()) call VimuxSendKeys("C-d") endfunction @@ -135,7 +135,7 @@ endfunction function! VimuxClearRunnerHistory() if exists("g:VimuxRunnerIndex") - call system("tmux clear-history -t ".g:VimuxRunnerIndex) + call _VimuxTmux("clear-history -t ".g:VimuxRunnerIndex) endif endfunction @@ -145,6 +145,11 @@ function! VimuxPromptCommand(...) call VimuxRunCommand(l:command) endfunction +function! _VimuxTmux(arguments) + let l:command = _VimuxOption("g:VimuxTmuxCommand", "tmux") + return system(l:command." ".a:arguments) +endfunction + function! _VimuxTmuxSession() return _VimuxTmuxProperty("#S") endfunction @@ -166,7 +171,7 @@ function! _VimuxTmuxWindowIndex() endfunction function! _VimuxNearestIndex() - let views = split(system("tmux list-"._VimuxRunnerType()."s"), "\n") + let views = split(_VimuxTmux("list-"._VimuxRunnerType()."s"), "\n") for view in views if match(view, "(active)") == -1 @@ -190,9 +195,9 @@ function! _VimuxOption(option, default) endfunction function! _VimuxTmuxProperty(property) - return substitute(system("tmux display -p '".a:property."'"), '\n$', '', '') + return substitute(_VimuxTmux("display -p '".a:property."'"), '\n$', '', '') endfunction function! _VimuxHasRunner(index) - return match(system("tmux list-"._VimuxRunnerType()."s -a"), a:index.":") + return match(_VimuxTmux("list-"._VimuxRunnerType()."s -a"), a:index.":") endfunction diff --git a/vim/bundle/webapi-vim b/vim/bundle/webapi-vim index a7789ab..2522503 160000 --- a/vim/bundle/webapi-vim +++ b/vim/bundle/webapi-vim @@ -1 +1 @@ -Subproject commit a7789abffe936db56e3152e23733847f94755753 +Subproject commit 252250381a9509257bfb06b9f95441e41e3e23b5 diff --git a/vimrc b/vimrc index 9967d21..c761134 100644 --- a/vimrc +++ b/vimrc @@ -41,24 +41,31 @@ Plugin 'kien/ctrlp.vim' Plugin 'rorymckinley/vim-rubyhash' Plugin 'tomtom/quickfixsigns_vim' Plugin 'benmills/vimux' +Plugin 'skalnik/vim-vroom' Plugin 'ervandew/supertab' Plugin 'kchmck/vim-coffee-script' Plugin 'pangloss/vim-javascript' Plugin 'slim-template/vim-slim' Plugin 'altercation/vim-colors-solarized' -Plugin 'thoughtbot/vim-rspec' Plugin 'tomtom/tcomment_vim' Plugin 'christoomey/vim-tmux-navigator' Plugin 'vim-scripts/AutoClose' Plugin 'MarcWeber/vim-addon-mw-utils' Plugin 'tomtom/tlib_vim' Plugin 'garbas/vim-snipmate' +Plugin 'honza/vim-snippets' Plugin 'mileszs/vim-react-snippets' Plugin 'mxw/vim-jsx' Plugin 'nathanaelkane/vim-indent-guides' Plugin 'rizzatti/dash.vim' Plugin 'scrooloose/syntastic' Plugin 'elixir-lang/vim-elixir' +Plugin 'c-brenn/phoenix.vim' +Plugin 'tpope/vim-projectionist' +Plugin 'mustache/vim-mustache-handlebars' +Plugin 'tclem/vim-arduino' +Plugin 'godlygeek/tabular' +Plugin 'dart-lang/dart-vim-plugin' " All of your Plugins must be added before the following line call vundle#end() " required @@ -166,11 +173,6 @@ autocmd BufNewFile,BufRead *.html.slim set filetype=slim " JSX highlighting in regular JS files let g:jsx_ext_required = 0 -" tslime -vmap rs SendSelectionToTmux -nmap rt NormalModeSendToTmux -nmap rr SetTmuxVars - " quickfixsigns let g:quickfixsigns_classes=['qfl', 'vcsdiff', 'breakpoints'] @@ -195,21 +197,15 @@ let g:rails_projections = { \ "test": [ \ "spec/forms/%s_spec.rb" \ ] + \ }, + \ "app/lib/*.rb": { + \ "command": "lib", + \ "test": [ + \ "spec/lib/%s_spec.rb" + \ ] \ } \ } -let g:rspec_runner = "os_x_iterm" -let g:rspec_command = "Dispatch rspec {spec}" - -" RSpec.vim mappings -" map t :call RunCurrentSpecFile() -" map s :call RunNearestSpec() -" map l :call RunLastSpec() -" map a :call RunAllSpecs()" - -let g:rubytest_cmd_test = "cd ./; bin/spring testunit %p" -let g:rubytest_cmd_testcase = "cd ./; bin/spring testunit %p -n '/%c/'" - " Split faster nmap vv :vsp nmap ss :sp @@ -230,6 +226,27 @@ let g:syntastic_auto_loc_list = 2 let g:syntastic_check_on_open = 1 let g:syntastic_check_on_wq = 0 let g:syntastic_enable_rubocop_checker = 1 +let g:syntastic_javascript_checkers = ['eslint'] + + +let g:ctrlp_custom_ignore = { + \ 'dir': '\v[\/](\.git|node_modules|doc)$', + \ 'file': '\v\.(exe|so|dll)$', + \ 'link': '', + \ } + +let g:vroom_clear_screen=0 +let g:vroom_use_vimux=1 +let g:vroom_use_binstubs=0 +let g:vroom_use_bundle_exec=1 +let g:vroom_rspec_version='3.x' +let g:vroom_use_colors=0 + +" Arduino +" Default: /Applications/Arduino.app/Contents/Resources/Java +let g:vim_arduino_library_path = '/Users/mileszs/code/Arduino' +" Default: result of `$(ls /dev/tty.* | grep usb)` +let g:vim_arduino_serial_port = '/dev/tty.usbmodem1411' " github source /Users/mileszs/.vimgithubrc diff --git a/zsh/aliases.sh b/zsh/aliases.sh index d2aead7..8c9b07c 100644 --- a/zsh/aliases.sh +++ b/zsh/aliases.sh @@ -17,6 +17,8 @@ alias gv='mvim' alias sv='sudo vim' alias apache='sudo /etc/init.d/apache2' +alias hg='history | grep' + # Rails alias b='bundle exec' alias bi='bundle install' @@ -27,6 +29,7 @@ alias console='bin/rails console' alias production-console='bin/rails console production' alias generate='bin/rails generate' alias test='bundle exec ruby -Itest' +alias rspec='bundle exec rspec' alias unit-tests='bin/rake test:units' alias functional-tests='bin/rake test:functionals' alias integration-tests='bin/rake test:integration' diff --git a/zsh/git.sh b/zsh/git.sh index 6ea18d3..7452ca6 100644 --- a/zsh/git.sh +++ b/zsh/git.sh @@ -9,7 +9,7 @@ alias gi='git init; printf "*.swp\n.DS_Store\nThumbs.db\n" >> .gitignore' # http://www.jukie.net/~bart/blog/pimping-out-git-log alias gl="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%an %cr)%Creset' --abbrev-commit --date=relative" alias glp='gl -p' -alias gls='git shortlog -s --' +# alias gls='git shortlog -s --' alias gs='git status' alias gd='git diff' diff --git a/zshrc b/zshrc index cec498e..a45ef35 100644 --- a/zshrc +++ b/zshrc @@ -1,20 +1,17 @@ # This borrows from my .bashrc, of course, and also heavily from # claytron: http://github.com/claytron/dotfiles -# This loads RVM into a shell session. -[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" - UNAME=$(uname) # Path to your oh-my-zsh configuration. export ZSH=$HOME/.oh-my-zsh # Set to the name theme to load. # Look in ~/.oh-my-zsh/themes/ -export ZSH_THEME="miloshadzic" +export ZSH_THEME="agnoster" # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) # Example format: plugins=(rails git textmate ruby lighthouse) -plugins=(rails ruby git osx zsh-syntax-highlighting chruby vi-mode) +plugins=(git osx zsh-syntax-highlighting vi-mode) source $ZSH/oh-my-zsh.sh @@ -23,6 +20,7 @@ export EDITOR=vim export NODE_PATH="/usr/local/lib/node" export CDPATH=$CDPATH:$HOME:$HOME/code +export DEFAULT_USER="mileszs" # use vi mode bindkey -v @@ -82,13 +80,11 @@ typeset -U path cdpath fpath ### Added by the Heroku Toolbelt export PATH="/usr/local/heroku/bin:$PATH" -export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting - export PATH="/usr/local/bin:$PATH" # chruby -source /usr/local/opt/chruby/share/chruby/chruby.sh -source /usr/local/opt/chruby/share/chruby/auto.sh +source /usr/local/share/chruby/chruby.sh +source /usr/local/share/chruby/auto.sh # NVM source ~/.nvm/nvm.sh @@ -98,3 +94,9 @@ export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" export MANPATH="/usr/local/opt/coreutils/libexec/gnuman:$MANPATH" export PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH" export MANPATH="/usr/local/opt/gnu-sed/libexec/gnuman:$MANPATH" + +# tiny-care-terminal +export TTC_WEATHER="Indianapolis" +export TTC_CELSIUS=false +export TTC_REPOS="springbuk/springbuk" +export TTC_APIKEYS=false