[WIP] Add more completion settings

CONTRIBUTING.md

@@ -39,3 +39,4 @@ improve its performance, do not hesitate to fork and send pull requests.
 [3]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 [4]: https://help.github.com/articles/using-pull-requests
 [5]: http://daringfireball.net/projects/markdown/syntax#img
+

README.md

@@ -8,8 +8,9 @@ and prompt themes.
 Installation
 ------------
 
-Prezto will work with any recent release of Zsh, but the minimum required
+Prezto will work with any recent release of Zsh, but the minimum recommended
-version is 4.3.17.
+version is 4.3.11. Unfortunately, [Cygwin][9] is not supported due to
+non-standard core utilities.
 
   1. Launch Zsh:
 
@@ -36,7 +37,7 @@ version is 4.3.17.
 ### Troubleshooting
 
 If you are not able to find certain commands after switching to *Prezto*,
-modify the `PATH` variable in *~/.zprofile* then open a new Zsh terminal
+modify the `PATH` variable in *~/.zshenv* then open a new Zsh terminal
 window or tab.
 
 Updating
@@ -85,8 +86,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009-2011 Robby Russell and contributors.
+Copyright (c) 2009-2014 Sorin Ionescu and contributors.
-Copyright (c) 2011-2014 Sorin Ionescu and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -114,3 +114,5 @@ SOFTWARE.
 [6]: http://gitref.org
 [7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf
 [8]: http://grml.org/zsh/zsh-lovers.html
+[9]: http://www.cygwin.com
+

init.zsh

@@ -10,7 +10,7 @@
 #
 
 # Check for the minimum supported version.
-min_zsh_version='4.3.17'
+min_zsh_version='4.3.11'
 if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then
   print "prezto: old shell detected, minimum required: $min_zsh_version" >&2
   return 1
@@ -25,7 +25,7 @@ unset min_zsh_version
 function pmodload {
   local -a pmodules
   local pmodule
-  local pfunction_glob='^([_.]*|prompt_*_setup|README*)(-.N:t)'
+  local pfunction_glob='^([_.]*|prompt_*_setup|README*)(.N:t)'
 
   # $argv is overridden in the anonymous function.
   pmodules=("$argv[@]")
@@ -111,3 +111,4 @@ unset zfunction{s,}
 zstyle -a ':prezto:load' pmodule 'pmodules'
 pmodload "$pmodules[@]"
 unset pmodules
+

modules/README.md

@@ -102,10 +102,10 @@ Node.js
 
 Provides utility functions for Node.js and loads npm completion.
 
-OCaml
+Ocaml
 -----
 
-Initializes OCaml package management.
+Initializes Ocaml package management.
 
 OSX
 ---
@@ -192,3 +192,4 @@ Yum
 ---
 
 Defines yum aliases.
+

modules/archive/README.md

@@ -38,3 +38,4 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/sorin-ionescu/prezto/issues
+

modules/archive/functions/_lsarchive

@@ -11,3 +11,4 @@
 _arguments \
   '(-v --verbose)'{-v,--remove}'[verbose archive listing]' \
   "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|rar|7z)(-.)'" && return 0
+

modules/archive/functions/_unarchive

@@ -11,3 +11,4 @@
 _arguments \
   '(-r --remove)'{-r,--remove}'[remove archive]' \
   "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|rar|7z|deb)(-.)'" && return 0
+

modules/archive/functions/lsarchive

@@ -30,7 +30,7 @@ while (( $# > 0 )); do
     continue
   fi
 
-  case "$1:l" in
+  case "$1" in
     (*.tar.gz|*.tgz) tar t${verbose:+v}vzf "$1" ;;
     (*.tar.bz2|*.tbz|*.tbz2) tar t${verbose:+v}jf "$1" ;;
     (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
@@ -46,10 +46,11 @@ while (( $# > 0 )); do
       || rar ${${verbose:+v}:-l} "$1" ;;
     (*.7z) 7za l "$1" ;;
     (*)
-      print "$0: cannot list: $1" >&2
+			print "$0: cannot list: $1" >&2
       success=1
     ;;
   esac
 
   shift
 done
+

modules/archive/functions/unarchive

@@ -37,7 +37,7 @@ while (( $# > 0 )); do
   success=0
   file_name="${1:t}"
   extract_dir="${file_name:r}"
-  case "$1:l" in
+  case "$1" in
     (*.tar.gz|*.tgz) tar xvzf "$1" ;;
     (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
     (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
@@ -54,8 +54,8 @@ while (( $# > 0 )); do
     (*.Z) uncompress "$1" ;;
     (*.zip) unzip "$1" -d $extract_dir ;;
     (*.rar) unrar &> /dev/null \
-      && unrar x -ad "$1" \
+      && unrar e -ad "$1" \
-      || rar x -ad "$1" ;;
+      || rar e -ad "$1" ;;
     (*.7z) 7za x "$1" ;;
     (*.deb)
       mkdir -p "$extract_dir/control"
@@ -76,3 +76,4 @@ while (( $# > 0 )); do
   (( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
   shift
 done
+

modules/command-not-found/README.md

@@ -13,3 +13,4 @@ Authors
 
 [1]: https://code.launchpad.net/command-not-found
 [2]: https://github.com/sorin-ionescu/prezto/issues
+

modules/command-not-found/init.zsh

@@ -15,3 +15,4 @@ elif [[ -s '/usr/share/doc/pkgfile/command-not-found.zsh' ]]; then
 else
   return 1
 fi
+

modules/completion/README.md

@@ -21,3 +21,4 @@ Authors
 
 [1]: https://github.com/zsh-users/zsh-completions
 [2]: https://github.com/sorin-ionescu/prezto/issues
+

modules/completion/init.zsh

@@ -61,6 +61,44 @@ zstyle ':completion:*' format ' %F{yellow}-- %d --%f'
 zstyle ':completion:*' group-name ''
 zstyle ':completion:*' verbose yes
 
+
+# Don't autoexpand until nothing else has changed on line
+zstyle ':completion:*' keep-prefix true
+zstyle ':completion:*' expand prefix suffix
+# zstyle ':completion:*' suffix true
+
+# Complete ..
+zstyle ':completion:*' special-dirs ..
+
+# Do not select the current directory when executing cd ../<tab>.
+zstyle ':completion:*:cd:*' ignore-parents parent pwd
+
+# Do not perform completion on pastes containing tabs.
+zstyle ':completion:*' insert-tab pending
+
+# Some completion settings
+# zstyle ':completion:*:match:*' match-original only
+zstyle ':completion:*' insert-unambiguous true
+
+# Expand partial paths.
+# zstyle ':completion:*' squeeze-slashes true
+
+# Rehash when failing to find the executable.
+zstyle ':completion:*' rehash true
+
+# Add a recent director listing completion using the cdr command
+autoload -Uz chpwd_recent_dirs cdr add-zsh-hook
+add-zsh-hook chpwd chpwd_recent_dirs
+zstyle ':completion:*:*:cdr:*:*' menu selection
+zstyle ':chpwd:*' recent-dirs-default true
+zstyle ':completion:*' recent-dirs-insert both
+zstyle ':chpwd:*' recent-dirs-prune parent
+
+
+
+
+
+
 # Fuzzy match mistyped completions.
 zstyle ':completion:*' completer _complete _match _approximate
 zstyle ':completion:*:match:*' original only
@@ -116,7 +154,7 @@ zstyle ':completion:*:(rm|kill|diff):*' ignore-line other
 zstyle ':completion:*:rm:*' file-patterns '*:all-files'
 
 # Kill
-zstyle ':completion:*:*:*:*:processes' command 'ps -u $USER -o pid,user,command -w'
+zstyle ':completion:*:*:*:*:processes' command 'ps -u $USER -o pid,user,comm -w'
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;36=0=01'
 zstyle ':completion:*:*:kill:*' menu yes select
 zstyle ':completion:*:*:kill:*' force-list always
@@ -146,3 +184,4 @@ zstyle ':completion:*:ssh:*' group-order users hosts-domain hosts-host users hos
 zstyle ':completion:*:(ssh|scp|rsync):*:hosts-host' ignored-patterns '*(.|:)*' loopback ip6-loopback localhost ip6-localhost broadcasthost
 zstyle ':completion:*:(ssh|scp|rsync):*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^[-[:alnum:]]##(.[-[:alnum:]]##)##' '*@*'
 zstyle ':completion:*:(ssh|scp|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.0.0.<->' '255.255.255.255' '::1' 'fe80::*'
+

modules/directory/README.md

@@ -33,3 +33,4 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/sorin-ionescu/prezto/issues
+

modules/directory/init.zsh

@@ -28,3 +28,4 @@ unsetopt CLOBBER            # Do not overwrite existing files with > and >>.
 
 alias d='dirs -v'
 for index ({1..9}) alias "$index"="cd +${index}"; unset index
+

modules/dpkg/README.md

@@ -39,3 +39,4 @@ Authors
 
 [1]: http://wiki.debian.org/Teams/Dpkg
 [2]: https://github.com/sorin-ionescu/prezto/issues
+

modules/dpkg/functions/deb-clone

@@ -23,3 +23,4 @@ rm "$clone_script"
 print '#!/bin/sh\n' > "$clone_script"
 print "aptitude install ${package_list}\n" >> "$clone_script"
 chmod +x "$clone_script"
+

modules/dpkg/functions/deb-history

@@ -34,3 +34,4 @@ Commands:
 EOF
   ;;
 esac
+

modules/dpkg/functions/deb-kbuild

@@ -12,3 +12,4 @@ MAKEFLAGS='' time fakeroot make-kpkg \
   --revision "$(date +"%Y%m%d")" \
   kernel_image \
   kernel_headers
+

modules/dpkg/init.zsh

@@ -55,3 +55,4 @@ alias deb-build='time dpkg-buildpackage -rfakeroot -us -uc'
 
 # Removes all kernel images and headers, except for the ones in use.
 alias deb-kclean='sudo aptitude remove -P "?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))"'
+

modules/editor/README.md

@@ -49,7 +49,8 @@ To indicate when the editor is completing, add the following to your
     zstyle ':prezto:module:editor:info:completing' format '...'
 
 Then add `$editor_info[context]`, where context is *keymap*, *insert*, or
-*overwrite*, to `$PROMPT` or `$RPROMPT`.
+*overwrite*, to `$PROMPT` or `$RPROMPT` and call `editor-info` in the
+`prompt_name_preexec` hook function.
 
 Authors
 -------
@@ -59,3 +60,4 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+

modules/editor/init.zsh

@@ -28,42 +28,40 @@ WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
 zmodload zsh/terminfo
 typeset -gA key_info
 key_info=(
-  'Control'      '\C-'
+  'Control'   '\C-'
-  'ControlLeft'  '\e[1;5D \e[5D \e\e[D \eOd'
+  'Escape'    '\e'
-  'ControlRight' '\e[1;5C \e[5C \e\e[C \eOc'
+  'Meta'      '\M-'
-  'Escape'       '\e'
+  'Backspace' "^?"
-  'Meta'         '\M-'
+  'Delete'    "^[[3~"
-  'Backspace'    "^?"
+  'F1'        "$terminfo[kf1]"
-  'Delete'       "^[[3~"
+  'F2'        "$terminfo[kf2]"
-  'F1'           "$terminfo[kf1]"
+  'F3'        "$terminfo[kf3]"
-  'F2'           "$terminfo[kf2]"
+  'F4'        "$terminfo[kf4]"
-  'F3'           "$terminfo[kf3]"
+  'F5'        "$terminfo[kf5]"
-  'F4'           "$terminfo[kf4]"
+  'F6'        "$terminfo[kf6]"
-  'F5'           "$terminfo[kf5]"
+  'F7'        "$terminfo[kf7]"
-  'F6'           "$terminfo[kf6]"
+  'F8'        "$terminfo[kf8]"
-  'F7'           "$terminfo[kf7]"
+  'F9'        "$terminfo[kf9]"
-  'F8'           "$terminfo[kf8]"
+  'F10'       "$terminfo[kf10]"
-  'F9'           "$terminfo[kf9]"
+  'F11'       "$terminfo[kf11]"
-  'F10'          "$terminfo[kf10]"
+  'F12'       "$terminfo[kf12]"
-  'F11'          "$terminfo[kf11]"
+  'Insert'    "$terminfo[kich1]"
-  'F12'          "$terminfo[kf12]"
+  'Home'      "$terminfo[khome]"
-  'Insert'       "$terminfo[kich1]"
+  'PageUp'    "$terminfo[kpp]"
-  'Home'         "$terminfo[khome]"
+  'End'       "$terminfo[kend]"
-  'PageUp'       "$terminfo[kpp]"
+  'PageDown'  "$terminfo[knp]"
-  'End'          "$terminfo[kend]"
+  'Up'        "$terminfo[kcuu1]"
-  'PageDown'     "$terminfo[knp]"
+  'Left'      "$terminfo[kcub1]"
-  'Up'           "$terminfo[kcuu1]"
+  'Down'      "$terminfo[kcud1]"
-  'Left'         "$terminfo[kcub1]"
+  'Right'     "$terminfo[kcuf1]"
-  'Down'         "$terminfo[kcud1]"
+  'BackTab'   "$terminfo[kcbt]"
-  'Right'        "$terminfo[kcuf1]"
-  'BackTab'      "$terminfo[kcbt]"
 )
 
 # Set empty $key_info values to an invalid UTF-8 sequence to induce silent
 # bindkey failure.
 for key in "${(k)key_info[@]}"; do
   if [[ -z "$key_info[$key]" ]]; then
-    key_info[$key]='<27>'
+    key_info["$key"]='<27>'
   fi
 done
 
@@ -109,39 +107,30 @@ function editor-info {
 }
 zle -N editor-info
 
-# Updates editor information when the keymap changes.
+# Ensures that $terminfo values are valid and updates editor information when
-function zle-keymap-select {
+# the keymap changes.
+function zle-keymap-select zle-line-init zle-line-finish {
+  # The terminal must be in application mode when ZLE is active for $terminfo
+  # values to be valid.
+  if (( $+terminfo[smkx] && $+terminfo[rmkx] )); then
+    case "$0" in
+      (zle-line-init)
+        # Enable terminal application mode.
+        echoti smkx
+      ;;
+      (zle-line-finish)
+        # Disable terminal application mode.
+        echoti rmkx
+      ;;
+    esac
+  fi
+
+  # Update editor information.
   zle editor-info
 }
 zle -N zle-keymap-select
-
-# Enables terminal application mode and updates editor information.
-function zle-line-init {
-  # The terminal must be in application mode when ZLE is active for $terminfo
-  # values to be valid.
-  if (( $+terminfo[smkx] )); then
-    # Enable terminal application mode.
-    echoti smkx
-  fi
-
-  # Update editor information.
-  zle editor-info
-}
-zle -N zle-line-init
-
-# Disables terminal application mode and updates editor information.
-function zle-line-finish {
-  # The terminal must be in application mode when ZLE is active for $terminfo
-  # values to be valid.
-  if (( $+terminfo[rmkx] )); then
-    # Disable terminal application mode.
-    echoti rmkx
-  fi
-
-  # Update editor information.
-  zle editor-info
-}
 zle -N zle-line-finish
+zle -N zle-line-init
 
 # Toggles emacs overwrite mode and updates editor information.
 function overwrite-mode {
@@ -208,10 +197,10 @@ bindkey -d
 # Emacs Key Bindings
 #
 
-for key in "$key_info[Escape]"{B,b} "${(s: :)key_info[ControlLeft]}"
+for key ("$key_info[Escape]"{B,b}) bindkey -M emacs "$key" emacs-backward-word
-  bindkey -M emacs "$key" emacs-backward-word
+for key ("$key_info[Escape]"{F,f}) bindkey -M emacs "$key" emacs-forward-word
-for key in "$key_info[Escape]"{F,f} "${(s: :)key_info[ControlRight]}"
+bindkey -M emacs "$key_info[Escape]$key_info[Left]" emacs-backward-word
-  bindkey -M emacs "$key" emacs-forward-word
+bindkey -M emacs "$key_info[Escape]$key_info[Right]" emacs-forward-word
 
 # Kill to the beginning of the line.
 for key in "$key_info[Escape]"{K,k}
@@ -327,3 +316,4 @@ else
 fi
 
 unset key{,map,bindings}
+

modules/environment/README.md

@@ -23,3 +23,4 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/sorin-ionescu/prezto/issues
+

modules/environment/init.zsh

@@ -55,3 +55,4 @@ if zstyle -t ':prezto:environment:termcap' color; then
   export LESS_TERMCAP_ue=$'\E[0m'          # Ends underline.
   export LESS_TERMCAP_us=$'\E[01;32m'      # Begins underline.
 fi
+

modules/fasd/README.md

@@ -36,3 +36,4 @@ Authors
 [3]: https://github.com/rupa/z
 [4]: https://github.com/rupa/v
 [5]: https://github.com/sorin-ionescu/prezto/issues
+

modules/fasd/init.zsh

@@ -51,3 +51,4 @@ function fasd_cd {
 
 # Changes the current working directory interactively.
 alias j='fasd_cd -i'
+

modules/git/README.md

@@ -332,3 +332,4 @@ Authors
 [6]: https://github.com/sorin-ionescu/prezto/issues
 [7]: https://github.com/sorin-ionescu/prezto/issues/219
 [8]: http://www.kernel.org/pub/software/scm/git/docs/git-log.html
+

modules/git/alias.zsh

@@ -179,3 +179,4 @@ alias gwc='git clean -n'
 alias gwC='git clean -f'
 alias gwx='git rm -r'
 alias gwX='git rm -rf'
+

modules/git/functions/_git-hub-browse

@@ -45,3 +45,4 @@ case "$state" in
 esac
 
 return $ret
+

modules/git/functions/_git-hub-shorten-url

@@ -9,3 +9,4 @@
 #
 
 _arguments '1:url:' && return 0
+

modules/git/functions/_git-info

@@ -16,3 +16,4 @@ _arguments "1:toggle:((
   on\:'enable in-prompt information for the current repository'
   off\:'disable in-prompt information for the current repository'
 ))" && return 0
+

modules/git/functions/_git-submodule-move

@@ -38,3 +38,4 @@ case "$state" in
 esac
 
 return $ret
+

modules/git/functions/_git-submodule-remove

@@ -24,3 +24,4 @@ done < <(
 )
 
 _describe -t submodule 'submodules' submodules && return 0
+

modules/git/functions/git-branch-current

@@ -18,3 +18,4 @@ if [[ -n "$ref" ]]; then
 else
   return 1
 fi
+

modules/git/functions/git-commit-lost

@@ -18,3 +18,4 @@ git fsck 2> /dev/null \
       --no-walk \
       --stdin \
       --pretty=format:${_git_log_oneline_format}
+

modules/git/functions/git-dir

@@ -14,3 +14,4 @@ else
   print "$0: not a repository: $PWD" >&2
   return 1
 fi
+

modules/git/functions/git-hub-browse

@@ -56,3 +56,4 @@ else
   print "$0: not a Git repository or remote not set" >&2
   return 1
 fi
+

modules/git/functions/git-hub-shorten-url

@@ -20,3 +20,4 @@ if (( $+commands[curl] )); then
 else
   print "$0: command not found: curl" >&2
 fi
+

modules/git/functions/git-info

@@ -348,13 +348,13 @@ function git-info {
     # Format added.
     if (( added > 0 )); then
       zstyle -s ':prezto:module:git:info:added' format 'added_format'
-      zformat -f added_formatted "$added_format" "a:$added"
+      zformat -f added_formatted "$added_format" "a:$added_format"
     fi
 
     # Format deleted.
     if (( deleted > 0 )); then
       zstyle -s ':prezto:module:git:info:deleted' format 'deleted_format'
-      zformat -f deleted_formatted "$deleted_format" "d:$deleted"
+      zformat -f deleted_formatted "$deleted_format" "d:$deleted_format"
     fi
 
     # Format modified.
@@ -421,3 +421,4 @@ function git-info {
 }
 
 git-info "$@"
+

modules/git/functions/git-root

@@ -14,3 +14,4 @@ else
   print "$0: not a repository work tree: $PWD" >&2
   return 1
 fi
+

modules/git/functions/git-stash-clear-interactive

@@ -20,3 +20,4 @@ if [[ -f "$(git-dir)/refs/stash" ]]; then
     fi
   fi
 fi
+

modules/git/functions/git-stash-dropped

@@ -20,3 +20,4 @@ git fsck --unreachable 2> /dev/null \
       --merges \
       --no-walk \
       --stdin
+

modules/git/functions/git-stash-recover

@@ -16,3 +16,4 @@ for commit in "$@"; do
   git update-ref \
     -m "$(git log -1 --pretty="format:%s" "$commit")" refs/stash "$commit"
 done
+

modules/git/functions/git-submodule-move

@@ -30,3 +30,4 @@ git-submodule-remove "$src"
 git submodule add "$url" "$dst"
 
 return 0
+

modules/git/functions/git-submodule-remove

@@ -25,3 +25,4 @@ rm -rf "${1}"
 rm -rf "$(git-dir)/modules/${1}"
 
 return 0
+

modules/git/init.zsh

@@ -15,3 +15,4 @@ pmodload 'helper'
 
 # Source module files.
 source "${0:h}/alias.zsh"
+

modules/gnu-utility/README.md

@@ -30,3 +30,4 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/sorin-ionescu/prezto/issues
+

modules/gnu-utility/init.zsh

@@ -58,3 +58,4 @@ for _gnu_utility_cmd in "${_gnu_utility_cmds[@]}"; do
 done
 
 unset _gnu_utility_{p,cmds,cmd,pcmd}
+

modules/gpg/README.md

@@ -24,3 +24,4 @@ Authors
 [1]: http://www.gnupg.org
 [2]: http://linux.die.net/man/1/gpg-agent
 [3]: https://github.com/sorin-ionescu/prezto/issues
+

modules/gpg/init.zsh

@@ -12,17 +12,14 @@ fi
 
 # Set the default paths to gpg-agent files.
 _gpg_agent_conf="$HOME/.gnupg/gpg-agent.conf"
-_gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env"
+_gpg_agent_env="$TMPDIR/gpg-agent.env"
 
 # Start gpg-agent if not started.
-if [[ -z "$GPG_AGENT_INFO" ]]; then
+if ! ps -U "$USER" -o ucomm | grep -q gpg-agent; then
+  eval "$(gpg-agent --daemon | tee "$_gpg_agent_env")"
+else
   # Export environment variables.
   source "$_gpg_agent_env" 2> /dev/null
-
-  # Start gpg-agent if not started.
-  if ! ps -U "$USER" -o pid,ucomm | grep -q -- "${${${(s.:.)GPG_AGENT_INFO}[2]}:--1} gpg-agent"; then
-    eval "$(gpg-agent --daemon | tee "$_gpg_agent_env")"
-  fi
 fi
 
 # Inform gpg-agent of the current TTY for user prompts.
@@ -44,3 +41,4 @@ unset _gpg_agent_{conf,env}
 if [[ -n "$SSH_CONNECTION" ]]; then
   export PINENTRY_USER_DATA='USE_CURSES=1'
 fi
+

modules/haskell/README.md

@@ -26,3 +26,4 @@ Authors
 
 [1]: http://www.haskell.org/cabal/
 [2]: https://github.com/sorin-ionescu/prezto/issues
+

modules/helper/README.md

@@ -22,3 +22,4 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/sorin-ionescu/prezto/issues
+

modules/helper/functions/add-zsh-trap

@@ -39,3 +39,4 @@ function add-zsh-trap {
 }
 
 add-zsh-trap "$@"
+

modules/helper/init.zsh

@@ -29,3 +29,4 @@ function coalesce {
   done
   return 1
 }
+

modules/history-substring-search/README.md

@@ -59,3 +59,4 @@ Authors
 [1]: https://github.com/zsh-users/zsh-history-substring-search
 [2]: http://fishshell.com
 [3]: https://github.com/sorin-ionescu/prezto/issues
+

modules/history-substring-search/init.zsh

@@ -55,3 +55,4 @@ if [[ -n "$key_info" ]]; then
     bindkey -M "$keymap" "$key_info[Down]" history-substring-search-down
   done
 fi
+

modules/history/README.md

@@ -41,3 +41,4 @@ Authors
 
 [1]: http://zsh.sourceforge.net/Guide/zshguide02.html#l16
 [2]: https://github.com/sorin-ionescu/prezto/issues
+

modules/homebrew/README.md

@@ -6,8 +6,6 @@ Defines Homebrew aliases.
 Aliases
 -------
 
-### Homebrew
-
   - `brewc` cleans outdated brews and their cached archives.
   - `brewC` cleans outdated brews, including keg-only, and their cached archives.
   - `brewi` installs a formula.
@@ -17,22 +15,12 @@ Aliases
   - `brewu` upgrades Homebrew.
   - `brewx` uninstalls a formula.
 
-### Homebrew Cask
-
-  - `cask` is aliased to `brew cask`.
-  - `caskc` cleans up old cached downloads.
-  - `caskC` cleans up all cached downloads.
-  - `caski` installs a cask.
-  - `caskl` lists installed casks.
-  - `casks` searches for a cask.
-  - `caskx` uninstalls a cask.
-
 Authors
 -------
 
 *The authors of this module should be contacted via the [issue tracker][1].*
 
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
-  - [Griffin Yourick](https://github.com/tough-griff)
 
 [1]: https://github.com/sorin-ionescu/prezto/issues
+

modules/homebrew/init.zsh

@@ -14,7 +14,6 @@ fi
 # Aliases
 #
 
-# Homebrew
 alias brewc='brew cleanup'
 alias brewC='brew cleanup --force'
 alias brewi='brew install'
@@ -24,11 +23,3 @@ alias brewu='brew upgrade'
 alias brewU='brew update && brew upgrade'
 alias brewx='brew remove'
 
-# Homebrew Cask
-alias cask='brew cask'
-alias caskc='brew cask cleanup --outdated'
-alias caskC='brew cask cleanup'
-alias caski='brew cask install'
-alias caskl='brew cask list'
-alias casks='brew cask search'
-alias caskx='brew cask uninstall'

modules/macports/README.md

@@ -23,3 +23,4 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/sorin-ionescu/prezto/issues
+

modules/macports/init.zsh

@@ -32,3 +32,4 @@ alias portU='sudo port selfupdate && sudo port upgrade outdated'
 alias portu='sudo port upgrade'
 alias portX='sudo port -u uninstall'
 alias portx='sudo port uninstall'
+

modules/node/README.md

@@ -43,3 +43,4 @@ Authors
 [3]: http://nodejs.org/api
 [4]: https://github.com/sorin-ionescu/prezto/issues
 [5]: https://github.com/creationix/nvm
+

modules/node/functions/node-doc

@@ -5,10 +5,6 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-if [[ -z "$BROWSER" ]]; then
-  print "$0: no web browser defined" >&2
-  return 1
-fi
-
 # TODO: Make the sections easier to use.
-"$BROWSER" "http://nodejs.org/docs/$(node --version | sed 's/-.*//')/api/all.html#${1}"
+open "http://nodejs.org/docs/$(node --version | sed 's/-.*//')/api/all.html#${1}"
+

modules/node/functions/node-info

@@ -17,8 +17,9 @@ if (( $+functions[nvm_version] )); then
   version="${$(nvm_version)#v}"
 fi
 
-if [[ "$version" == (none|) ]]; then
+if [[ -n "$version" ]]; then
   zstyle -s ':prezto:module:node:info:version' format 'version_format'
   zformat -f version_formatted "$version_format" "v:$version"
   node_info[version]="$version_formatted"
 fi
+

modules/node/init.zsh

@@ -29,3 +29,4 @@ if (( $+commands[npm] )); then
 
   unset cache_file
 fi
+

modules/ocaml/README.md

@@ -1,15 +1,15 @@
-OCaml
+Ocaml
 =====
 
-Initializes [OCaml][1] package management.
+Initializes [Ocaml][1] package management.
 
 OPAM
 ----
 
-[OPAM][2] is a package manager for OCaml.
+[OPAM][2] is a package manager for Ocaml.
 
 This module enables local package installation with OPAM by extending the
-relevant path and OCaml variables.
+relevant path and Ocaml variables.
 
 ### Usage
 
@@ -25,3 +25,4 @@ Authors
 [1]: http://ocaml.org/
 [2]: http://opam.ocamlpro.com/
 [3]: https://github.com/sorin-ionescu/prezto/issues
+

modules/ocaml/init.zsh

@@ -1,14 +1,15 @@
 #
-# Initializes OCaml package management.
+# Initializes Ocaml package management.
 #
 # Authors:
 #   Sebastian Wiesner <lunaryorn@gmail.com>
 #
 
 # Return if requirements are not found.
-if [[ ! -f "$HOME/.opam/opam-init/init.zsh" ]]; then
+if (( ! $+commands[opam] )); then
   return 1
 fi
 
 # Initialize OPAM.
-source "$HOME/.opam/opam-init/init.zsh"
+eval "$(opam config env)"
+

modules/osx/README.md

@@ -9,20 +9,17 @@ Aliases
   - `cdf` changes the current working director to the current _Finder_
     directory.
   - `pushdf` pushes the current working directory onto the directory queue and
-    changes the current working director to the current _Finder_ directory.
+  - `ql` quick looks at files.
+  - `rm-osx-cruft` deletes .DS\_Store, \_\_MACOSX cruft.
 
 Functions
 ---------
 
-  - `mand` opens _man_ pages in [_Dash.app_][2].
+  - `manb` opens _man_ pages in [_Bwana.app_][2].
   - `manp` opens _man_ pages in _Preview.app_.
   - `pfd` prints the current _Finder_ directory.
   - `pfs` prints the current _Finder_ selection.
   - `tab` creates a new tab (works in both _Terminal_ and [_iTerm_][3]).
-  - `ql` previews files in Quick Look.
-  - `osx-rm-dir-metadata` deletes .DS\_Store, \_\_MACOSX cruft.
-  - `osx-ls-download-history` displays the Mac OS X download history.
-  - `osx-rm-download-history` deletes the Mac OS X download history.
 
 Authors
 -------
@@ -32,6 +29,7 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: http://www.apple.com/macosx/
-[2]: http://kapeli.com/dash
+[2]: http://bruji.com/bwana/
 [3]: http://www.iterm2.com/
 [4]: https://github.com/sorin-ionescu/prezto/issues
+

modules/osx/functions/_manb_manp

@@ -1,11 +1,12 @@
-#compdef mand manp
+#compdef manb manp
 #autoload
 
 #
-# Completes mand and manp.
+# Completes manb and manp.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
 _man
+

modules/osx/functions/manb

@@ -0,0 +1,24 @@
+#
+# Opens man pages in Bwana.app.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+function manb {
+  local page
+  if (( $# > 0 )); then
+    for page in "$@"; do
+      open "man:$page" 2>/dev/null
+      if (( $? != 0 )); then
+        print "$0: Bwana is not installed" >&2
+        break
+      fi
+    done
+  else
+    print 'What manual page do you want?' >&2
+  fi
+}
+
+manb "$@"
+

modules/osx/functions/mand

@@ -1,20 +0,0 @@
-#
-# Opens man pages in Dash.app.
-#
-# Authors:
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-
-function mand {
-  if (( $# > 0 )); then
-    open "dash://manpages:$1" 2>/dev/null
-    if (( $? != 0 )); then
-      print "$0: Dash is not installed" >&2
-      break
-    fi
-  else
-    print 'What manual page do you want?' >&2
-  fi
-}
-
-mand "$@"

modules/osx/functions/manp

@@ -17,3 +17,4 @@ function manp {
 }
 
 manp "$@"
+

modules/osx/functions/osx-ls-download-history

@@ -1,13 +0,0 @@
-#
-# Displays the Mac OS X download history.
-#
-# Authors:
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-
-local db
-for db in ~/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV*; do
-  if grep -q 'LSQuarantineEvent' < <(sqlite3 "$db" .tables); then
-    sqlite3 "$db" 'SELECT LSQuarantineDataURLString FROM LSQuarantineEvent'
-  fi
-done

modules/osx/functions/osx-rm-dir-metadata

@@ -1,11 +0,0 @@
-#
-# Deletes .DS_Store and __MACOSX directories.
-#
-# Authors:
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-
-find "${@:-$PWD}" \( \
-  -type f -name '.DS_Store' -o \
-  -type d -name '__MACOSX' \
-\) -print0 | xargs -0 rm -rf

modules/osx/functions/osx-rm-download-history

@@ -1,13 +0,0 @@
-#
-# Deletes the Mac OS X download history.
-#
-# Authors:
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-
-local db
-for db in ~/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV*; do
-  if grep -q 'LSQuarantineEvent' < <(sqlite3 "$db" .tables); then
-    sqlite3 "$db" 'DELETE FROM LSQuarantineEvent; VACUUM'
-  fi
-done

modules/osx/functions/pfd

@@ -7,6 +7,7 @@
 
 osascript 2>/dev/null <<EOF
   tell application "Finder"
-    return POSIX path of (target of first window as text)
+    return POSIX path of (target of window 1 as alias)
   end tell
 EOF
+

modules/osx/functions/pfs

@@ -5,11 +5,14 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-osascript 2>&1 <<EOF
+osascript 2>/dev/null <<EOF
+  set output to ""
   tell application "Finder" to set the_selection to selection
-  if the_selection is not {}
+  set item_count to count the_selection
-    repeat with an_item in the_selection
+  repeat with item_index from 1 to count the_selection
-      log POSIX path of (an_item as text)
+    if item_index is less than item_count then set the_delimiter to "\n"
-    end repeat
+    if item_index is item_count then set the_delimiter to ""
-  end if
+    set output to output & ((item item_index of the_selection as alias)'s POSIX path) & the_delimiter
+  end repeat
 EOF
+

modules/osx/functions/ql

@@ -1,10 +0,0 @@
-#
-# Previews files in Quick Look.
-#
-# Authors:
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-
-if (( $# > 0 )); then
-  qlmanage -p "$@" &> /dev/null
-fi

modules/osx/functions/tab

@@ -39,3 +39,4 @@ EOF
     end tell
 EOF
 }
+

modules/osx/init.zsh

@@ -14,8 +14,26 @@ fi
 # Aliases
 #
 
-# Changes directory to the current Finder directory.
+# Change directory to the current Finder directory.
 alias cdf='cd "$(pfd)"'
 
-# Pushes directory to the current Finder directory.
+# Push directory to the current Finder directory.
 alias pushdf='pushd "$(pfd)"'
+
+#
+# Functions
+#
+
+# Open files in Quick Look.
+function ql {
+  (( $# > 0 )) && qlmanage -p "$@" &> /dev/null
+}
+
+# Delete .DS_Store and __MACOSX directories.
+function rm-osx-cruft {
+  find "${@:-$PWD}" \( \
+    -type f -name '.DS_Store' -o \
+    -type d -name '__MACOSX' \
+  \) -print0 | xargs -0 rm -rf
+}
+

modules/pacman/README.md

@@ -63,3 +63,4 @@ Authors
 [1]: http://www.archlinux.org/pacman/
 [2]: http://archlinux.fr/yaourt-en
 [3]: https://github.com/sorin-ionescu/prezto/issues
+

modules/pacman/functions/pacman-list-disowned

@@ -6,7 +6,7 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-local tmp="${TMPDIR:-/tmp}/pacman-disowned-$UID-$$"
+local tmp="$TMPDIR/pacman-disowned-$UID-$$"
 local db="$tmp/db"
 local fs="$tmp/fs"
 
@@ -20,3 +20,4 @@ find /bin /etc /lib /sbin /usr \
     \( -type d -printf '%p/\n' -o -print \) | sort > "$fs"
 
 comm -23 "$fs" "$db"
+

modules/pacman/functions/pacman-list-explicit

@@ -18,3 +18,4 @@ pacman --query --explicit --info \
         print $2
       }
     '
+

modules/pacman/init.zsh

@@ -27,9 +27,6 @@ if (( $+commands[$_pacman_frontend] )); then
   if [[ -s "${0:h}/${_pacman_frontend}.zsh" ]]; then
     source "${0:h}/${_pacman_frontend}.zsh"
   fi
-else
-  _pacman_frontend='pacman'
-  _pacman_sudo='sudo '
 fi
 
 #
@@ -37,48 +34,49 @@ fi
 #
 
 # Pacman.
-alias pac="${_pacman_frontend}"
+alias pac='pacman'
 
 # Installs packages from repositories.
-alias paci="${_pacman_sudo}${_pacman_frontend} --sync"
+alias paci='sudo pacman --sync'
 
 # Installs packages from files.
-alias pacI="${_pacman_sudo}${_pacman_frontend} --upgrade"
+alias pacI='sudo pacman --upgrade'
 
 # Removes packages and unneeded dependencies.
-alias pacx="${_pacman_sudo}${_pacman_frontend} --remove"
+alias pacx='sudo pacman --remove'
 
 # Removes packages, their configuration, and unneeded dependencies.
-alias pacX="${_pacman_sudo}${_pacman_frontend} --remove --nosave --recursive"
+alias pacX='sudo pacman --remove --nosave --recursive'
 
 # Displays information about a package from the repositories.
-alias pacq="${_pacman_frontend} --sync --info"
+alias pacq='pacman --sync --info'
 
 # Displays information about a package from the local database.
-alias pacQ="${_pacman_frontend} --query --info"
+alias pacQ='pacman --query --info'
 
 # Searches for packages in the repositories.
-alias pacs="${_pacman_frontend} --sync --search"
+alias pacs='pacman --sync --search'
 
 # Searches for packages in the local database.
-alias pacS="${_pacman_frontend} --query --search"
+alias pacS='pacman --query --search'
 
 # Lists orphan packages.
-alias pacman-list-orphans="${_pacman_sudo}${_pacman_frontend} --query --deps --unrequired"
+alias pacman-list-orphans='sudo pacman --query --deps --unrequired'
 
 # Removes orphan packages.
-alias pacman-remove-orphans="${_pacman_sudo}${_pacman_frontend} --remove --recursive \$(${_pacman_frontend} --quiet --query --deps --unrequired)"
+alias pacman-remove-orphans='sudo pacman --remove --recursive $(pacman --quiet --query --deps --unrequired)'
 
 # Synchronizes the local package and Arch Build System databases against the
 # repositories.
 if (( $+commands[abs] )); then
-  alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh && sudo abs"
+  alias pacu='sudo pacman --sync --refresh && sudo abs'
 else
-  alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh"
+  alias pacu='sudo pacman --sync --refresh'
 fi
 
 # Synchronizes the local package database against the repositories then
 # upgrades outdated packages.
-alias pacU="${_pacman_sudo}${_pacman_frontend} --sync --refresh --sysupgrade"
+alias pacU='sudo pacman --sync --refresh --sysupgrade'
+
+unset _pacman_frontend
 
-unset _pacman_{frontend,sudo}

modules/pacman/yaourt.zsh

@@ -11,8 +11,9 @@
 
 # Disable color.
 if ! zstyle -t ':prezto:module:pacman:yaourt' color; then
-  alias pacman='yaourt --nocolor'
+  alias pacman='pacman --nocolor'
 fi
 
 # Manages .pac* files.
-alias pacc='yaourt -C'
+alias pacc='pacman -C'
+

modules/perl/README.md

@@ -61,3 +61,4 @@ Authors
 [1]: http://www.perl.org
 [2]: http://perlbrew.pl
 [3]: https://github.com/sorin-ionescu/prezto/issues
+

modules/perl/init.zsh

@@ -50,3 +50,4 @@ alias plbO='perlbrew switch-off'
 alias plbs='perlbrew switch'
 alias plbu='perlbrew use'
 alias plbx='perlbrew uninstall'
+

modules/prompt/README.md

@@ -109,3 +109,4 @@ Authors
 [1]: http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Prompt-Themes
 [2]: http://zsh.sourceforge.net/Doc/Release/Functions.html#Hook-Functions
 [3]: https://github.com/sorin-ionescu/prezto/issues
+

modules/prompt/functions/prompt_minimal_setup

@@ -48,3 +48,4 @@ function prompt_minimal_setup {
 }
 
 prompt_minimal_setup "$@"
+

modules/prompt/functions/prompt_nicoulaj_setup

@@ -58,3 +58,4 @@ function prompt_nicoulaj_setup {
 }
 
 prompt_nicoulaj_setup "$@"
+

modules/prompt/functions/prompt_peepcode_setup

@@ -85,3 +85,4 @@ function prompt_peepcode_preview {
 }
 
 prompt_peepcode_setup "$@"
+

modules/prompt/functions/prompt_sorin_setup

@@ -18,7 +18,7 @@ function prompt_sorin_pwd {
     _prompt_sorin_pwd="$MATCH"
     unset MATCH
   else
-    _prompt_sorin_pwd="${${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}//\%/%%}/${${pwd:t}//\%/%%}"
+    _prompt_sorin_pwd="${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}/${pwd:t}"
   fi
 }
 
@@ -78,3 +78,4 @@ function prompt_sorin_setup {
 }
 
 prompt_sorin_setup "$@"
+

modules/prompt/functions/prompt_steeef_setup

@@ -92,3 +92,4 @@ ${_prompt_steeef_colors[3]}%n%f at ${_prompt_steeef_colors[2]}%m%f in ${_prompt_
 }
 
 prompt_steeef_setup "$@"
+

modules/prompt/init.zsh

@@ -16,3 +16,4 @@ else
   prompt 'off'
 fi
 unset prompt_argv
+

modules/python/README.md

@@ -97,3 +97,4 @@ Authors
 [3]: http://pypi.python.org/pypi/virtualenv
 [4]: https://github.com/yyuu/pyenv
 [5]: https://github.com/sorin-ionescu/prezto/issues
+

modules/python/functions/python-info

@@ -19,3 +19,4 @@ if [[ -n "$VIRTUAL_ENV" ]]; then
   zformat -f virtualenv_formatted "$virtualenv_format" "v:${VIRTUAL_ENV:t}"
   python_info[virtualenv]="$virtualenv_formatted"
 fi
+

modules/python/init.zsh

@@ -16,12 +16,9 @@ elif (( $+commands[pyenv] )); then
   eval "$(pyenv init -)"
 
 # Prepend PEP 370 per user site packages directory, which defaults to
-# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH. The
+# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH.
-# path can be overridden using PYTHONUSERBASE.
 else
-  if [[ -n "$PYTHONUSERBASE" ]]; then
+  if [[ "$OSTYPE" == darwin* ]]; then
-    path=($PYTHONUSERBASE/bin $path)
-  elif [[ "$OSTYPE" == darwin* ]]; then
     path=($HOME/Library/Python/*/bin(N) $path)
   else
     # This is subject to change.
@@ -35,14 +32,14 @@ if (( ! $+commands[python] && ! $+commands[pyenv] )); then
 fi
 
 # Load virtualenvwrapper into the shell session.
-if (( $+commands[virtualenvwrapper.sh] )); then
+if (( $+commands[virtualenvwrapper_lazy.sh] )); then
   # Set the directory where virtual environments are stored.
   export WORKON_HOME="$HOME/.virtualenvs"
 
   # Disable the virtualenv prompt.
   VIRTUAL_ENV_DISABLE_PROMPT=1
 
-  source "$commands[virtualenvwrapper.sh]"
+  source "$commands[virtualenvwrapper_lazy.sh]"
 fi
 
 #
@@ -50,3 +47,4 @@ fi
 #
 
 alias py='python'
+

modules/rails/README.md

@@ -32,3 +32,4 @@ Authors
 
 [1]: http://rubyonrails.org
 [2]: https://github.com/sorin-ionescu/prezto/issues
+