Merge 69e53411bf into 5667161d49

plugins/pip/_pip2

@@ -0,0 +1,74 @@
+#compdef pip2
+#autoload
+
+# pip2 zsh completion, based on homebrew completion
+
+_pip2_all() {
+  # we cache the list of packages (originally from the macports plugin)
+  if (( ! $+pip2list )); then
+    echo -n " (caching package index...)"
+	pip2list=($(pip2 search * | cut -d ' ' -f 1 | tr '[A-Z]' '[a-z]'))
+  fi
+}
+
+_pip2_installed() {
+  installed_pkgs=(`pip2 freeze | cut -d '=' -f 1`)
+}
+
+local -a _1st_arguments
+_1st_arguments=(
+  'bundle:create pybundles (archives containing multiple packages)'
+  'freeze:output all currently installed packages (exact versions) to stdout'
+  'help:show available commands'
+  'install:install packages'
+  'search:search PyPI'
+  'uninstall:uninstall packages'
+  'unzip:unzip individual packages'
+  'zip:zip individual packages'
+)
+
+local expl
+local -a all_pkgs installed_pkgs
+
+_arguments \
+  '(--version)--version[show version number of program and exit]' \
+  '(-h --help)'{-h,--help}'[show help]' \
+  '(-E --environment)'{-E,--environment}'[virtualenv environment to run pip2 in]' \
+  '(-s --enable-site-packages)'{-s,--enable-site-packages}'[include site-packages in virtualenv]' \
+  '(-v --verbose)'{-v,--verbose}'[give more output]' \
+  '(-q --quiet)'{-q,--quiet}'[give less output]' \
+  '(--log)--log[log file location]' \
+  '(--proxy)--proxy[proxy in form user:passwd@proxy.server:port]' \
+  '(--timeout)--timeout[socket timeout (default 15s)]' \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "pip2 subcommand" _1st_arguments
+  return
+fi
+
+case "$words[1]" in
+  search)
+    _arguments \
+      '(--index)--index[base URL of Python Package Index]' ;;
+  freeze)
+    _arguments \
+      '(-l --local)'{-l,--local}'[report only virtualenv packages]' ;;
+  install)
+  	_arguments \
+      '(-U --upgrade)'{-U,--upgrade}'[upgrade all packages to the newest available version]' \
+      '(-f --find-links)'{-f,--find-links}'[URL for finding packages]' \
+      '(--no-deps --no-dependencies)'{--no-deps,--no-dependencies}'[iIgnore package dependencies]' \
+      '(--no-install)--no-install[only download packages]' \
+      '(--no-download)--no-download[only install downloaded packages]' \
+      '(--install-option)--install-option[extra arguments to be supplied to the setup.py]' \
+      '1: :->packages' &&  return 0
+     
+      if [[ "$state" == packages ]]; then
+        _pip2_all
+        _wanted pip2list expl 'packages' compadd -a pip2list
+      fi ;;
+  uninstall)
+    _pip2_installed
+    _wanted installed_pkgs expl 'installed packages' compadd -a installed_pkgs ;;
+esac

plugins/safe-paste/safe-paste.plugin.zsh

@@ -43,12 +43,12 @@ function _paste_insert() {
 
 function _zle_line_init() {
   # Tell terminal to send escape codes around pastes.
-  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color || $TERM = screen || $TERM = screen-256color ]] && printf '\e[?2004h'
+  [[ $TERM == rxvt-unicode || $TERM == rxvt-unicode-256color || $TERM == xterm || $TERM = xterm-256color ]] && printf '\e[?2004h'
 }
 
 function _zle_line_finish() {
   # Tell it to stop when we leave zle, so pasting in other programs
   # doesn't get the ^[[200~ codes around the pasted text.
-  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color || $TERM = screen || $TERM = screen-256color ]] && printf '\e[?2004l'
+  [[ $TERM == rxvt-unicode || $TERM == rxvt-unicode-256color || $TERM == xterm || $TERM = xterm-256color ]] && printf '\e[?2004l'
 }