Update pull request documentation

Only set up environment for the top-level shell, and allow it to be
inherited normally.

A top level shell is usually a login shell, but can also be a
non-interactive, non-login shell in certain cases, such as when
executing an SSH remote command.

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>

README.md

@@ -9,7 +9,8 @@ Installation
 ------------
 
 Prezto will work with any recent release of Zsh, but the minimum recommended
-version is 4.3.10.
+version is 4.3.11. Unfortunately, [Cygwin][9] is not supported due to
+non-standard core utilities.
 
   1. Launch Zsh:
 
@@ -33,31 +34,19 @@ version is 4.3.10.
 
   5. Open a new Zsh terminal window or tab.
 
-### Mac OS X
-
-If you have administrator privileges, you must fix an Apple-introduced problem
-in Mac OS X 10.5 Leopard by executing the following command, or BASH and Zsh
-will have the wrong `PATH` when executed non-interactively.
-
-    sudo chmod ugo-x /usr/libexec/path_helper
-
-`path_helper` is intended to make it easier for installers to add new paths to
-the environment without having to edit shell configuration files by adding
-a file with a path to the */etc/paths.d* directory.
-
-Unfortunately, `path_helper` always reads paths from */etc/paths* set by Apple
-then paths from */etc/paths.d* set by third party installers, and lastly paths
-from the `PATH` environment variable set by the parent process, which
-ultimately is set by the user with `export PATH=...` Thus, it reorders path
-priorities, and user */bin* directories meant to override system */bin*
-directories end up at the tail of the array.
-
 ### Troubleshooting
 
 If you are not able to find certain commands after switching to *Prezto*,
 modify the `PATH` variable in *~/.zshenv* then open a new Zsh terminal
 window or tab.
 
+Updating
+--------
+
+Pull the latest changes and update submodules.
+
+    git pull && git submodule update --init --recursive
+
 Usage
 -----
 
@@ -82,9 +71,10 @@ accompanying README files to learn of what is available.
 Customization
 -------------
 
-The project is managed via [Git][3]. It is highly recommend that you commit
-your changes and push them to [GitHub][4] to not lose them. If you do not know
-how to use Git, follow this [tutorial][5] and bookmark this [reference][6].
+The project is managed via [Git][3]. It is highly recommended that you fork this
+project; so, that you can commit your changes and push them to [GitHub][4] to
+not lose them. If you do not know how to use Git, follow this [tutorial][5] and
+bookmark this [reference][6].
 
 Resources
 ---------
@@ -96,7 +86,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009-2012 Robby Russell, Sorin Ionescu, and contributors.
+Copyright (c) 2009-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
@@ -124,4 +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
 

documentation/man/man1/prezto-archive.1

@@ -0,0 +1,55 @@
+.TH Archive
+.PP
+Provides functions to extract and list popular archive formats.
+.SH Functions
+.RS
+.IP \(bu 2
+\fB\fCextract\fR extracts the contents of one or more archives.
+.IP \(bu 2
+\fB\fCls-archive\fR lists the contents of one or more archives.
+.RE
+.SH Supported Formats
+.PP
+The following archive formats are supported when the required utilities are
+installed:
+.RS
+.IP \(bu 2
+\fI.tar.gz\fP, \fI.tgz\fP require \fB\fCtar\fR.
+.IP \(bu 2
+\fI.tar.bz2\fP, \fI.tbz\fP require \fB\fCtar\fR.
+.IP \(bu 2
+\fI.tar.xz\fP, \fI.txz\fP require \fB\fCtar\fR with \fIxz\fP support.
+.IP \(bu 2
+\fI.tar.zma\fP, \fI.tlz\fP require \fB\fCtar\fR with \fIlzma\fP support.
+.IP \(bu 2
+\fI.tar\fP requires \fB\fCtar\fR.
+.IP \(bu 2
+\fI.gz\fP requires \fB\fCgunzip\fR.
+.IP \(bu 2
+\fI.bz2\fP requires \fB\fCbunzip2\fR.
+.IP \(bu 2
+\fI.xz\fP requires \fB\fCunxz\fR.
+.IP \(bu 2
+\fI.lzma\fP requires \fB\fCunlzma\fR.
+.IP \(bu 2
+\fI.Z\fP requires \fB\fCuncompress\fR.
+.IP \(bu 2
+\fI.zip\fP requires \fB\fCunzip\fR.
+.IP \(bu 2
+\fI.rar\fP requires \fB\fCunrar\fR.
+.IP \(bu 2
+\fI.7z\fP requires \fB\fC7za\fR.
+.IP \(bu 2
+\fI.deb\fP requires \fB\fCar\fR, \fB\fCtar\fR.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-command-not-found.1

@@ -0,0 +1,17 @@
+.TH Command\-Not\-Found
+.PP
+Loads the command\-not\-found
+.UR https://code.launchpad.net/command-not-found
+.UE
+tool on Debian\-based distributions.
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Joseph Booker
+.UR https://github.com/sargas
+.UE
+.RE

documentation/man/man1/prezto-completion.1

@@ -0,0 +1,27 @@
+.TH Completion
+.PP
+Loads and configures tab completion and provides additional completions from
+the zsh\-completions
+.UR https://github.com/zsh-users/zsh-completions
+.UE
+project.
+.PP
+This module must be loaded \fBafter\fP the \fIutility\fP module.
+.SH Contributors
+.PP
+Completions should be submitted to the zsh\-completions
+.UR https://github.com/zsh-users/zsh-completions
+.UE
+project according
+to its rules and regulations. This module will be synchronized against it.
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-directory.1

@@ -0,0 +1,49 @@
+.TH Directory
+.PP
+Sets directory options and defines directory aliases.
+.SH Options
+.RS
+.IP \(bu 2
+\fB\fCAUTO_CD\fR auto changes to a directory without typing \fB\fCcd\fR.
+.IP \(bu 2
+\fB\fCAUTO_PUSHD\fR pushes the old directory onto the stack on \fB\fCcd\fR.
+.IP \(bu 2
+\fB\fCPUSHD_IGNORE_DUPS\fR does not store duplicates in the stack.
+.IP \(bu 2
+\fB\fCPUSHD_SILENT\fR does not print the directory stack after \fB\fCpushd\fR or \fB\fCpopd\fR.
+.IP \(bu 2
+\fB\fCPUSHD_TO_HOME\fR pushes to the home directory when no argument is given.
+.IP \(bu 2
+\fB\fCCDABLE_VARS\fR changes directory to a path stored in a variable.
+.IP \(bu 2
+\fB\fCAUTO_NAME_DIRS\fR auto adds variable\-stored paths to \fB\fC~\fR list.
+.IP \(bu 2
+\fB\fCMULTIOS\fR writes to multiple descriptors.
+.IP \(bu 2
+\fB\fCEXTENDED_GLOB\fR uses extended globbing syntax.
+.IP \(bu 2
+\fB\fCCLOBBER\fR does not overwrite existing files with \fB\fC>\fR and \fB\fC>>\fR. Use \fB\fC>!\fR and
+\fB\fC>>!\fR to bypass.
+.RE
+.SH Aliases
+.RS
+.IP \(bu 2
+\fB\fCd\fR prints the contents of the directory stack.
+.IP \(bu 2
+\fB\fC1 ... 9\fR changes the directory to the \fBn\fP previous one.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+James Cox
+.UR https://github.com/imajes
+.UE
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-dpkg.1

@@ -0,0 +1,63 @@
+.TH Dpkg
+.PP
+Defines dpkg
+.UR http://wiki.debian.org/Teams/Dpkg
+.UE
+aliases and functions.
+.SH Aliases
+.RS
+.IP \(bu 2
+\fB\fCdebc\fR cleans the cache.
+.IP \(bu 2
+\fB\fCdebf\fR displays a file's packake.
+.IP \(bu 2
+\fB\fCdebi\fR installs packages from repositories.
+.IP \(bu 2
+\fB\fCdebI\fR installs packages from files.
+.IP \(bu 2
+\fB\fCdebq\fR displays package information.
+.IP \(bu 2
+\fB\fCdebu\fR updates the packages lists.
+.IP \(bu 2
+\fB\fCdebU\fR upgrades outdated packages.
+.IP \(bu 2
+\fB\fCdebx\fR removes packages.
+.IP \(bu 2
+\fB\fCdebX\fR removes packages, their configuration, and unneeded dependencies.
+.IP \(bu 2
+\fB\fCdebs\fR searches for packages.
+.IP \(bu 2
+\fB\fCdeb-build\fR creates a basic .deb package.
+.IP \(bu 2
+\fB\fCdeb-kclean\fR removes all kernel images and headers, except for the ones in
+use.
+.RE
+.SH Functions
+.RS
+.IP \(bu 2
+\fB\fCdeb-clone\fR generates a script that can be used to duplicate a dpkg\-based
+system.
+.IP \(bu 2
+\fB\fCdeb-history\fR displays dpkg history.
+.IP \(bu 2
+\fB\fCdeb-kbuild\fR makes a dpkg Linux kernel package.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Daniel Bolton
+.UR https://github.com/dbb
+.UE
+.IP \(bu 2
+Benjamin Boudreau
+.UR https://github.com/dreur
+.UE
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-environment.1

@@ -0,0 +1,22 @@
+.TH Environment
+.PP
+Sets general shell options and defines environment variables.
+.PP
+This module must be loaded first.
+.SH Environment Variables
+.SH Contributors
+.PP
+This module \fBMUST NOT\fP rely on any command not built in Zsh.
+.PP
+Non\-interactive environment variables should be defined in \fIzshenv\fP.
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-gnu-utility.1

@@ -0,0 +1,31 @@
+.TH GNU Utility
+.PP
+Provides for the interactive use of GNU utilities on non\-GNU systems.
+.PP
+Installing GNU utilities on non\-GNU systems in \fB\fC$PATH\fR without a prefix, i.e.
+\fB\fCls\fR instead of \fB\fCgls\fR, is not recommended since scripts that target other
+utilities will be broken.
+.PP
+However, for interactive use, prefixed commands can be wrapped in their
+non\-prefixed counterparts.
+.PP
+This module must be loaded \fBbefore\fP the \fIutility\fP module.
+.SH Settings
+.SS Prefix
+.PP
+To use a different prefix, add the following to \fIzpreztorc\fP, and replace 'g' with
+the desired prefix:
+.nf
+zstyle ':prezto:module:gnu-utility' prefix 'g'
+.fi
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-gpg-agent.1

@@ -0,0 +1,20 @@
+.TH GPG\-Agent
+.PP
+Provides for an easier use of gpg\-agent
+.UR http://linux.die.net/man/1/gpg-agent
+.UE .
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Florian Walch
+.UR https://github.com/fwalch
+.UE
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-haskell.1

@@ -0,0 +1,27 @@
+.TH Haskell
+.PP
+Enables local Haskell package installation.
+.SH Per\-user Package Installation
+.PP
+Cabal
+.UR http://www.haskell.org/cabal/
+.UE , the Haskell package manager, can install packages into per user
+directories.
+.PP
+This module prepends per user directories to the relevant path variables to
+enable the execution of user installed executables and the reading of
+documentation.
+.SS Usage
+.PP
+Install packages into per user directories with \fB\fCcabal install --user\fR.
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sebastian Wiesner
+.UR https://github.com/lunaryorn
+.UE
+.RE

documentation/man/man1/prezto-helper.1

@@ -0,0 +1,29 @@
+.TH Helper
+.PP
+Provides helper functions for developing modules.
+.SH Functions
+.RS
+.IP \(bu 2
+\fB\fCadd-zsh-trap\fR adds a function name to a list to be called when a trap is
+triggered.
+.IP \(bu 2
+\fB\fCis-autoloadable\fR checks if a file can be autoloaded by trying to load it
+in a subshell.
+.IP \(bu 2
+\fB\fCis-callable\fR checks if a name is a command, function, or alias.
+.IP \(bu 2
+\fB\fCis-true\fR checks a boolean variable for "true".
+.IP \(bu 2
+\fB\fCcoalesce\fR prints the first non\-empty string in the arguments array.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-history-substring-search.1

@@ -0,0 +1,55 @@
+.TH History Substring Search
+.PP
+Integrates zsh\-history\-substring\-search
+.UR https://github.com/zsh-users/zsh-history-substring-search
+.UE
+into Prezto, which implements
+the Fish shell
+.UR http://fishshell.com
+.UE 's history search feature, where the user can type in any
+part of a previously entered command and press up and down to cycle through
+matching commands.
+.PP
+If this module is used in conjuncture with the \fIsyntax\-highlighting\fP module, it
+must be loaded \fBafter\fP it.
+.SH Contributors
+.PP
+New features and bug fixes should be submitted to the
+zsh\-history\-substring\-search
+.UR https://github.com/zsh-users/zsh-history-substring-search
+.UE
+project according to its rules and
+regulations. This module will be synchronized against it.
+.SH Settings
+.SS Case Sensitivity
+.PP
+To enable case\-sensitivity for this module only, add the following line to
+\fIzpreztorc\fP:
+.nf
+zstyle ':prezto:module:history-substring-search' case-sensitive 'yes'
+.fi
+.SS Highlighting
+.PP
+If colors are enabled, \fIhistory\-substring\-search\fP will automatically highlight
+positive results.
+.PP
+To enable highlighting for this module only, add the following line to
+\fIzpreztorc\fP:
+.nf
+zstyle ':prezto:module:history-substring-search' color 'yes'
+.fi
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Suraj N. Kurapati
+.UR https://github.com/sunaku
+.UE
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-history.1

@@ -0,0 +1,62 @@
+.TH History
+.PP
+Sets history
+.UR http://zsh.sourceforge.net/Guide/zshguide02.html#l16
+.UE
+options and defines history aliases.
+.SH Variables
+.RS
+.IP \(bu 2
+\fB\fCHISTFILE\fR stores the path to the history file.
+.IP \(bu 2
+\fB\fCHISTSIZE\fR stores the maximum number of events to save in the internal history.
+.IP \(bu 2
+\fB\fCSAVEHIST\fR stores the maximum number of events to save in the history file.
+.RE
+.SH Options
+.RS
+.IP \(bu 2
+\fB\fCBANG_HIST\fR treats the \fB!\fP character specially during expansion.
+.IP \(bu 2
+\fB\fCEXTENDED_HISTORY\fR writes the history file in the \fI:start:elapsed;command\fP format.
+.IP \(bu 2
+\fB\fCINC_APPEND_HISTORY\fR writes to the history file immediately, not when the shell exits.
+.IP \(bu 2
+\fB\fCSHARE_HISTORY\fR shares history between all sessions.
+.IP \(bu 2
+\fB\fCHIST_EXPIRE_DUPS_FIRST\fR expires a duplicate event first when trimming history.
+.IP \(bu 2
+\fB\fCHIST_IGNORE_DUPS\fR does not record an event that was just recorded again.
+.IP \(bu 2
+\fB\fCHIST_IGNORE_ALL_DUPS\fR deletes an old recorded event if a new event is a duplicate.
+.IP \(bu 2
+\fB\fCHIST_FIND_NO_DUPS\fR does not display a previously found event.
+.IP \(bu 2
+\fB\fCHIST_IGNORE_SPACE\fR does not record an event starting with a space.
+.IP \(bu 2
+\fB\fCHIST_SAVE_NO_DUPS\fR does not write a duplicate event to the history file.
+.IP \(bu 2
+\fB\fCHIST_VERIFY\fR does not execute immediately upon history expansion.
+.IP \(bu 2
+\fB\fCHIST_BEEP\fR beeps when accessing non\-existent history.
+.RE
+.SH Aliases
+.RS
+.IP \(bu 2
+\fB\fChistory-stat\fR lists the ten most used commands
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Robby Russell
+.UR https://github.com/robbyrussell
+.UE
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-macports.1

@@ -0,0 +1,35 @@
+.TH Macports
+.PP
+Defines MacPorts aliases and adds MacPorts directories to path variables.
+.SH Aliases
+.RS
+.IP \(bu 2
+\fB\fCportc\fR cleans the files used to build ports.
+.IP \(bu 2
+\fB\fCporti\fR installs a port.
+.IP \(bu 2
+\fB\fCports\fR searches for a port.
+.IP \(bu 2
+\fB\fCportu\fR upgrades a port.
+.IP \(bu 2
+\fB\fCportU\fR upgrades MacPorts, the ports collection, and outdated ports.
+.IP \(bu 2
+\fB\fCportx\fR uninstalls a port.
+.IP \(bu 2
+\fB\fCportX\fR uninstalls inactive ports.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Matt Cable
+.UR https://github.com/curiousstranger
+.UE
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-node.1

@@ -0,0 +1,29 @@
+.TH Node.js
+.PP
+Provides utility functions for Node.js
+.UR http://nodejs.org
+.UE
+and loads npm
+.UR http://npmjs.org
+.UE
+completion.
+.SH Functions
+.RS
+.IP \(bu 2
+\fB\fCnode-doc\fR opens the Node.js online API documentation
+.UR http://nodejs.org/api
+.UE
+in the default
+browser.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-osx.1

@@ -0,0 +1,48 @@
+.TH OSX
+.PP
+Defines Mac OS X
+.UR http://www.apple.com/macosx/
+.UE
+aliases and functions.
+.SH Aliases
+.RS
+.IP \(bu 2
+\fB\fCcdf\fR changes the current working director to the current \fIFinder\fP
+directory.
+.IP \(bu 2
+\fB\fCpushdf\fR pushes the current working directory onto the directory queue and
+.IP \(bu 2
+\fB\fCql\fR quick looks at files.
+.IP \(bu 2
+\fB\fCrm-osx-cruft\fR deletes .DS_Store, __MACOSX cruft.
+.RE
+.SH Functions
+.RS
+.IP \(bu 2
+\fB\fCmanb\fR opens \fIman\fP pages in \fIBwana.app\fP
+.UR http://bruji.com/bwana/
+.UE .
+.IP \(bu 2
+\fB\fCmanp\fR opens \fIman\fP pages in \fIPreview.app\fP.
+.IP \(bu 2
+\fB\fCpfd\fR prints the current \fIFinder\fP directory.
+.IP \(bu 2
+\fB\fCpfs\fR prints the current \fIFinder\fP selection.
+.IP \(bu 2
+\fB\fCtab\fR creates a new tab (works in both \fITerminal\fP and \fIiTerm\fP
+.UR http://www.iterm2.com/
+.UE ).
+.IP \(bu 2
+\fB\fCtrash\fR moves files and folders to \fITrash\fP.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-pacman.1

@@ -0,0 +1,84 @@
+.TH Pacman
+.PP
+Provides aliases and functions for the Pacman
+.UR http://www.archlinux.org/pacman/
+.UE
+package manager and
+frontends.
+.SH Settings
+.PP
+To enable a Pacman frontend, for example, Yaourt
+.UR http://archlinux.fr/yaourt-en
+.UE , add the following line to
+\fIzpreztorc\fP:
+.nf
+zstyle ':prezto:module:pacman' frontend 'yaourt'
+.fi
+.PP
+If you have enabled color globally in \fIzpreztorc\fP, you may disable it for certain
+commands.
+.PP
+To disable \fB\fCyaourt\fR highlighting, add the following line to \fIzpreztorc\fP:
+.nf
+zstyle ':prezto:module:pacman:yaourt' color 'no'
+.fi
+.SH Aliases
+.SS Pacman
+.RS
+.IP \(bu 2
+\fB\fCpac\fR is short for \fB\fCpacman\fR.
+.IP \(bu 2
+\fB\fCpaci\fR installs packages from repositories.
+.IP \(bu 2
+\fB\fCpacI\fR installs packages from files.
+.IP \(bu 2
+\fB\fCpacx\fR removes packages and unneeded dependencies.
+.IP \(bu 2
+\fB\fCpacX\fR removes packages, their configuration, and unneeded dependencies.
+.IP \(bu 2
+\fB\fCpacq\fR displays information about a package from the repositories.
+.IP \(bu 2
+\fB\fCpacQ\fR displays information about a package from the local database.
+.IP \(bu 2
+\fB\fCpacs\fR searches for packages in the repositories.
+.IP \(bu 2
+\fB\fCpacS\fR searches for packages in the local database.
+.IP \(bu 2
+\fB\fCpacu\fR synchronizes the local package and Arch Build System (requires \fB\fCabs\fR)
+databases against the repositories.
+.IP \(bu 2
+\fB\fCpacU\fR synchronizes the local package database against the repositories then
+upgrades outdated packages.
+.IP \(bu 2
+\fB\fCpacman-list-orphans\fR lists orphan packages.
+.IP \(bu 2
+\fB\fCpacman-remove-orphans\fR removes orphan packages.
+.RE
+.SS Frontends
+.SS Yaourt
+.RS
+.IP \(bu 2
+\fB\fCpacc\fR manages \fI.pac\\fP* files.
+.RE
+.SH Functions
+.RS
+.IP \(bu 2
+\fB\fCpacman-list-explicit\fR lists explicitly installed pacman packages.
+.IP \(bu 2
+\fB\fCpacman-list-disowned\fR lists pacman disowned files.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Benjamin Boudreau
+.UR https://github.com/dreur
+.UE
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-perl.1

@@ -0,0 +1,74 @@
+.TH Perl
+.PP
+Enables local Perl
+.UR http://www.perl.org
+.UE
+module installation on Mac OS X and defines alises.
+.SH Local Module Installation
+.PP
+Perl versions older than 5.14 do not support the local installation of Perl
+modules natively. This module allows for local installation of Perl modules on
+Mac OS X in \fI~/Library/Perl/5.12\fP by altering the environment.
+.SS Usage
+.PP
+For Perl versions older than 5.14, install \fIlocal::lib\fP.
+.nf
+curl -L -C - -O http://search.cpan.org/CPAN/authors/id/A/AP/APEIRON/local-lib-1.008004.tar.gz
+tar xvf local-lib-1.008004.tar.gz
+cd local-lib-1.008004
+perl Makefile.PL --bootstrap=$HOME/Library/Perl/5.12
+make && make test && make install
+.fi
+.PP
+Install \fIcpanminus\fP:
+.nf
+curl -L http://cpanmin.us | perl - --self-upgrade
+.fi
+.SH Perlbrew
+.PP
+An alternative to the above is to use Perlbrew
+.UR http://perlbrew.pl
+.UE , which allows for the
+management of multiple, isolated Perl installations in the home directory.
+.SH Aliases
+.SS General
+.RS
+.IP \(bu 2
+\fB\fCpl\fR is short for \fB\fCperl\fR.
+.IP \(bu 2
+\fB\fCpld\fR looks up Perl documentation (\fB\fCperldoc\fR).
+.IP \(bu 2
+\fB\fCple\fR executes a one line program in a loop (\fB\fCperl -wlne\fR).
+.RE
+.SS Perlbrew
+.RS
+.IP \(bu 2
+\fB\fCplb\fR manages Perl environments.
+.IP \(bu 2
+\fB\fCplba\fR lists available Perl versions.
+.IP \(bu 2
+\fB\fCplbi\fR installs a Perl version.
+.IP \(bu 2
+\fB\fCplbl\fR lists installed Perl versions.
+.IP \(bu 2
+\fB\fCplbo\fR temporarily turns off Perlbrew.
+.IP \(bu 2
+\fB\fCplbO\fR turns off Perlbrew.
+.IP \(bu 2
+\fB\fCplbs\fR switches to a Perl version.
+.IP \(bu 2
+\fB\fCplbu\fR uninstalls a Perl version.
+.IP \(bu 2
+\fB\fCplbx\fR temporarily sets the Perl version to use.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-prompt.1

@@ -0,0 +1,108 @@
+.TH Prompt
+.PP
+Loads prompt themes
+.UR http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Prompt-Themes
+.UE .
+.SH Settings
+.PP
+To select a prompt theme, add the following to \fIzpreztorc\fP, and replace \fBname\fP
+with the name of the theme you wish to load. Setting it to \fBrandom\fP will load
+a random theme.
+.nf
+zstyle ':prezto:module:prompt' theme 'name'
+.fi
+.SH Theming
+.PP
+A prompt theme is an autoloadable function file with a special name,
+\fB\fCprompt_name_setup\fR, placed anywhere in \fB\fC$fpath\fR, but for the purpose of this
+project, themes \fBshould\fP be placed in the \fImodules/prompt/functions\fP
+directory.
+.SS Theme Functions
+.PP
+There are three theme functions, a setup function, a help function, and
+a preview function. The setup function \fBmust\fP always be defined. The help
+function and the preview functions are optional.
+.SS prompt_name_setup
+.PP
+This function is called by the \fB\fCprompt\fR function to install the theme. This
+function may define other functions as necessary to maintain the prompt,
+including a function that displays help or a function used to preview it.
+.PP
+\fBDo not call this function directly.\fP
+.PP
+The most basic example of this function can be seen bellow.
+.nf
+function prompt_name_setup {
+  PROMPT='%m%# '
+  RPROMPT=''
+}
+.fi
+.SS prompt_name_help
+.PP
+If the \fB\fCprompt_name_setup\fR function is customizable via parameters, a help
+function \fBshould\fP be defined. The user will access it via \fB\fCprompt -h name\fR.
+.PP
+The most basic example of this function can be seen bellow.
+.nf
+function prompt_name_help {
+  cat <<EOH
+This prompt is color-scheme-able. You can invoke it thus:
+  prompt theme [<color1>] [<color2>]
+where the color is for the left-hand prompt.
+EOH
+}
+.fi
+.SS prompt_name_preview
+.PP
+If the \fB\fCprompt_name_setup\fR function is customizable via parameters, a preview
+function \fBshould\fP be defined. The user will access it via \fB\fCprompt -p name\fR.
+.PP
+The most basic example of this function can be seen bellow.
+.nf
+function prompt_name_preview {
+  if (( $# > 0 )); then
+    prompt_preview_theme theme "$@"
+  else
+    prompt_preview_theme theme red green blue
+    print
+    prompt_preview_theme theme yellow magenta black
+  fi
+}
+.fi
+.SS Hook Functions
+.PP
+There are many Zsh hook
+.UR http://zsh.sourceforge.net/Doc/Release/Functions.html#Hook-Functions
+.UE
+functions, but mostly the \fIprecmd\fP hook will be
+used.
+.SS prompt_name_precmd
+.PP
+This hook is called before the prompt is displayed and is useful for getting
+information to display in a prompt.
+.PP
+When calling functions to get information to display in a prompt, do not assume
+that all the dependencies have been loaded. Always check for the availability of
+a function before you calling it.
+.PP
+\fBDo not register hook functions. They will be registered by the \fB\fCprompt\fR function.\fP
+.PP
+The most basic example of this function can be seen bellow.
+.nf
+function prompt_name_precmd {
+  if (( $+functions[git-info] )); then
+    git-info
+  fi
+}
+.fi
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-python.1

@@ -0,0 +1,119 @@
+.TH Python
+.PP
+Enables local Python and local Python package installation.
+.SH Local Python Installation
+.PP
+pythonz
+.UR http://saghul.github.com/pythonz/
+.UE
+builds and installs multiple Python versions locally in the home
+directory.
+.PP
+This module prepends the pythonz directory to the path variable to enable the
+execution of \fB\fCpythonz\fR.
+.SS Usage
+.PP
+Install Python versions with \fB\fCpythonz install\fR into \fI~/.pythonz/pythons\fP.
+.SH Local Package Installation
+.PP
+Since version 2.6, Python supports per user package installation, as defined in
+PEP 370
+.UR http://www.python.org/dev/peps/pep-0370/
+.UE .
+.PP
+This module prepends per user site directories to the relevant path variables
+to enable the execution of user installed scripts and the reading of
+documentation.
+.SS Usage
+.PP
+Install packages into the per user site directory with \fB\fCeasy_install --user\fR or
+\fB\fCpip install --user\fR.
+.SH virtualenvwrapper
+.PP
+virtualenvwrapper
+.UR http://www.doughellmann.com/projects/virtualenvwrapper/
+.UE
+is a frontend to the popular virtualenv
+.UR http://pypi.python.org/pypi/virtualenv
+.UE
+utility.
+.PP
+virtualenv creates isolated Python environments and virtualenvwrapper provides
+convenient shell functions to create, switch, and manage them.
+.SS Usage
+.PP
+Install virtualenvwrapper.
+.PP
+Virtual environments are stored in \fI~/.virtualenvs\fP.
+.PP
+There are configuration variables that have to be set to enable certain features.
+If you wish to use these features, export the variables in \fI~/.zshenv\fP
+.PP
+The variable \fB\fC$PROJECT_HOME\fR tells virtualenvwrapper where to place project
+working directories. It must be set and the directory created before \fB\fCmkproject\fR
+is used. Replace \fIDeveloper\fP with your projects directory.
+.nf
+export PROJECT_HOME="$HOME/Developer"
+.fi
+.PP
+The variable \fB\fC$VIRTUALENVWRAPPER_VIRTUALENV_ARGS\fR tells virtualenvwrapper what
+arguments to pass to \fB\fCvirtualenv\fR. For example, set the value to
+\fI\-\-no\-site\-packages\fP to ensure that all new environments are isolated from the
+system site\-packages directory.
+.nf
+export VIRTUALENVWRAPPER_VIRTUALENV_ARGS='--no-site-packages'
+.fi
+.SH Aliases
+.RS
+.IP \(bu 2
+\fB\fCpy\fR is short for \fB\fCpython\fR.
+.RE
+.SS Pythonz
+.RS
+.IP \(bu 2
+\fB\fCpyz\fR is short for \fB\fCpythonz\fR.
+.IP \(bu 2
+\fB\fCpyzc\fR removes stale source folders and archives.
+.IP \(bu 2
+\fB\fCpyzi\fR installs Python versions.
+.IP \(bu 2
+\fB\fCpyzl\fR lists installed Python versions.
+.IP \(bu 2
+\fB\fCpyzL\fR lists available Python versions.
+.IP \(bu 2
+\fB\fCpyzu\fR updates itself to the latest version.
+.IP \(bu 2
+\fB\fCpyzx\fR uninstalls Python versions.
+.RE
+.SH Functions
+.RS
+.IP \(bu 2
+\fB\fCpython-info\fR exposes information about the Python environment via the
+\fB\fC$python_info\fR associative array.
+.RE
+.SH Theming
+.PP
+To display the name of the current virtual enviroment in a prompt, define the
+following style in the \fB\fCprompt_theme_setup\fR function.
+.nf
+# %v - virtualenv name.
+zstyle ':prezto:module:python' virtualenv 'virtualenv:%v'
+.fi
+.PP
+Then add \fB\fC$python_info[virtualenv]\fR to \fB\fC$PROMPT\fR or \fB\fC$RPROMPT\fR and call
+\fB\fCpython-info\fR in the \fB\fCprompt_theme_preexec\fR hook function.
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.IP \(bu 2
+Sebastian Wiesner
+.UR https://github.com/lunaryorn
+.UE
+.RE

documentation/man/man1/prezto-rails.1

@@ -0,0 +1,56 @@
+.TH Ruby on Rails
+.PP
+Defines Ruby on Rails
+.UR http://rubyonrails.org
+.UE
+aliases.
+.SH Aliases
+.RS
+.IP \(bu 2
+\fB\fCror\fR is short for \fB\fCrails\fR.
+.IP \(bu 2
+\fB\fCrorc\fR starts the Rails console.
+.IP \(bu 2
+\fB\fCrordc\fR starts the Rails console connected to the database.
+.IP \(bu 2
+\fB\fCrordm\fR migrates the database.
+.IP \(bu 2
+\fB\fCrordM\fR migrates the database and recreates the test database.
+.IP \(bu 2
+\fB\fCrordr\fR rolls the database schema back to the previous version.
+.IP \(bu 2
+\fB\fCrorg\fR generates new code.
+.IP \(bu 2
+\fB\fCrorl\fR displays the log.
+.IP \(bu 2
+\fB\fCrorlc\fR truncates logs to zero bytes.
+.IP \(bu 2
+\fB\fCrorp\fR installs a plugin.
+.IP \(bu 2
+\fB\fCrorr\fR runs code in the application environment.
+.IP \(bu 2
+\fB\fCrors\fR starts the Rails server.
+.IP \(bu 2
+\fB\fCrorsd\fR starts the Rails server with the debugger.
+.IP \(bu 2
+\fB\fCrorx\fR destroys newly generated code.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Robby Russell
+.UR https://github.com/robbyrussell
+.UE
+.IP \(bu 2
+Jake Bell
+.UR https://github.com/theunraveler
+.UE
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-rsync.1

@@ -0,0 +1,34 @@
+.TH Rsync
+.PP
+Defines rsync
+.UR http://rsync.samba.org
+.UE
+aliases.
+.PP
+Mac OS X users are encouraged to use Bombich's rsync
+.UR http://www.bombich.com/rsync.html
+.UE , which has HFS+
+enhancements.
+.SH Aliases
+.RS
+.IP \(bu 2
+\fB\fCrsync-copy\fR copies files and directories from \fIsource\fP to \fIdestination\fP.
+.IP \(bu 2
+\fB\fCrsync-move\fR moves files and directories from \fIsource\fP to \fIdestination\fP.
+.IP \(bu 2
+\fB\fCrsync-update\fR updates files and directories on \fIdestination\fP.
+.IP \(bu 2
+\fB\fCrsync-synchronize\fR synchronizes files and directories between \fIsource\fP and
+\fIdestination\fP.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-ruby.1

@@ -0,0 +1,97 @@
+.TH Ruby
+.PP
+Configures Ruby
+.UR http://www.ruby-lang.org
+.UE
+local gem installation, loads version managers, and defines
+aliases.
+.SH Local Gem Installation
+.PP
+When a Ruby version manager is not detected, local gems are installed in
+\fI~/Library/Ruby/Gems/1.8\fP on Mac OS X.
+.SH RVM
+.PP
+An alternative to the above is to use The Ruby Version Manager (RVM)
+.UR https://rvm.io
+.UE , which
+allows for managing multiple, isolated Ruby installations and gem sets in the
+home directory.
+.PP
+Since RVM is loaded into the shell and is known to override shell commands, it
+may conflict with shell scripts.
+.SH rbenv
+.PP
+An alternative RVM is to use rbenv
+.UR https://github.com/sstephenson/rbenv
+.UE , which allows for switching between multiple,
+isolated Ruby installations in the home directory.
+.PP
+While it is not as feature rich as RVM, it is not loaded into the shell and is
+not known to cause conflicts with shell scripts.
+.SH Bundler
+.PP
+Manage gems that are not meant to be used as commands, such as application
+dependencies, with Bundler
+.UR http://gembundler.com
+.UE .
+.SH Aliases
+.SS General
+.RS
+.IP \(bu 2
+\fB\fCrb\fR is short for \fB\fCruby\fR.
+.RE
+.SS Bundler
+.RS
+.IP \(bu 2
+\fB\fCrbb\fR manages ruby dependencies (\fB\fCbundle\fR).
+.IP \(bu 2
+\fB\fCrbbe\fR executes a script in the context of the current bundle.
+.IP \(bu 2
+\fB\fCrbbi\fR installs the gems specified in the \fIGemfile\fP in \fIvendor/bundle\fP.
+.IP \(bu 2
+\fB\fCrbbI\fR installs the following:
+.RS
+.IP \(bu 2
+gems specified in the \fIGemfile\fP in \fIvendor/bundle\fP.
+.IP \(bu 2
+packages the gems into \fIvendor/cache\fP.
+.IP \(bu 2
+appends bundler directories to  \fI.gitignore\fP.
+.RE
+.IP \(bu 2
+\fB\fCrbbl\fR lists all gems in the current bundle.
+.IP \(bu 2
+\fB\fCrbbo\fR opens an installed gem in the editor.
+.IP \(bu 2
+\fB\fCrbbp\fR packages gem files into \fIvendor/cache\fP.
+.IP \(bu 2
+\fB\fCrbbu\fR updates gems to their latest version.
+.RE
+.SH Functions
+.RS
+.IP \(bu 2
+\fB\fCruby-info\fR exposes information about the Ruby environment via the
+\fB\fC$ruby_info\fR associative array.
+.RE
+.SH Theming
+.PP
+To display the name of the current Ruby version in a prompt, define the
+following style in the \fB\fCprompt_theme_setup\fR function.
+.nf
+# %v - ruby version.
+zstyle ':prezto:module:ruby' version 'version:%v'
+.fi
+.PP
+Then add \fB\fC$ruby_info[version]\fR to \fB\fC$PROMPT\fR or \fB\fC$RPROMPT\fR and call
+\fB\fCruby-info\fR in the \fB\fCprompt_theme_preexec\fR hook function.
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-screen.1

@@ -0,0 +1,37 @@
+.TH GNU Screen
+.PP
+Defines GNU Screen
+.UR http://www.gnu.org/software/screen/
+.UE
+aliases and provides for auto launching it at start\-up.
+.SH Settings
+.SS Auto\-Start
+.PP
+Starts a GNU Screen session automatically when Zsh is launched.
+.PP
+To enable this feature, add the following line to \fIzpreztorc\fP:
+.nf
+zstyle ':prezto:module:screen' auto-start 'yes'
+.fi
+.SH Aliases
+.RS
+.IP \(bu 2
+\fB\fCscr\fR is short for \fB\fCscreen\fR.
+.IP \(bu 2
+\fB\fCscrl\fR lists sessions/socket directory.
+.IP \(bu 2
+\fB\fCscrn\fR starts a new session.
+.IP \(bu 2
+\fB\fCscrr\fR attaches to a session if one exists or start a new one.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-spectrum.1

@@ -0,0 +1,145 @@
+.TH Spectrum
+.PP
+Provides for easier use of 256 colors and effects.
+.PP
+To learn more about text formatting, read That 256 Color Thing
+.UR http://lucentbeing.com/blog/that-256-color-thing/
+.UE .
+.SH Variables
+.RS
+.IP \(bu 2
+\fB\fCBG\fR provides background colors.
+.IP \(bu 2
+\fB\fCFG\fR provides foreground colors.
+.IP \(bu 2
+\fB\fCFX\fR provides effects.
+.RE
+.SS Background and Foreground
+.PP
+Terminals support 8, 16, 88, and 256 colors. Check if a terminal supports 256
+colors with \fB\fCtput colors\fR before use.
+.PP
+The following colors are supported.
+.RS
+.IP \(bu 2
+0 to 255
+.IP \(bu 2
+black
+.IP \(bu 2
+red
+.IP \(bu 2
+green
+.IP \(bu 2
+yellow
+.IP \(bu 2
+blue
+.IP \(bu 2
+magenta
+.IP \(bu 2
+cyan
+.IP \(bu 2
+white
+.RE
+.SS Effects
+.PP
+Though there are many effects, most terminals support at least bold formatting.
+.PP
+\fBNot all effects work on all terminals; use them sparingly.\fP
+.TS
+allbox;
+cb cb
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+.
+Enable	Disable
+	none
+	normal
+bold	no\-bold
+faint	no\-faint
+standout	no\-standout
+underline	no\-underline
+blink	no\-blink
+fast\-blink	no\-fast\-blink
+reverse	no\-reverse
+conceal	no\-conceal
+strikethrough	no\-strikethrough
+gothic	no\-gothic
+double\-underline	no\-double\-underline
+proportional	no\-proportional
+overline	no\-overline
+	
+	no\-border
+border\-rectangle	no\-border\-rectangle
+border\-circle	no\-border\-circle
+	
+	no\-ideogram\-marking
+underline\-or\-right	no\-underline\-or\-right
+double\-underline\-or\-right	no\-double\-underline\-or\-right
+overline\-or\-left	no\-overline\-or\-left
+double\-overline\-or\-left	no\-double\-overline\-or\-left
+stress	no\-stress
+	
+	font\-default
+font\-first	no\-font\-first
+font\-second	no\-font\-second
+font\-third	no\-font\-third
+font\-fourth	no\-font\-fourth
+font\-fifth	no\-font\-fifth
+font\-sixth	no\-font\-sixth
+font\-seventh	no\-font\-seventh
+font\-eigth	no\-font\-eigth
+font\-ninth	no\-font\-ninth
+.TE
+.SS Plain Text
+.PP
+Use \fB\fC$BG[none]\fR, \fB\fC$FG[none]\fR, or \fB\fC$FX[none]\fR to turn off formatting.
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+P.C. Shyamshankar
+.UR https://github.com/sykora
+.UE
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-ssh-agent.1

@@ -0,0 +1,53 @@
+.TH SSH\-Agent
+.PP
+Provides for an easier use of ssh\-agent
+.UR http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-agent&sektion=1
+.UE .
+.SH Settings
+.SS Agent Forwarding
+.PP
+To enable ssh\-agent forwarding, add the following line to \fIzpreztorc\fP:
+.nf
+zstyle ':prezto:module:ssh-agent' forwarding 'yes'
+.fi
+.SS Identities
+.PP
+To load multiple identities, add the following line to \fIzpreztorc\fP:
+.nf
+zstyle ':prezto:module:ssh-agent' identities 'id_rsa' 'id_rsa2' 'id_github'
+.fi
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Robby Russell
+.UR https://github.com/robbyrussell
+.UE
+.IP \(bu 2
+Theodore Robert Campbell Jr
+.UR https://github.com/trcjr
+.UE
+.IP \(bu 2
+Joseph M. Reagle Jr.
+.UR https://github.com/reagle
+.UE
+.IP \(bu 2
+Florent Thoumie
+.UR https://github.com/flz
+.UE
+.IP \(bu 2
+Jonas Pfenniger
+.UR https://github.com/zimbatm
+.UE
+.IP \(bu 2
+Gareth Owen
+.UR https://github.com/gwjo
+.UE
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-syntax-highlighting.1

@@ -0,0 +1,53 @@
+.TH Syntax Highlighting
+.PP
+Integrates zsh\-syntax\-highlighting
+.UR https://github.com/zsh-users/zsh-syntax-highlighting
+.UE
+into Prezto.
+.PP
+This module should be loaded \fIsecond to last\fP, where last is the \fIprompt\fP
+module, unless used in conjuncture with the \fIhistory\-substring\-search\fP module
+where it must be loaded \fBbefore\fP it.
+.SH Contributors
+.PP
+New features and bug fixes should be submitted to the
+zsh\-syntax\-highlighting
+.UR https://github.com/zsh-users/zsh-syntax-highlighting
+.UE
+project according to its rules and regulations.
+This module will be synchronized against it.
+.SH Settings
+.SS Highlighting
+.PP
+To enable highlighting for this module only, add the following line to
+\fIzpreztorc\fP:
+.nf
+zstyle ':prezto:module:syntax-highlighting' color 'yes'
+.fi
+.SS Highlighters
+.PP
+Syntax highlighting is accomplished by pluggable highlighters
+.UR https://github.com/zsh-users/zsh-syntax-highlighting/tree/master/highlighters
+.UE . This module
+enables the \fImain\fP, \fIbrackets\fP, and \fIcursor\fP highlighters by default.
+.PP
+To enable all highlighters, add the following to \fIzpreztorc\fP:
+.nf
+zstyle ':prezto:module:syntax-highlighting' highlighters \
+  'main' \
+  'brackets' \
+  'pattern' \
+  'cursor' \
+  'root'
+.fi
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-terminal.1

@@ -0,0 +1,26 @@
+.TH Terminal
+.PP
+Sets terminal window and tab titles.
+.SH Settings
+.SS Auto\-Title
+.PP
+To auto set the terminal window and tab titles with the current command or
+directory, add the following to \fIzpreztorc\fP:
+.nf
+zstyle ':prezto:module:terminal' auto-title 'yes'
+.fi
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+James Cox
+.UR https://github.com/imajes
+.UE
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-tmux.1

@@ -0,0 +1,61 @@
+.TH Tmux
+.PP
+Defines tmux
+.UR http://tmux.sourceforge.net
+.UE
+aliases and provides for auto launching it at start\-up.
+.SH Settings
+.SS Auto\-Start
+.PP
+Starts a tmux session automatically when Zsh is launched.
+.PP
+To enable this feature, add the following line to \fIzpreztorc\fP:
+.nf
+zstyle ':prezto:module:tmux' auto-start 'yes'
+.fi
+.PP
+It will create a background session named \fI#Prezto\fP and attach every new shell
+to it.
+.PP
+To avoid keeping open sessions, this module sets \fB\fCdestroy-unattached off\fR on
+the background session and \fB\fCdestroy-unattached on\fR on every other session
+(global setting).
+.SH Aliases
+.RS
+.IP \(bu 2
+\fB\fCtmuxa\fR attaches or switches to a tmux session.
+.IP \(bu 2
+\fB\fCtmuxl\fR lists sessions managed by the tmux server.
+.RE
+.SH Caveats
+.PP
+On Mac OS X, launching tmux can cause the error \fBlaunch_msg(...): Socket is not
+connected\fP to be displayed, which can be fixed by installing
+reattach\-to\-user\-namespace
+.UR ChrisJohnsen/tmux-MacOSX-pasteboard
+.UE , available in Homebrew
+.UR mxcl/homebrew
+.UE , and adding the
+following to \fItmux.conf\fP:
+.PP
+   set\-option \-g default\-command "reattach\-to\-user\-namespace \-l $SHELL \-l"
+.PP
+Furthermore, tmux is known to cause \fBkernel panics\fP on Mac OS X. A discussion
+about this and Prezto has already been opened
+.UR http://git.io/jkPqHg
+.UE .
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.IP \(bu 2
+Colin Hebert
+.UR https://github.com/ColinHebert
+.UE
+.RE

documentation/man/man1/prezto-utility.1

@@ -0,0 +1,233 @@
+.TH Utility
+.PP
+Defines general aliases and functions.
+.SH Settings
+.SS Highlighting
+.PP
+If you have enabled color globally in \fIzpreztorc\fP, you may disable it for certain
+commands.
+.PP
+To disable \fB\fCls\fR color, add the following line to \fIzpreztorc\fP; when coloring is
+disabled, type indicators (*, /, =>, @, =, |, %) will be appended to entries.
+.nf
+zstyle ':prezto:module:utility:ls' color 'no'
+.fi
+.PP
+To disable \fB\fCdiff\fR highlighting, add the following line to \fIzpreztorc\fP:
+.nf
+zstyle ':prezto:module:utility:diff' color 'no'
+.fi
+.PP
+To disable \fB\fCwdiff\fR highlighting, add the following line to \fIzpreztorc\fP:
+.nf
+zstyle ':prezto:module:utility:wdiff' color 'no'
+.fi
+.PP
+To disable \fB\fCmake\fR highlighting, add the following line to \fIzpreztorc\fP:
+.nf
+zstyle ':prezto:module:utility:make' color 'no'
+.fi
+.SH Aliases
+.SS Disabled Spelling Correction
+.RS
+.IP \(bu 2
+\fB\fCack\fR
+.IP \(bu 2
+\fB\fCcd\fR
+.IP \(bu 2
+\fB\fCcp\fR
+.IP \(bu 2
+\fB\fCebuild\fR
+.IP \(bu 2
+\fB\fCgcc\fR
+.IP \(bu 2
+\fB\fCgist\fR
+.IP \(bu 2
+\fB\fCgrep\fR
+.IP \(bu 2
+\fB\fCheroku\fR
+.IP \(bu 2
+\fB\fCln\fR
+.IP \(bu 2
+\fB\fCman\fR
+.IP \(bu 2
+\fB\fCmkdir\fR
+.IP \(bu 2
+\fB\fCmv\fR
+.IP \(bu 2
+\fB\fCmysql\fR
+.IP \(bu 2
+\fB\fCrm\fR
+.RE
+.SS Disabled File Globbing
+.RS
+.IP \(bu 2
+\fB\fCfc\fR
+.IP \(bu 2
+\fB\fCfind\fR
+.IP \(bu 2
+\fB\fCftp\fR
+.IP \(bu 2
+\fB\fChistory\fR
+.IP \(bu 2
+\fB\fClocate\fR
+.IP \(bu 2
+\fB\fCrake\fR
+.IP \(bu 2
+\fB\fCrsync\fR
+.IP \(bu 2
+\fB\fCscp\fR
+.IP \(bu 2
+\fB\fCsftp\fR
+.RE
+.SS General
+.RS
+.IP \(bu 2
+\fB\fC_\fR executes a command as another user (\fB\fCsudo\fR).
+.IP \(bu 2
+\fB\fCb\fR opens the default web browser.
+.IP \(bu 2
+\fB\fCcp\fR copies files and directories interactively.
+.IP \(bu 2
+\fB\fCe\fR opens the default editor.
+.IP \(bu 2
+\fB\fCln\fR links files and directories interactively.
+.IP \(bu 2
+\fB\fCmkdir\fR creates directories, including intermediary directories.
+.IP \(bu 2
+\fB\fCmv\fR moves files and directories interactively.
+.IP \(bu 2
+\fB\fCp\fR opens the default pager.
+.IP \(bu 2
+\fB\fCpo\fR removes a directory from the stack and changes to it (\fB\fCpopd\fR).
+.IP \(bu 2
+\fB\fCpu\fR changes the directory and pushes the old directory onto the stack
+(\fB\fCpushd\fR).
+.IP \(bu 2
+\fB\fCrm\fR removes files and directories interactively.
+.IP \(bu 2
+\fB\fCtype\fR displays all the attribute values of a shell parameter.
+.RE
+.SS Files and Directories
+.RS
+.IP \(bu 2
+\fB\fCls\fR lists with directories grouped first (GNU only).
+.IP \(bu 2
+\fB\fCl\fR  lists in one column, hidden files.
+.IP \(bu 2
+\fB\fCll\fR lists human readable sizes.
+.IP \(bu 2
+\fB\fClr\fR lists human readable sizes, recursively.
+.IP \(bu 2
+\fB\fCla\fR lists human readable sizes, hidden files.
+.IP \(bu 2
+\fB\fClm\fR lists human readable sizes, hidden files through pager.
+.IP \(bu 2
+\fB\fClx\fR lists sorted by extension (GNU only).
+.IP \(bu 2
+\fB\fClk\fR lists sorted by size, largest last.
+.IP \(bu 2
+\fB\fClt\fR lists sorted by date, most recent last.
+.IP \(bu 2
+\fB\fClc\fR lists sorted by date, most recent last, shows change time.
+.IP \(bu 2
+\fB\fClu\fR lists sorted by date, most recent last, shows access time.
+.IP \(bu 2
+\fB\fCsl\fR lists directory contents (\fB\fCls\fR).
+.RE
+.SS Mac OS X Everywhere
+.RS
+.IP \(bu 2
+\fB\fCo\fR opens files and directories (\fB\fCopen\fR or \fB\fCxdg-open\fR).
+.IP \(bu 2
+\fB\fCget\fR downloads files (\fB\fCcurl\fR or \fB\fCwget\fR).
+.IP \(bu 2
+\fB\fCpbcopy\fR copies to the pasteboard (\fB\fCpbcopy\fR, \fB\fCxclip\fR or \fB\fCxsel\fR).
+.IP \(bu 2
+\fB\fCpbpaste\fR pastes from the pasteboard (\fB\fCpbcopy\fR, \fB\fCxclip\fR or \fB\fCxsel\fR).
+.IP \(bu 2
+\fB\fCpbc\fR copies to the pasteboard (\fB\fCpbcopy\fR).
+.IP \(bu 2
+\fB\fCpbp\fR pastes from the pasteboard (\fB\fCpbpaste\fR).
+.RE
+.SS Resource Usage
+.RS
+.IP \(bu 2
+\fB\fCdf\fR displays free disk space using human readable units.
+.IP \(bu 2
+\fB\fCdu\fR displays disk usage using human readable units.
+.IP \(bu 2
+\fB\fCtop\fR displays information about processes (aliased to \fB\fChtop\fR, if installed).
+.IP \(bu 2
+\fB\fCtopc\fR displays information about processes sorted by CPU usage (\fB\fChtop\fR not
+installed).
+.IP \(bu 2
+\fB\fCtopm\fR displays information about processes sorted by RAM usage (\fB\fChtop\fR not
+installed).
+.RE
+.SS Miscellaneous
+.RS
+.IP \(bu 2
+\fB\fChttp-serve\fR serves a directory via HTTP.
+.RE
+.SH Functions
+.SS General
+.RS
+.IP \(bu 2
+\fB\fCslit\fR prints columns \fI1, 2, 3 ... n\fP.
+.RE
+.SS Files and Directories
+.RS
+.IP \(bu 2
+\fB\fCcdls\fR changes to a directory and lists its contents.
+.IP \(bu 2
+\fB\fCdut\fR displays the grand total disk usage using human readable units.
+.IP \(bu 2
+\fB\fCfind-exec\fR finds files and executes a command on them.
+.IP \(bu 2
+\fB\fCmkdcd\fR makes a directory and changes to it.
+.IP \(bu 2
+\fB\fCpopdls\fR pops an entry off the directory stack and lists its contents.
+.IP \(bu 2
+\fB\fCpushdls\fR pushes an entry onto the directory stack and lists its contents.
+.RE
+.SS Developer
+.RS
+.IP \(bu 2
+\fB\fCdiff\fR highlights diff output (requires \fB\fCcolordiff\fR or \fB\fCGit\fR).
+.IP \(bu 2
+\fB\fCmake\fR highlights make output (requires \fB\fCcolormake\fR).
+.IP \(bu 2
+\fB\fCwdiff\fR highlights wdiff output (requires \fB\fCwdiff\fRor \fB\fCGit\fR).
+.RE
+.SS Resource usage
+.RS
+.IP \(bu 2
+\fB\fCpsu\fR displays user owned processes status.
+.RE
+.SS Search and Replace
+.RS
+.IP \(bu 2
+\fB\fCprep\fR provides a grep\-like pattern search.
+.IP \(bu 2
+\fB\fCpsub\fR provides a sed\-like pattern substitution.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Robby Russell
+.UR https://github.com/robbyrussell
+.UE
+.IP \(bu 2
+Suraj N. Kurapati
+.UR https://github.com/sunaku
+.UE
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-wakeonlan.1

@@ -0,0 +1,43 @@
+.TH Wake\-on\-LAN
+.PP
+This module provides a wrapper around the wakeonlan
+.UR http://gsd.di.uminho.pt/jpo/software/wakeonlan/
+.UE
+tool.
+.SH Usage
+.PP
+To use this wrapper, create the \fI~/.wakeonlan\fP directory, and place in it one
+file for each device you would like to be able to wake. Give the file a name
+that describes the device, such as its hostname.
+.PP
+Each file should contain a line with the MAC address of the target device and
+the network broadcast address. For instance, there might be a file
+\fI~/.wakeonlan/leto\fP with the following contents:
+.nf
+00:11:22:33:44:55:66 192.168.0.255
+.fi
+.PP
+To wake that device, use the following command:
+.nf
+wake leto
+.fi
+.PP
+For more information on the configuration file format, read the
+wakeonlan man page
+.UR http://man.cx/wakeonlan
+.UE .
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Paul Dann
+.UR https://github.com/giddie
+.UE
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-yum.1

@@ -0,0 +1,40 @@
+.TH Yum
+.PP
+Defines yum
+.UR http://yum.baseurl.org
+.UE
+aliases.
+.SH Aliases
+.RS
+.IP \(bu 2
+\fB\fCyumc\fR removes package(s) and leaves.
+.IP \(bu 2
+\fB\fCyumi\fR installs package(s).
+.IP \(bu 2
+\fB\fCyumh\fR displays history.
+.IP \(bu 2
+\fB\fCyuml\fR lists packages.
+.IP \(bu 2
+\fB\fCyumL\fR lists installed packages.
+.IP \(bu 2
+\fB\fCyumq\fR displays package information.
+.IP \(bu 2
+\fB\fCyumr\fR removes package(s).
+.IP \(bu 2
+\fB\fCyums\fR searches for a package.
+.IP \(bu 2
+\fB\fCyumu\fR updates packages.
+.IP \(bu 2
+\fB\fCyumU\fR upgrates packages.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto-z.1

@@ -0,0 +1,23 @@
+.TH Z
+.PP
+Integrates z
+.UR https://github.com/rupa/z
+.UE
+into Prezto, which maintains a frequently used directory
+list for fast directory changes.
+.SH Aliases
+.RS
+.IP \(bu 2
+\fB\fCj\fR changes the current working directory to the most \fIfrecent\fP match.
+.RE
+.SH Authors
+.PP
+\fIThe authors of this module should be contacted via the issue tracker
+.UR https://github.com/sorin-ionescu/prezto/issues
+.UE .\fP
+.RS
+.IP \(bu 2
+Sorin Ionescu
+.UR https://github.com/sorin-ionescu
+.UE
+.RE

documentation/man/man1/prezto.1

@@ -0,0 +1,199 @@
+.TH Prezto — Instantly Awesome Zsh
+.PP
+Prezto is the configuration framework for Zsh
+.UR http://www.zsh.org
+.UE ; it enriches the command line
+interface environment with sane defaults, aliases, functions, auto completion,
+and prompt themes.
+.SH Installation
+.PP
+Prezto will work with any recent release of Zsh, but the minimum recommended
+version is 4.3.10.
+.nr step0 0 1
+.RS
+.IP \n+[step0]
+Launch Zsh:
+.nf
+zsh
+.fi
+.IP \n+[step0]
+Clone the repository:
+.nf
+git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
+.fi
+.IP \n+[step0]
+Create a new Zsh configuration by copying the Zsh configuration files
+ provided:
+.nf
+setopt EXTENDED_GLOB
+for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do
+  ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}"
+done
+.fi
+.IP \n+[step0]
+Set Zsh as your default shell:
+.nf
+chsh -s /bin/zsh
+.fi
+.IP \n+[step0]
+Open a new Zsh terminal window or tab.
+.RE
+.SS Mac OS X
+.PP
+If you have administrator privileges, you must fix an Apple\-introduced problem
+in Mac OS X 10.5 Leopard by executing the following command, or BASH and Zsh
+will have the wrong \fB\fCPATH\fR when executed non\-interactively.
+.nf
+sudo chmod ugo-x /usr/libexec/path_helper
+.fi
+.PP
+\fB\fCpath_helper\fR is intended to make it easier for installers to add new paths to
+the environment without having to edit shell configuration files by adding
+a file with a path to the \fI/etc/paths.d\fP directory.
+.PP
+Unfortunately, \fB\fCpath_helper\fR always reads paths from \fI/etc/paths\fP set by Apple
+then paths from \fI/etc/paths.d\fP set by third party installers, and lastly paths
+from the \fB\fCPATH\fR environment variable set by the parent process, which
+ultimately is set by the user with \fB\fCexport PATH=...\fR Thus, it reorders path
+priorities, and user \fI/bin\fP directories meant to override system \fI/bin\fP
+directories end up at the tail of the array.
+.SS Troubleshooting
+.PP
+If you are not able to find certain commands after switching to \fIPrezto\fP,
+modify the \fB\fCPATH\fR variable in \fI~/.zshenv\fP then open a new Zsh terminal
+window or tab.
+.SH Usage
+.PP
+Prezto has many features disabled by default. Read the source code and
+accompanying README files to learn of what is available.
+.SS Modules
+.nr step1 0 1
+.RS
+.IP \n+[step1]
+Browse \fI/modules\fP to see what is available.
+.IP \n+[step1]
+Load the modules you need in \fI~/.zpreztorc\fP then open a new Zsh terminal
+ window or tab.
+.RE
+.SS Themes
+.nr step2 0 1
+.RS
+.IP \n+[step2]
+For a list of themes, type \fB\fCprompt -l\fR.
+.IP \n+[step2]
+To preview a theme, type \fB\fCprompt -p name\fR.
+.IP \n+[step2]
+Load the theme you like in \fI~/.zpreztorc\fP then open a new Zsh terminal
+ window or tab.
+.PP
+ [sorin theme]2
+.UR http://i.imgur.com/ij8Lv.png
+.UE
+.RE
+.SH Customization
+.PP
+The project is managed via Git
+.UR http://git-scm.com
+.UE . It is highly recommend that you commit
+your changes and push them to GitHub
+.UR https://github.com
+.UE
+to not lose them. If you do not know
+how to use Git, follow this tutorial
+.UR http://gitimmersion.com
+.UE
+and bookmark this reference
+.UR http://gitref.org
+.UE .
+.SH Resources
+.PP
+The Zsh Reference Card
+.UR http://www.bash2zsh.com/zsh_refcard/refcard.pdf
+.UE
+and the zsh\-lovers
+.UR http://grml.org/zsh/zsh-lovers.html
+.UE
+man page are indispensable.
+.SH Contribute
+.PP
+This project would not exist without all of its users and contributors
+.UR https://github.com/sorin-ionescu/prezto/contributors
+.UE .
+.PP
+If you have ideas on how to make the configuration easier to maintain or
+improve its performance, do not hesitate to fork and send pull requests.
+.SS Issue Reporting
+.RS
+.IP \(bu 2
+Check that the issue has not already been reported.
+.IP \(bu 2
+Check that the issue has not already been fixed in the latest code.
+.IP \(bu 2
+Open an issue with a clear title and description in grammatically correct,
+ complete sentences.
+.RE
+.SS Pull Request
+.RS
+.IP \(bu 2
+Read how to properly contribute to open source projects on GitHub
+.UR http://gun.io/blog/how-to-github-fork-branch-and-pull-request
+.UE .
+.IP \(bu 2
+Use a topic branch to easily amend a pull request later, if necessary.
+.IP \(bu 2
+Write good commit messages
+.UR http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+.UE .
+.IP \(bu 2
+Squash commits on the topic branch before opening a pull request.
+.IP \(bu 2
+Use the same coding style and spacing.
+.IP \(bu 2
+Open a pull request
+.UR https://help.github.com/articles/using-pull-requests
+.UE
+that relates to but one subject with a clear
+ title and description in grammatically correct, complete sentences.
+.RE
+.SS Modules
+.RS
+.IP \(bu 2
+A \fIREADME.md\fP must be present.
+.IP \(bu 2
+Large functions must be placed in a \fIfunctions\fP directory.
+.IP \(bu 2
+Functions that take arguments must have completion.
+.RE
+.SS Themes
+.RS
+.IP \(bu 2
+A screenshots section must be present in the file header.
+.IP \(bu 2
+The pull request description must have embedded
+ screenshots
+.UR http://daringfireball.net/projects/markdown/syntax#img
+.UE .
+.RE
+.SH License
+.PP
+(The MIT License)
+.PP
+Copyright (c) 2009\-2012 Robby Russell, Sorin Ionescu, and contributors.
+.PP
+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
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+.PP
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+.PP
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

documentation/markdown/prezto-archive.md

@@ -1,13 +1,13 @@
 Archive
 =======
 
-Provides functions to extract and list popular archive formats.
+Provides functions to list and extract archives.
 
 Functions
 ---------
 
-  - `extract` extracts the contents of one or more archives.
-  - `ls-archive` lists the contents of one or more archives.
+  - `lsarchive` lists the contents of one or more archives.
+  - `unarchive` extracts the contents of one or more archives.
 
 Supported Formats
 -----------------
@@ -26,7 +26,7 @@ installed:
   - *.lzma* requires `unlzma`.
   - *.Z* requires `uncompress`.
   - *.zip* requires `unzip`.
-  - *.rar* requires `unrar`.
+  - *.rar* requires `unrar` or `rar`.
   - *.7z* requires `7za`.
   - *.deb* requires `ar`, `tar`.
 

documentation/markdown/prezto-command-not-found.md

@@ -1,7 +1,8 @@
 Command-Not-Found
 =================
 
-Loads the [command-not-found][1] tool on Debian-based distributions.
+Displays installation information for not found commands by loading the
+[command-not-found][1] tool on Debian-based and Arch Linux-based distributions.
 
 Authors
 -------

documentation/markdown/prezto-dpkg.md

@@ -7,16 +7,16 @@ Aliases
 -------
 
 - `debc` cleans the cache.
-- `debf` displays a file's packake.
+- `debf` displays a file's package.
 - `debi` installs packages from repositories.
 - `debI` installs packages from files.
 - `debq` displays package information.
-- `debu` updates the packages lists.
+- `debu` updates the package lists.
 - `debU` upgrades outdated packages.
 - `debx` removes packages.
 - `debX` removes packages, their configuration, and unneeded dependencies.
 - `debs` searches for packages.
-- `deb-build` creates a basic .deb package.
+- `deb-build` creates a basic deb package.
 - `deb-kclean` removes all kernel images and headers, except for the ones in
   use.
 

documentation/markdown/prezto-editor.md

@@ -0,0 +1,63 @@
+Editor
+======
+
+Sets key bindings.
+
+Settings
+--------
+
+### Key bindings
+
+To enable key bindings, add the following to *zpreztorc*, and replace 'bindings'
+with 'emacs' or 'vi'.
+
+    zstyle ':prezto:module:editor' key-bindings 'bindings'
+
+### Dot Expansion
+
+To enable the auto conversion of .... to ../.., add the following to
+*zpreztorc*.
+
+    zstyle ':prezto:module:editor' dot-expansion 'yes'
+
+Theming
+-------
+
+To indicate when the editor is in the primary keymap (emacs or viins), add
+the following to your `theme_prompt_setup` function.
+
+    zstyle ':prezto:module:editor:info:keymap:primary' format '>>>'
+
+To indicate when the editor is in the primary keymap (emacs or viins) insert
+mode, add the following to your `theme_prompt_setup` function.
+
+    zstyle ':prezto:module:editor:info:keymap:primary:insert' format 'I'
+
+To indicate when the editor is in the primary keymap (emacs or viins) overwrite
+mode, add the following to your `theme_prompt_setup` function.
+
+    zstyle ':prezto:module:editor:info:keymap:primary:overwrite' format 'O'
+
+To indicate when the editor is in the alternate keymap (vicmd), add the
+following to your `theme_prompt_setup` function.
+
+    zstyle ':prezto:module:editor:info:keymap:alternate' format '<<<'
+
+To indicate when the editor is completing, add the following to your
+`theme_prompt_setup` function.
+
+    zstyle ':prezto:module:editor:info:completing' format '...'
+
+Then add `$editor_info[context]`, where context is *keymap*, *insert*, or
+*overwrite*, to `$PROMPT` or `$RPROMPT` and call `editor-info` in the
+`prompt_name_preexec` hook function.
+
+Authors
+-------
+
+*The authors of this module should be contacted via the [issue tracker][1].*
+
+  - [Sorin Ionescu](https://github.com/sorin-ionescu)
+
+[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+

documentation/markdown/prezto-emacs.md

@@ -0,0 +1,33 @@
+Emacs
+=====
+
+Enables Emacs dependency management.
+
+Dependency management
+---------------------
+
+[Carton][1] installs and manages Emacs packages for Emacs package development
+and Emacs configuration.
+
+This module prepends the Carton directory to the path variable to enable the
+execution of `carton`.
+
+Aliases
+-------
+
+### Carton
+
+  - `cai` installs dependencies.
+  - `cau` updates dependencies.
+  - `caI` initializes the current directory for dependency management.
+  - `cae` executes a command which correct dependencies.
+
+Authors
+-------
+
+*The authors of this module should be contacted via the [issue tracker][2].*
+
+  - [Sebastian Wiesner](https://github.com/lunaryorn)
+
+[1]: https://github.com/rejeep/carton
+[2]: https://github.com/sorin-ionescu/prezto/issues

documentation/markdown/prezto-git.md

@@ -1,7 +1,8 @@
 Git
 ===
 
-Enhances the [Git][1] distributed version control system by providing aliases, functions and by exposing repository status information to prompts.
+Enhances the [Git][1] distributed version control system by providing aliases,
+functions and by exposing repository status information to prompts.
 
 Git **1.7.2** is the [minimum required version][7].
 
@@ -12,7 +13,7 @@ Settings
 
 The format of the [git-log][8] output is configurable via the following style,
 where context is *brief*, *oneline*, and *medium*, which will be passed to the
-`--prety=format:` switch.
+`--pretty=format:` switch.
 
     zstyle ':prezto:module:git:log:context' format ''
 
@@ -38,8 +39,8 @@ Aliases
   - `gbc` creates a new branch.
   - `gbl` lists branches and their commits.
   - `gbL` lists local and remote branches and their commits.
-  - `gbs` lists branches and their commits with ancestery graphs.
-  - `gbS` lists local and remote branches and their commits with ancestery
+  - `gbs` lists branches and their commits with ancestry graphs.
+  - `gbS` lists local and remote branches and their commits with ancestry
     graphs.
   - `gbx` deletes a branch.
   - `gbX` deletes a branch irrespective of its merged status.
@@ -53,16 +54,27 @@ Aliases
   - `gca` stages all modified and deleted files.
   - `gcm` records changes to the repository with the given message.
   - `gco` checks out a branch or paths to work tree.
-  - `gcO` checks out paths to work tree using the *HEAD* commit.
+  - `gcO` checks out hunks from the index or the tree interactively.
   - `gcf` amends the tip of the current branch using the same log message as
     *HEAD*.
+  - `gcF` amends the tip of the current branch.
   - `gcp` applies changes introduced by existing commits.
   - `gcP` applies changes introduced by existing commits without committing.
   - `gcr` reverts existing commits by reverting patches and recording new
      commits.
   - `gcR` removes the *HEAD* commit.
   - `gcs` displays various types of objects.
-  - `gcl` displays lost commits.
+  - `gcl` lists lost commits.
+
+### Conflict
+
+  - `gCl` lists unmerged files.
+  - `gCa` adds unmerged file contents to the index.
+  - `gCe` executes merge-tool on all unmerged file.
+  - `gCo` checks out our changes for unmerged paths.
+  - `gCO` checks out our changes for all unmerged paths.
+  - `gCt` checks out their changes for unmerged paths.
+  - `gCT` checks out their changes for all unmerged paths.
 
 ### Data
 
@@ -85,8 +97,8 @@ Aliases
 
   - `gg` displays lines matching a pattern.
   - `ggi` displays lines matching a pattern ignoring case.
-  - `ggl` displays files matching a pattern.
-  - `ggL` displays files are not matching a pattern.
+  - `ggl` lists files matching a pattern.
+  - `ggL` lists files that are not matching a pattern.
   - `ggv` displays lines not matching a pattern.
   - `ggw` displays lines matching a pattern at word boundary.
 
@@ -97,21 +109,11 @@ Aliases
   - `giu` adds file contents to the index (updates only known files).
   - `gid` displays changes between the index and a named commit (diff).
   - `giD` displays changes between the index and a named commit (word diff).
-  - `gir` resets current HEAD to the specified state.
-  - `giR` resets current index to the specified state.
+  - `gir` resets the current HEAD to the specified state.
+  - `giR` resets the current index interactively.
   - `gix` removes files/directories from the index (recursively).
   - `giX` removes files/directories from the index (recursively and forced).
 
-### Conflict
-
-  - `gCl` lists unmerged files.
-  - `gCa` adds unmerged file contents to the index.
-  - `gCe` executes merge-tool on all unmerged file.
-  - `gCo` checks out our changes for unmerged paths.
-  - `gCO` checks out our changes for all unmerged paths.
-  - `gCt` checks out their changes for unmerged paths.
-  - `gCT` checks out their changes for all unmerged paths.
-
 ### Log
 
   - `gl` displays the log.
@@ -153,12 +155,12 @@ Aliases
 ### Remote
 
   - `gR` manages tracked repositories.
-  - `gRl` displays remote names and URLs.
+  - `gRl` lists remote names and their URLs.
   - `gRa` adds a new remote.
   - `gRx` removes a remote.
   - `gRm` renames a remote.
   - `gRu` fetches remotes updates.
-  - `gRc` deletes all stale remote tracking branches.
+  - `gRp` prunes all stale remote tracking branches.
   - `gRs` displays information about a given remote.
   - `gRb` opens a remote on [GitHub][3] in the default browser.
 
@@ -168,10 +170,9 @@ Aliases
   - `gsa` applies the changes recorded in a stash to the working directory.
   - `gsx` drops a stashed state.
   - `gsX` drops all the stashed states.
-  - `gsd` lists dropped stashed states.
   - `gsl` lists stashed states.
-  - `gsL` displays the changes recorded in the stash as a diff between the
-    stashed state and its original parent.
+  - `gsL` lists dropped stashed states.
+  - `gsd` displays changes between the stash and its original parent.
   - `gsp` removes and applies a single stashed state from the stash list.
   - `gsr` recovers a given stashed state.
   - `gss` stashes the changes of the dirty working directory, including untracked.
@@ -246,25 +247,47 @@ setting a style is as follows.
 
     zstyle ':prezto:module:git:info:context:subcontext' format 'string'
 
+### Main Contexts
+
 | Name      | Format Code | Description
 | --------- | :---------: | ---------------------------------------------------
 | action    |     %s      | Special action name
-| added     |     %a      | Added files count
 | ahead     |     %A      | Commits ahead of remote count
 | behind    |     %B      | Commits behind of remote count
 | branch    |     %b      | Branch name
 | commit    |     %c      | Commit hash
+| position  |     %p      | Commits from the nearest tag count
+| remote    |     %R      | Remote name
+| stashed   |     %S      | Stashed states count
+
+### Concise Contexts
+
+| Name      | Format Code | Description
+| --------- | :---------: | ---------------------------------------------------
+| clean     |     %C      | Clean state
+| dirty     |     %D      | Dirty files count
+| indexed   |     %i      | Indexed files count
+| unindexed |     %I      | Unindexed files count
+| untracked |     %u      | Untracked files count
+
+The following contexts must be enabled with the following zstyle:
+
+    zstyle ':prezto:module:git:info' verbose 'yes'
+
+### Verbose Contexts
+
+| Name      | Format Code | Description
+| --------- | :---------: | ---------------------------------------------------
+| added     |     %a      | Added files count
 | clean     |     %C      | Clean state
 | deleted   |     %d      | Deleted files count
 | dirty     |     %D      | Dirty files count
 | modified  |     %m      | Modified files count
-| position  |     %p      | Commits from the nearest tag count
-| remote    |     %R      | Remote name
 | renamed   |     %r      | Renamed files count
-| stashed   |     %S      | Stashed states count
 | unmerged  |     %U      | Unmerged files count
 | untracked |     %u      | Untracked files count
-[**Main Contexts**]
+
+### Special Action Contexts
 
 | Name                 |   Format    | Description
 | -------------------- | :---------: | -----------------------------------------
@@ -276,7 +299,6 @@ setting a style is as follows.
 | rebase               |    value    | Rebasing
 | rebase-interactive   |    value    | Rebasing interactively
 | rebase-merge         |    value    | Rebasing merge
-[**Special Action Contexts**]
 
 First, format the repository state attributes. For example, to format the branch
 and remote names, define the following styles.
@@ -290,7 +312,7 @@ Second, format how the above attributes are displayed in prompts.
       'prompt'  ' git(%b)' \
       'rprompt' '[%R]'
 
-Last, add `$git_info[prompt]` to `$PROMPT` and `$git_info[prompt]` to
+Last, add `$git_info[prompt]` to `$PROMPT` and `$git_info[rprompt]` to
 `$RPROMPT` respectively and call `git-info` in the `prompt_name_preexec` hook
 function.
 

documentation/markdown/prezto-gnu-utility.md

@@ -7,8 +7,8 @@ Installing GNU utilities on non-GNU systems in `$PATH` without a prefix, i.e.
 `ls` instead of `gls`, is not recommended since scripts that target other
 utilities will be broken.
 
-However, for interactive use, prefixed commands can be wrapped in their
-non-prefixed counterparts.
+This module wraps GNU utilities in functions without a prefix for interactive
+use.
 
 This module must be loaded **before** the *utility* module.
 

documentation/markdown/prezto-gpg.md

@@ -0,0 +1,27 @@
+GPG
+===
+
+Provides for an easier use of [GPG][1] by setting up [gpg-agent][2].
+
+### SSH
+
+To enable OpenSSH Agent protocol emulation, and make `gpg-agent` a drop-in
+replacement for `ssh-agent`, add the following line to
+*~/.gnupg/gpg-agent.conf*:
+
+    enable-ssh-support
+
+When OpenSSH Agent protocol emulation is enabled, this module will load the SSH
+module for additional processing.
+
+Authors
+-------
+
+*The authors of this module should be contacted via the [issue tracker][3].*
+
+  - [Sorin Ionescu](https://github.com/sorin-ionescu)
+
+[1]: http://www.gnupg.org
+[2]: http://linux.die.net/man/1/gpg-agent
+[3]: https://github.com/sorin-ionescu/prezto/issues
+

documentation/markdown/prezto-helper.md

@@ -13,7 +13,6 @@ Functions
   - `is-callable` checks if a name is a command, function, or alias.
   - `is-true` checks a boolean variable for "true".
   - `coalesce` prints the first non-empty string in the arguments array.
-  - `zstyle-` defines a style if it is already not defined.
 
 Authors
 -------

documentation/markdown/prezto-history-substring-search.md

@@ -36,6 +36,18 @@ To enable highlighting for this module only, add the following line to
 
     zstyle ':prezto:module:history-substring-search' color 'yes'
 
+To set the query found color, add the following line to *zpreztorc*:
+
+    zstyle ':prezto:module:history-substring-search:color' found ''
+
+To set the query not found color, add the following line to *zpreztorc*:
+
+    zstyle ':prezto:module:history-substring-search:color' not-found ''
+
+To set the search globbing flags, add the following line to *zpreztorc*:
+
+    zstyle ':prezto:module:history-substring-search' globbing-flags ''
+
 Authors
 -------
 

documentation/markdown/prezto-homebrew.md

@@ -0,0 +1,26 @@
+Homebrew
+========
+
+Defines Homebrew aliases.
+
+Aliases
+-------
+
+  - `brewc` cleans outdated brews and their cached archives.
+  - `brewC` cleans outdated brews, including keg-only, and their cached archives.
+  - `brewi` installs a formula.
+  - `brewl` lists installed formulae.
+  - `brews` searches for a formula.
+  - `brewU` upgrades Homebrew and outdated brews.
+  - `brewu` upgrades Homebrew.
+  - `brewx` uninstalls a formula.
+
+Authors
+-------
+
+*The authors of this module should be contacted via the [issue tracker][1].*
+
+  - [Sorin Ionescu](https://github.com/sorin-ionescu)
+
+[1]: https://github.com/sorin-ionescu/prezto/issues
+

documentation/markdown/prezto-modules.md

@@ -8,7 +8,7 @@ Load modules in *zpreztorc*. The order matters.
 Archive
 -------
 
-Provides functions to extract and list popular archive formats.
+Provides functions to list and extract archives.
 
 Command-Not-Found
 -----------------
@@ -31,20 +31,41 @@ Dpkg
 
 Defines dpkg aliases and functions.
 
+Editor
+------
+
+Sets key bindings.
+
+Emacs
+-----
+
+Enables Emacs dependency management.
+
 Environment
 -----------
 
 Sets general shell options and defines environment variables.
 
+Fasd
+----
+
+Maintains a frequently used file and directory list for fast access.
+
+Git
+---
+
+Enhances the Git distributed version control system by providing aliases,
+functions and by exposing repository status information to prompts.
+
 GNU Utility
 -----------
 
 Provides for the interactive use of GNU utilities on non-GNU systems.
 
-GPG-Agent
----------
+GPG
+---
 
-Provides for an easier use of gpg-agent.
+Provides for an easier use of GPG by setting up gpg-agent.
 
 Haskell
 -------
@@ -56,15 +77,20 @@ Helper
 
 Provides helper functions for developing modules.
 
+History
+-------
+
+Sets history options and defines history aliases.
+
 History Substring Search
 ------------------------
 
 Integrates zsh-history-substring-search into Prezto.
 
-History
--------
+Homebrew
+--------
 
-Sets history options and defines history aliases.
+Defines Homebrew aliases.
 
 Macports
 --------
@@ -76,6 +102,11 @@ Node.js
 
 Provides utility functions for Node.js and loads npm completion.
 
+Ocaml
+-----
+
+Initializes Ocaml package management.
+
 OSX
 ---
 
@@ -127,10 +158,10 @@ Spectrum
 
 Provides for easier use of 256 colors and effects.
 
-SSH-Agent
----------
+SSH
+---
 
-Provides for an easier use of ssh-agent.
+Provides for an easier use of SSH by setting up ssh-agent.
 
 Syntax Highlighting
 -------------------
@@ -162,9 +193,3 @@ Yum
 
 Defines yum aliases.
 
-Z
--
-
-Integrates z into Prezto, which maintains a frequently used directory list for
-fast directory changes.
-

documentation/markdown/prezto-node.md

@@ -0,0 +1,46 @@
+Node.js
+=======
+
+Provides utility functions for [Node.js][1], loads the Node Version Manager, and
+enables [npm][2] completion.
+
+nvm
+---
+
+[nvm][5] allows for managing multiple, isolated Node.js installations in the
+home directory.
+
+Functions
+---------
+
+  - `node-doc` opens the Node.js online [API documentation][3] in the default
+    browser.
+  - `node-info` exposes information about the Node.js environment via the
+    `$node_info` associative array.
+
+Theming
+-------
+
+To display the version number of the current Node.js version, define the
+following style inside the `prompt_name_setup` function.
+
+    # %v - Node.js version.
+    zstyle ':prezto:module:node:info:version' format 'version:%v'
+
+Then add `$node_info[version]` to either `$PROMPT` or `$RPROMPT` and call
+`node-info` in `prompt_name_preexec` hook function.
+
+Authors
+-------
+
+*The authors of this module should be contacted via the [issue tracker][4].*
+
+  - [Sorin Ionescu](https://github.com/sorin-ionescu)
+  - [Zeh Rizzatti](https://github.com/zehrizzatti)
+
+[1]: http://nodejs.org
+[2]: http://npmjs.org
+[3]: http://nodejs.org/api
+[4]: https://github.com/sorin-ionescu/prezto/issues
+[5]: https://github.com/creationix/nvm
+

documentation/markdown/prezto-osx.md

@@ -20,7 +20,6 @@ Functions
   - `pfd` prints the current _Finder_ directory.
   - `pfs` prints the current _Finder_ selection.
   - `tab` creates a new tab (works in both _Terminal_ and [_iTerm_][3]).
-  - `trash` moves files and folders to _Trash_.
 
 Authors
 -------

documentation/markdown/prezto-prompt.md

@@ -34,7 +34,7 @@ including a function that displays help or a function used to preview it.
 
 **Do not call this function directly.**
 
-The most basic example of this function can be seen bellow.
+The most basic example of this function can be seen below.
 
     function prompt_name_setup {
       PROMPT='%m%# '

documentation/markdown/prezto-python.md

@@ -6,15 +6,15 @@ Enables local Python and local Python package installation.
 Local Python Installation
 -------------------------
 
-[pythonz][4] builds and installs multiple Python versions locally in the home
+[pyenv][4] builds and installs multiple Python versions locally in the home
 directory.
 
-This module prepends the pythonz directory to the path variable to enable the
-execution of `pythonz`.
+This module prepends the pyenv directory to the path variable to enable the
+execution of `pyenv`.
 
 ### Usage
 
-Install Python versions with `pythonz install` into *~/.pythonz/pythons*.
+Install Python versions with `pyenv install` into *~/.pyenv/versions*.
 
 Local Package Installation
 --------------------------
@@ -66,16 +66,6 @@ Aliases
 
   - `py` is short for `python`.
 
-### Pythonz
-
-  - `pyz` is short for `pythonz`.
-  - `pyzc` removes stale source folders and archives.
-  - `pyzi` installs Python versions.
-  - `pyzl` lists installed Python versions.
-  - `pyzL` lists available Python versions.
-  - `pyzu` updates itself to the latest version.
-  - `pyzx` uninstalls Python versions.
-
 Functions
 ---------
 
@@ -105,6 +95,6 @@ Authors
 [1]: http://www.python.org/dev/peps/pep-0370/
 [2]: http://www.doughellmann.com/projects/virtualenvwrapper/
 [3]: http://pypi.python.org/pypi/virtualenv
-[4]: http://saghul.github.com/pythonz/
+[4]: https://github.com/yyuu/pyenv
 [5]: https://github.com/sorin-ionescu/prezto/issues
 

documentation/markdown/prezto-rsync.md

@@ -23,6 +23,6 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: http://rsync.samba.org
-[2]: http://www.bombich.com/rsync.html
+[2]: http://help.bombich.com/kb/overview/credits#opensource
 [3]: https://github.com/sorin-ionescu/prezto/issues
 

documentation/markdown/prezto-ruby.md

@@ -59,6 +59,7 @@ Aliases
 Functions
 ---------
 
+  - `ruby-app-root` displays the path to the Ruby application root directory.
   - `ruby-info` exposes information about the Ruby environment via the
     `$ruby_info` associative array.
 

documentation/markdown/prezto-runcoms.md

@@ -38,7 +38,7 @@ small as possible and should only define environment variables.
 ### zprofile
 
 This file is similar to zlogin, but it is sourced before zshrc. It was added
-for [KornShell][1] fans. See the description of zlogin bellow for what it may
+for [KornShell][1] fans. See the description of zlogin below for what it may
 contain.
 
 zprofile and zlogin are not meant to be used concurrently but can be done so.
@@ -48,7 +48,7 @@ zprofile and zlogin are not meant to be used concurrently but can be done so.
 This file is sourced by interactive shells. It should define aliases,
 functions, shell options, and key bindings.
 
-## zpreztorc
+### zpreztorc
 
 This file configures Prezto.
 

documentation/markdown/prezto-screen.md

@@ -10,9 +10,15 @@ Settings
 
 Starts a GNU Screen session automatically when Zsh is launched.
 
-To enable this feature, add the following line to *zpreztorc*:
+To enable this feature when launching Zsh in a local terminal, add the
+following line to *zpreztorc*:
 
-    zstyle ':prezto:module:screen' auto-start 'yes'
+    zstyle ':prezto:module:screen:auto-start' local 'yes'
+
+To enable this feature when launching Zsh in a SSH connection, add the
+following line to *zpreztorc*:
+
+    zstyle ':prezto:module:screen:auto-start' remote 'yes'
 
 Aliases
 -------
@@ -28,6 +34,7 @@ Authors
 *The authors of this module should be contacted via the [issue tracker][2].*
 
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
+  - [Georges Discry](https://github.com/gdiscry)
 
 [1]: http://www.gnu.org/software/screen/
 [2]: https://github.com/sorin-ionescu/prezto/issues

documentation/markdown/prezto-ssh.md

@@ -0,0 +1,28 @@
+SSH
+===
+
+Provides for an easier use of [SSH][1] by setting up [ssh-agent][2].
+
+This module is disabled on Mac OS X due to custom Apple SSH support rendering it
+unnecessary.
+
+Settings
+--------
+
+### Identities
+
+To load multiple identities, add the following line to *zpreztorc*:
+
+    zstyle ':prezto:module:ssh:load' identities 'id_rsa' 'id_dsa' 'id_github'
+
+Authors
+-------
+
+*The authors of this module should be contacted via the [issue tracker][3].*
+
+  - [Sorin Ionescu](https://github.com/sorin-ionescu)
+
+[1]: http://www.openssh.com
+[2]: http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-agent&sektion=1
+[3]: https://github.com/sorin-ionescu/prezto/issues
+

documentation/markdown/prezto-syntax-highlighting.md

@@ -38,6 +38,18 @@ To enable all highlighters, add the following to *zpreztorc*:
       'cursor' \
       'root'
 
+### Highlighting Styles
+
+Each syntax highlighter defines styles used to highlight tokens.
+
+To highlight, for example, builtins, commands, and functions in blue instead of
+green, add the following to *zpreztorc*:
+
+    zstyle ':prezto:module:syntax-highlighting' styles \
+      'builtin' 'bg=blue' \
+      'command' 'bg=blue' \
+      'function' 'bg=blue'
+
 Authors
 -------
 

documentation/markdown/prezto-terminal.md

@@ -0,0 +1,45 @@
+Terminal
+========
+
+Sets terminal window and tab titles.
+
+Settings
+--------
+
+### Auto-Title
+
+To auto set the terminal window and tab titles with the current command or
+directory, add the following to *zpreztorc*:
+
+    zstyle ':prezto:module:terminal' auto-title 'yes'
+
+Auto titling is disabled inside terminal multiplexers, except inside dvtm, since
+it interferes with window names defined in configuration files and profile
+managers.
+
+To format terminal window and tab titles, add the following to *zpreztorc*:
+
+    zstyle ':prezto:module:terminal:window-title' format '%n@%m: %s'
+    zstyle ':prezto:module:terminal:tab-title' format '%m: %s'
+
+`%s` will be replaced with the current working directory path or the currently
+executing program name.
+
+For a list of sequences, see [Expansion of Prompt Sequences][1].
+
+Functions
+---------
+
+- `set-tab-title` sets the terminal tab title.
+- `set-window-title` sets the terminal or terminal multiplexer window title.
+
+Authors
+-------
+
+*The authors of this module should be contacted via the [issue tracker][2].*
+
+  - [Sorin Ionescu](https://github.com/sorin-ionescu)
+
+[1]: http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Expansion-of-Prompt-Sequences
+[2]: https://github.com/sorin-ionescu/prezto/issues
+

documentation/markdown/prezto-tmux.md

@@ -10,12 +10,18 @@ Settings
 
 Starts a tmux session automatically when Zsh is launched.
 
-To enable this feature, add the following line to *zpreztorc*:
+To enable this feature when launching Zsh in a local terminal, add the
+following line to *zpreztorc*:
 
-    zstyle ':prezto:module:tmux' auto-start 'yes'
+    zstyle ':prezto:module:tmux:auto-start' local 'yes'
 
-It will create a background session named _#Prezto_ and attach every new shell
-to it.
+To enable this feature when launching Zsh in a SSH connection, add the
+following line to *zpreztorc*:
+
+    zstyle ':prezto:module:tmux:auto-start' remote 'yes'
+
+In both cases, it will create a background session named _#Prezto_ and attach
+every new shell to it.
 
 To avoid keeping open sessions, this module sets `destroy-unattached off` on
 the background session and `destroy-unattached on` on every other session
@@ -47,6 +53,7 @@ Authors
 
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
   - [Colin Hebert](https://github.com/ColinHebert)
+  - [Georges Discry](https://github.com/gdiscry)
 
 [1]: http://tmux.sourceforge.net
 [2]: https://github.com/sorin-ionescu/prezto/issues/62

documentation/markdown/prezto.md

@@ -0,0 +1,151 @@
+Prezto — Instantly Awesome Zsh
+==============================
+
+Prezto is the configuration framework for [Zsh][1]; it enriches the command line
+interface environment with sane defaults, aliases, functions, auto completion,
+and prompt themes.
+
+Installation
+------------
+
+Prezto will work with any recent release of Zsh, but the minimum recommended
+version is 4.3.10.
+
+  1. Launch Zsh:
+
+        zsh
+
+  2. Clone the repository:
+
+        git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
+
+  3. Create a new Zsh configuration by copying the Zsh configuration files
+     provided:
+
+        setopt EXTENDED_GLOB
+        for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do
+          ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}"
+        done
+
+  4. Set Zsh as your default shell:
+
+        chsh -s /bin/zsh
+
+  5. Open a new Zsh terminal window or tab.
+
+### Troubleshooting
+
+If you are not able to find certain commands after switching to *Prezto*,
+modify the `PATH` variable in *~/.zshenv* then open a new Zsh terminal
+window or tab.
+
+Usage
+-----
+
+Prezto has many features disabled by default. Read the source code and
+accompanying README files to learn of what is available.
+
+### Modules
+
+  1. Browse */modules* to see what is available.
+  2. Load the modules you need in *~/.zpreztorc* then open a new Zsh terminal
+     window or tab.
+
+### Themes
+
+  1. For a list of themes, type `prompt -l`.
+  2. To preview a theme, type `prompt -p name`.
+  3. Load the theme you like in *~/.zpreztorc* then open a new Zsh terminal
+     window or tab.
+
+     ![sorin theme][2]
+
+Customization
+-------------
+
+The project is managed via [Git][3]. It is highly recommended that you fork this
+project; so, that you can commit your changes and push them to [GitHub][4] to
+not lose them. If you do not know how to use Git, follow this [tutorial][5] and
+bookmark this [reference][6].
+
+Resources
+---------
+
+The [Zsh Reference Card][7] and the [zsh-lovers][8] man page are indispensable.
+
+Contribute
+----------
+
+This project would not exist without all of its users and [contributors][9].
+
+If you have ideas on how to make the configuration easier to maintain or
+improve its performance, do not hesitate to fork and send pull requests.
+
+### Issue Reporting
+
+   - Check that the issue has not already been reported.
+   - Check that the issue has not already been fixed in the latest code.
+   - Open an issue with a clear title and description in grammatically correct,
+     complete sentences.
+
+### Pull Request
+
+   - Read [how to properly contribute to open source projects on GitHub][10].
+   - Use a topic branch to easily amend a pull request later, if necessary.
+   - Write [good commit messages][11].
+   - Squash commits on the topic branch before opening a pull request.
+   - Use the same coding style and spacing.
+   - Open a [pull request][12] that relates to but one subject with a clear
+     title and description in grammatically correct, complete sentences.
+
+#### Modules
+
+   - Markdown and man page documentation must be present.
+   - Large functions must be placed in a *functions* directory.
+   - Functions that take arguments must have completion.
+
+#### Themes
+
+   - A screenshots section must be present in the file header.
+   - The pull request description must have [embedded
+     screenshots][13].
+
+License
+-------
+
+(The MIT License)
+
+Copyright (c) 2009-2012 Robby Russell, 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
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+[1]: http://www.zsh.org
+[2]: http://i.imgur.com/nBEEZ.png "sorin theme"
+[3]: http://git-scm.com
+[4]: https://github.com
+[5]: http://gitimmersion.com
+[6]: http://gitref.org
+[7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf
+[8]: http://grml.org/zsh/zsh-lovers.html
+[9]: https://github.com/sorin-ionescu/prezto/contributors
+[10]: http://gun.io/blog/how-to-github-fork-branch-and-pull-request
+[11]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+[12]: https://help.github.com/articles/using-pull-requests
+[13]: http://daringfireball.net/projects/markdown/syntax#img
+

init.zsh

@@ -10,7 +10,7 @@
 #
 
 # Check for the minimum supported version.
-min_zsh_version='4.3.10'
+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

modules/archive/functions/_lsarchive

@@ -1,8 +1,8 @@
-#compdef ls-archive
+#compdef lsarchive
 #autoload
 
 #
-# Completes ls-archive.
+# Completes lsarchive.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>

modules/archive/functions/_unarchive

@@ -1,8 +1,8 @@
-#compdef extract
+#compdef unarchive
 #autoload
 
 #
-# Completes extract.
+# Completes unarchive.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>

modules/archive/functions/lsarchive

@@ -1,5 +1,5 @@
 #
-# Lists the contents of popular archive formats.
+# Lists the contents of archives.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
@@ -41,7 +41,9 @@ while (( $# > 0 )); do
       || lzcat "$1" | tar x${verbose:+v}f - ;;
     (*.tar) tar t${verbose:+v}f "$1" ;;
     (*.zip) unzip -l${verbose:+v} "$1" ;;
-    (*.rar) unrar ${${verbose:+v}:-l} "$1" ;;
+    (*.rar) unrar &> /dev/null \
+      && unrar ${${verbose:+v}:-l} "$1" \
+      || rar ${${verbose:+v}:-l} "$1" ;;
     (*.7z) 7za l "$1" ;;
     (*)
 			print "$0: cannot list: $1" >&2

modules/archive/functions/unarchive

@@ -1,5 +1,5 @@
 #
-# Extracts the contents of popular archive formats.
+# Extracts the contents of archives.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
@@ -53,7 +53,9 @@ while (( $# > 0 )); do
     (*.lzma) unlzma "$1" ;;
     (*.Z) uncompress "$1" ;;
     (*.zip) unzip "$1" -d $extract_dir ;;
-    (*.rar) unrar e -ad "$1" ;;
+    (*.rar) unrar &> /dev/null \
+      && unrar e -ad "$1" \
+      || rar e -ad "$1" ;;
     (*.7z) 7za x "$1" ;;
     (*.deb)
       mkdir -p "$extract_dir/control"

modules/command-not-found/init.zsh

@@ -5,10 +5,14 @@
 #   Joseph Jon Booker <joe@neoturbine.net>
 #
 
+# Load command-not-found on Debian-based distributions.
+if [[ -s '/etc/zsh_command_not_found' ]]; then
+  source '/etc/zsh_command_not_found'
+# Load command-not-found on Arch Linux-based distributions.
+elif [[ -s '/usr/share/doc/pkgfile/command-not-found.zsh' ]]; then
+  source '/usr/share/doc/pkgfile/command-not-found.zsh'
 # Return if requirements are not found.
-if [[ ! -s '/etc/zsh_command_not_found' ]]; then
+else
   return 1
 fi
 
-source '/etc/zsh_command_not_found'
-

modules/completion/init.zsh

@@ -30,9 +30,6 @@ setopt AUTO_PARAM_SLASH    # If completed parameter is a directory, add a traili
 unsetopt MENU_COMPLETE     # Do not autoselect the first completion entry.
 unsetopt FLOW_CONTROL      # Disable start/stop characters in shell editor.
 
-# Treat these characters as part of a word.
-WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
-
 #
 # Styles
 #
@@ -96,7 +93,7 @@ zstyle ':completion::*:(-command-|export):*' fake-parameters ${${${_comps[(I)-va
 
 # Populate hostname completion.
 zstyle -e ':completion:*:hosts' hosts 'reply=(
-  ${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) 2>/dev/null)"}%%[#| ]*}//,/ }
+  ${=${=${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) 2>/dev/null)"}%%[#| ]*}//\]:[0-9]*/ }//,/ }//\[/ }
   ${=${(f)"$(cat /etc/hosts(|)(N) <<(ypcat hosts 2>/dev/null))"}%%\#*}
   ${=${${${${(@M)${(f)"$(cat ~/.ssh/config 2>/dev/null)"}:#Host *}#Host }:#*\**}:#*\?*}}
 )'
@@ -144,8 +141,8 @@ fi
 # SSH/SCP/RSYNC
 zstyle ':completion:*:(scp|rsync):*' tag-order 'hosts:-host:host hosts:-domain:domain hosts:-ipaddr:ip\ address *'
 zstyle ':completion:*:(scp|rsync):*' group-order users files all-files hosts-domain hosts-host hosts-ipaddr
-zstyle ':completion:*:ssh:*' tag-order users 'hosts:-host:host hosts:-domain:domain hosts:-ipaddr:ip\ address *'
-zstyle ':completion:*:ssh:*' group-order hosts-domain hosts-host users hosts-ipaddr
+zstyle ':completion:*:ssh:*' tag-order 'hosts:-host:host hosts:-domain:domain hosts:-ipaddr:ip\ address *'
+zstyle ':completion:*:ssh:*' group-order users hosts-domain hosts-host users hosts-ipaddr
 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/dpkg/init.zsh

@@ -19,7 +19,7 @@ fi
 # Cleans the cache.
 alias debc='sudo apt-get clean && sudo apt-get autoclean'
 
-# Displays a file's packake.
+# Displays a file's package.
 alias debf='apt-file search --regexp'
 
 # Installs packages from repositories.
@@ -31,7 +31,7 @@ alias debI='sudo dpkg -i'
 # Displays package information.
 alias debq='apt-cache show'
 
-# Updates the packages lists.
+# Updates the package lists.
 alias debu='sudo apt-get update'
 
 # Upgrades outdated packages.
@@ -50,7 +50,7 @@ else
   alias debs='apt-cache search'
 fi
 
-# Creates a basic .deb package.
+# Creates a basic deb package.
 alias deb-build='time dpkg-buildpackage -rfakeroot -us -uc'
 
 # Removes all kernel images and headers, except for the ones in use.

modules/editor/init.zsh

@@ -4,42 +4,6 @@
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
-# Usage:
-#   To enable key bindings, add the following to zpreztorc, and replace 'map'
-#   with 'emacs' or 'vi.
-#
-#     zstyle ':prezto:module:editor' keymap 'map'
-#
-#   To enable the auto conversion of .... to ../.., add the following to
-#   zpreztorc.
-#
-#     zstyle ':prezto:module:editor' dot-expansion 'yes'
-#
-#   To indicate when the editor is in the primary keymap (emacs or viins), add
-#   the following to your theme prompt setup function.
-#
-#     zstyle ':prezto:module:editor:info:keymap:primary' format '>>>'
-#
-#   To indicate when the editor is in the primary keymap (emacs or viins) insert
-#   mode, add the following to your theme prompt setup function.
-#
-#     zstyle ':prezto:module:editor:info:keymap:primary:insert' format 'I'
-#
-#   To indicate when the editor is in the primary keymap (emacs or viins)
-#   overwrite mode, add the following to your theme prompt setup function.
-#
-#     zstyle ':prezto:module:editor:info:keymap:primary:overwrite' format 'O'
-#
-#   To indicate when the editor is in the alternate keymap (vicmd), add the
-#   following to your theme prompt setup function.
-#
-#     zstyle ':prezto:module:editor:info:keymap:alternate' format '<<<'
-#
-#   To indicate when the editor is completing, add the following to your theme
-#   prompt setup function.
-#
-#     zstyle ':prezto:module:editor:info:completing' format '...'
-#
 
 # Return if requirements are not found.
 if [[ "$TERM" == 'dumb' ]]; then
@@ -57,6 +21,9 @@ setopt BEEP
 # Variables
 #
 
+# Treat these characters as part of a word.
+WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
+
 # Use human-friendly identifiers.
 zmodload zsh/terminfo
 typeset -gA key_info
@@ -90,12 +57,11 @@ key_info=(
   'BackTab'   "$terminfo[kcbt]"
 )
 
-# Do not bind any keys if there are empty values in $key_info.
+# 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
-    print "prezto: one or more keys are non-bindable" >&2
-    unset key{,_info}
-    return 1
+    key_info["$key"]='<27>'
   fi
 done
 
@@ -141,8 +107,25 @@ 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
+# 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
@@ -253,10 +236,6 @@ bindkey -M vicmd "v" edit-command-line
 bindkey -M vicmd "u" undo
 bindkey -M vicmd "$key_info[Control]R" redo
 
-# Switch to command mode.
-bindkey -M viins "jk" vi-cmd-mode
-bindkey -M viins "kj" vi-cmd-mode
-
 if (( $+widgets[history-incremental-pattern-search-backward] )); then
   bindkey -M vicmd "?" history-incremental-pattern-search-backward
   bindkey -M vicmd "/" history-incremental-pattern-search-forward
@@ -327,14 +306,14 @@ fi
 #
 
 # Set the key layout.
-zstyle -s ':prezto:module:editor' keymap 'keymap'
-if [[ "$keymap" == (emacs|) ]]; then
+zstyle -s ':prezto:module:editor' key-bindings 'key_bindings'
+if [[ "$key_bindings" == (emacs|) ]]; then
   bindkey -e
-elif [[ "$keymap" == vi ]]; then
+elif [[ "$key_bindings" == vi ]]; then
   bindkey -v
 else
-  print "prezto: invalid keymap: $keymap" >&2
+  print "prezto: editor: invalid key bindings: $key_bindings" >&2
 fi
 
-unset key{map,}
+unset key{,map,bindings}
 

modules/emacs/init.zsh

@@ -0,0 +1,25 @@
+#
+# Configures Emacs dependency management.
+#
+# Authors: Sebastian Wiesner <lunaryorn@gmail.com>
+#
+
+# Return if requirements are not found.
+if [[ ! -d "$HOME/.cask" ]]; then
+  return 1
+fi
+
+# Prepend Cask bin directory.
+path=($HOME/.cask/bin $path)
+
+# Load Carton completion
+source "$HOME/.cask/etc/cask_completion.zsh" 2> /dev/null
+
+#
+# Aliases
+#
+
+alias cai='cask install'
+alias cau='cask update'
+alias caI='cask init'
+alias cae='cask exec'

modules/environment/init.zsh

@@ -17,6 +17,8 @@ zle -N self-insert url-quote-magic
 #
 
 setopt BRACE_CCL          # Allow brace character class list expansion.
+setopt COMBINING_CHARS    # Combine zero-length punctuation characters (accents)
+                          # with the base character.
 setopt RC_QUOTES          # Allow 'Henry''s Garage' instead of 'Henry'\''s Garage'.
 unsetopt MAIL_WARNING     # Don't print a warning message if a mail file has been accessed.
 
@@ -54,3 +56,13 @@ if zstyle -t ':prezto:environment:termcap' color; then
   export LESS_TERMCAP_us=$'\E[01;32m'      # Begins underline.
 fi
 
+#
+# Paths
+#
+
+# Set the list of directories that man searches for manuals.
+manpath=(
+  ${ZDOTDIR:-$HOME}/.zprezto/documentation/man
+  $manpath
+)
+

modules/git/alias.zsh

@@ -42,12 +42,13 @@ alias gbs='git show-branch'
 alias gbS='git show-branch -a'
 
 # Commit (c)
-alias gc='git commit'
-alias gca='git commit --all'
+alias gc='git commit --verbose'
+alias gca='git commit --verbose --all'
 alias gcm='git commit --message'
 alias gco='git checkout'
-alias gcO='git checkout HEAD --'
+alias gcO='git checkout --patch'
 alias gcf='git commit --amend --reuse-message HEAD'
+alias gcF='git commit --verbose --amend'
 alias gcp='git cherry-pick --ff'
 alias gcP='git cherry-pick --no-commit'
 alias gcr='git revert'
@@ -55,6 +56,15 @@ alias gcR='git reset "HEAD^"'
 alias gcs='git show'
 alias gcl='git-commit-lost'
 
+# Conflict (C)
+alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
+alias gCa='git add $(gCl)'
+alias gCe='git mergetool $(gCl)'
+alias gCo='git checkout --ours --'
+alias gCO='gCo $(gCl)'
+alias gCt='git checkout --theirs --'
+alias gCT='gCt $(gCl)'
+
 # Data (d)
 alias gd='git ls-files'
 alias gdc='git ls-files --cached'
@@ -85,19 +95,10 @@ alias giu='git add --update'
 alias gid='git diff --no-ext-diff --cached'
 alias giD='git diff --no-ext-diff --cached --word-diff'
 alias gir='git reset'
-alias giR='git reset --keep'
+alias giR='git reset --patch'
 alias gix='git rm -r --cached'
 alias giX='git rm -rf --cached'
 
-# Conflict (C)
-alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
-alias gCa='git add $(gCl)'
-alias gCe='git mergetool $(gCl)'
-alias gCo='git checkout --ours --'
-alias gCO='gCo $(gCl)'
-alias gCt='git checkout --theirs --'
-alias gCT='gCt $(gCl)'
-
 # Log (l)
 alias gl='git log --topo-order --pretty=format:${_git_log_medium_format}'
 alias gls='git log --topo-order --stat --pretty=format:${_git_log_medium_format}'
@@ -137,7 +138,7 @@ alias gRa='git remote add'
 alias gRx='git remote rm'
 alias gRm='git remote rename'
 alias gRu='git remote update'
-alias gRc='git remote prune'
+alias gRp='git remote prune'
 alias gRs='git remote show'
 alias gRb='git-hub-browse'
 
@@ -146,9 +147,9 @@ alias gs='git stash'
 alias gsa='git stash apply'
 alias gsx='git stash drop'
 alias gsX='git-stash-clear-interactive'
-alias gsd='git-stash-dropped'
 alias gsl='git stash list'
-alias gsL='git stash show --patch --stat'
+alias gsL='git-stash-dropped'
+alias gsd='git stash show --patch --stat'
 alias gsp='git stash pop'
 alias gsr='git-stash-recover'
 alias gss='git stash save --include-untracked'

modules/git/functions/git-info

@@ -89,31 +89,6 @@ function _git-action {
   return 1
 }
 
-# Turns off git-info for the current repository.
-function _git-info-abort {
-  if ! is-true "$_git_info_executing"; then
-    return 1
-  fi
-
-  cat >&2 <<EOF
-
-
-Gathering status for certain repositories is time intensive.
-By pressing CTRL + C, you have turned off prompt Git status
-for this repository.
-
-To revert, execute:
-  git-info on
-
-EOF
-
-  unset _git_info_executing
-  git config --bool prompt.showinfo false
-  git-info
-  return 0
-}
-add-zsh-trap INT _git-info-abort
-
 # Gets the Git status information.
 function git-info {
   # Extended globbing is needed to parse repository status.
@@ -126,13 +101,13 @@ function git-info {
   local added=0
   local added_format
   local added_formatted
-  local ahead
+  local ahead=0
   local ahead_and_behind
   local ahead_and_behind_cmd
   local ahead_format
   local ahead_formatted
   local ahead_or_behind
-  local behind
+  local behind=0
   local behind_format
   local behind_formatted
   local branch
@@ -151,9 +126,11 @@ function git-info {
   local dirty_format
   local dirty_formatted
   local ignore_submodules
+  local indexed=0
+  local indexed_format
+  local indexed_formatted
   local -A info_formats
   local info_format
-  local line_number=0
   local modified=0
   local modified_format
   local modified_formatted
@@ -171,6 +148,10 @@ function git-info {
   local stashed_format
   local stashed_formatted
   local status_cmd
+  local status_mode
+  local unindexed=0
+  local unindexed_format
+  local unindexed_formatted
   local unmerged=0
   local unmerged_format
   local unmerged_formatted
@@ -203,135 +184,206 @@ function git-info {
     return 1
   fi
 
-  # Used to abort and turn git-info off on SIGINT.
-  _git_info_executing=true
-
-  # Use porcelain status for easy parsing.
-  status_cmd='git status --porcelain'
-
-  # Gets the remote name.
-  remote_cmd='git rev-parse --symbolic-full-name --verify HEAD@{upstream}'
-
-  # Gets the commit difference counts between local and remote.
-  ahead_and_behind_cmd='git rev-list --count --left-right HEAD...@{upstream}'
-
   # Ignore submodule status.
   zstyle -s ':prezto:module:git:status:ignore' submodules 'ignore_submodules'
-  if [[ -n "$ignore_submodules" ]]; then
-    status_cmd+=" --ignore-submodules=${ignore_submodules}"
-  fi
 
   # Format commit.
-  commit="$(git rev-parse HEAD 2> /dev/null)"
-  if [[ -n "$commit" ]]; then
-    zstyle -s ':prezto:module:git:info:commit' format 'commit_format'
-    zformat -f commit_formatted "$commit_format" "c:$commit"
+  zstyle -s ':prezto:module:git:info:commit' format 'commit_format'
+  if [[ -n "$commit_format" ]]; then
+    commit="$(git rev-parse HEAD 2> /dev/null)"
+    if [[ -n "$commit" ]]; then
+      zformat -f commit_formatted "$commit_format" "c:$commit"
+    fi
   fi
 
   # Format stashed.
-  if [[ -f "$(git-dir)/refs/stash" ]]; then
+  zstyle -s ':prezto:module:git:info:stashed' format 'stashed_format'
+  if [[ -n "$stashed_format" && -f "$(git-dir)/refs/stash" ]]; then
     stashed="$(git stash list 2> /dev/null | wc -l | awk '{print $1}')"
-    zstyle -s ':prezto:module:git:info:stashed' format 'stashed_format'
-    zformat -f stashed_formatted "$stashed_format" "S:$stashed"
+    if [[ -n "$stashed" ]]; then
+      zformat -f stashed_formatted "$stashed_format" "S:$stashed"
+    fi
   fi
 
   # Format action.
-  action="$(_git-action)"
-  if [[ -n "$action" ]]; then
-    zstyle -s ':prezto:module:git:info:action' format 'action_format'
-    zformat -f action_formatted "$action_format" "s:$action"
+  zstyle -s ':prezto:module:git:info:action' format 'action_format'
+  if [[ -n "$action_format" ]]; then
+    action="$(_git-action)"
+    if [[ -n "$action" ]]; then
+      zformat -f action_formatted "$action_format" "s:$action"
+    fi
   fi
 
-  # Get current status.
-  while IFS=$'\n' read line; do
-    # Count added, deleted, modified, renamed, unmerged, untracked, dirty.
-    # T (type change) is undocumented, see http://git.io/FnpMGw.
-    # For a table of scenarii, see http://i.imgur.com/2YLu1.png.
-    [[ "$line" == ([ACDMT][\ MT]|[ACMT]D)\ * ]] && (( added++ ))
-    [[ "$line" == [\ ACMRT]D\ * ]] && (( deleted++ ))
-    [[ "$line" == ?[MT]\ * ]] && (( modified++ ))
-    [[ "$line" == R?\ * ]] && (( renamed++ ))
-    [[ "$line" == (AA|DD|U?|?U)\ * ]] && (( unmerged++ ))
-    [[ "$line" == \?\?\ * ]] && (( untracked++ ))
-    (( dirty++ ))
-  done < <(${(z)status_cmd} 2> /dev/null)
+  # Get the branch.
+  branch="${$(git symbolic-ref HEAD 2> /dev/null)#refs/heads/}"
 
   # Format branch.
-  branch="${$(git symbolic-ref -q HEAD)##refs/heads/}"
-  if [[ -n "$branch" ]]; then
-    zstyle -s ':prezto:module:git:info:branch' format 'branch_format'
+  zstyle -s ':prezto:module:git:info:branch' format 'branch_format'
+  if [[ -n "$branch" && -n "$branch_format" ]]; then
     zformat -f branch_formatted "$branch_format" "b:$branch"
+  fi
 
-    # Format remote.
-    remote="${$(${(z)remote_cmd} 2> /dev/null)##refs/remotes/}"
-    if [[ -n "$remote" ]]; then
-      zstyle -s ':prezto:module:git:info:remote' format 'remote_format'
-      zformat -f remote_formatted "$remote_format" "R:$remote"
-
-      # Get ahead and behind counts.
-      ahead_and_behind="$(${(z)ahead_and_behind_cmd} 2> /dev/null)"
-
-      # Format ahead.
-      ahead="$ahead_and_behind[(w)1]"
-      if (( $ahead > 0 )); then
-        zstyle -s ':prezto:module:git:info:ahead' format 'ahead_format'
-        zformat -f ahead_formatted "$ahead_format" "A:$ahead"
-      fi
-
-      # Format behind.
-      behind="$ahead_and_behind[(w)2]"
-      if (( $behind > 0 )); then
-        zstyle -s ':prezto:module:git:info:behind' format 'behind_format'
-        zformat -f behind_formatted "$behind_format" "B:$behind"
-      fi
-    fi
-  else
-    # Format position.
+  # Format position.
+  zstyle -s ':prezto:module:git:info:position' format 'position_format'
+  if [[ -z "$branch" && -n "$position_format" ]]; then
     position="$(git describe --contains --all HEAD 2> /dev/null)"
     if [[ -n "$position" ]]; then
-      zstyle -s ':prezto:module:git:info:position' format 'position_format'
       zformat -f position_formatted "$position_format" "p:$position"
     fi
   fi
 
-  # Format added.
-  if (( $added > 0 )); then
-    zstyle -s ':prezto:module:git:info:added' format 'added_format'
-    zformat -f added_formatted "$added_format" "a:$added_format"
+  # Format remote.
+  zstyle -s ':prezto:module:git:info:remote' format 'remote_format'
+  if [[ -n "$branch" && -n "$remote_format" ]]; then
+    # Gets the remote name.
+    remote_cmd='git rev-parse --symbolic-full-name --verify HEAD@{upstream}'
+    remote="${$(${(z)remote_cmd} 2> /dev/null)##refs/remotes/}"
+    if [[ -n "$remote" ]]; then
+      zformat -f remote_formatted "$remote_format" "R:$remote"
+    fi
   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_format"
+  zstyle -s ':prezto:module:git:info:ahead' format 'ahead_format'
+  zstyle -s ':prezto:module:git:info:behind' format 'behind_format'
+  if [[ -n "$branch" && ( -n "$ahead_format" || -n "$behind_format" ) ]]; then
+    # Gets the commit difference counts between local and remote.
+    ahead_and_behind_cmd='git rev-list --count --left-right HEAD...@{upstream}'
+
+    # Get ahead and behind counts.
+    ahead_and_behind="$(${(z)ahead_and_behind_cmd} 2> /dev/null)"
+
+    # Format ahead.
+    if [[ -n "$ahead_format" ]]; then
+      ahead="$ahead_and_behind[(w)1]"
+      if (( ahead > 0 )); then
+        zformat -f ahead_formatted "$ahead_format" "A:$ahead"
+      fi
+    fi
+
+    # Format behind.
+    if [[ -n "$behind_format" ]]; then
+      behind="$ahead_and_behind[(w)2]"
+      if (( behind > 0 )); then
+        zformat -f behind_formatted "$behind_format" "B:$behind"
+      fi
+    fi
   fi
 
-  # Format modified.
-  if (( $modified > 0 )); then
-    zstyle -s ':prezto:module:git:info:modified' format 'modified_format'
-    zformat -f modified_formatted "$modified_format" "m:$modified"
-  fi
+  # Get status type.
+  if ! zstyle -t ':prezto:module:git:info' verbose; then
+    # Format indexed.
+    zstyle -s ':prezto:module:git:info:indexed' format 'indexed_format'
+    if [[ -n "$indexed_format" ]]; then
+      ((
+        indexed+=$(
+          git diff-index \
+            --no-ext-diff \
+            --name-only \
+            --cached \
+            --ignore-submodules=${ignore_submodules:-none} \
+            HEAD \
+            2> /dev/null \
+          | wc -l
+        )
+      ))
+      if (( indexed > 0 )); then
+        zformat -f indexed_formatted "$indexed_format" "i:$indexed"
+      fi
+    fi
 
-  # Format renamed.
-  if (( $renamed > 0 )); then
-    zstyle -s ':prezto:module:git:info:renamed' format 'renamed_format'
-    zformat -f renamed_formatted "$renamed_format" "r:$renamed"
-  fi
+    # Format unindexed.
+    zstyle -s ':prezto:module:git:info:unindexed' format 'unindexed_format'
+    if [[ -n "$unindexed_format" ]]; then
+      ((
+        unindexed+=$(
+          git diff-files \
+            --no-ext-diff \
+            --name-only \
+            --ignore-submodules=${ignore_submodules:-none} \
+            2> /dev/null \
+          | wc -l
+        )
+      ))
+      if (( unindexed > 0 )); then
+        zformat -f unindexed_formatted "$unindexed_format" "I:$unindexed"
+      fi
+    fi
 
-  # Format unmerged.
-  if (( $unmerged > 0 )); then
-    zstyle -s ':prezto:module:git:info:unmerged' format 'unmerged_format'
-    zformat -f unmerged_formatted "$unmerged_format" "U:$unmerged"
-  fi
-
-  # Format untracked.
-  if (( $untracked > 0 )); then
+    # Format untracked.
     zstyle -s ':prezto:module:git:info:untracked' format 'untracked_format'
-    zformat -f untracked_formatted "$untracked_format" "u:$untracked"
+    if [[ -n "$untracked_format" ]]; then
+      ((
+        untracked+=$(
+          git ls-files \
+            --other \
+            --exclude-standard \
+            2> /dev/null \
+          | wc -l
+        )
+      ))
+      if (( untracked > 0 )); then
+        zformat -f untracked_formatted "$untracked_format" "u:$untracked"
+      fi
+    fi
+
+    (( dirty = indexed + unindexed + untracked ))
+  else
+    # Use porcelain status for easy parsing.
+    status_cmd="git status --porcelain --ignore-submodules=${ignore_submodules:-none}"
+
+    # Get current status.
+    while IFS=$'\n' read line; do
+      # Count added, deleted, modified, renamed, unmerged, untracked, dirty.
+      # T (type change) is undocumented, see http://git.io/FnpMGw.
+      # For a table of scenarii, see http://i.imgur.com/2YLu1.png.
+      [[ "$line" == ([ACDMT][\ MT]|[ACMT]D)\ * ]] && (( added++ ))
+      [[ "$line" == [\ ACMRT]D\ * ]] && (( deleted++ ))
+      [[ "$line" == ?[MT]\ * ]] && (( modified++ ))
+      [[ "$line" == R?\ * ]] && (( renamed++ ))
+      [[ "$line" == (AA|DD|U?|?U)\ * ]] && (( unmerged++ ))
+      [[ "$line" == \?\?\ * ]] && (( untracked++ ))
+      (( dirty++ ))
+    done < <(${(z)status_cmd} 2> /dev/null)
+
+    # Format added.
+    if (( added > 0 )); then
+      zstyle -s ':prezto:module:git:info:added' format 'added_format'
+      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_format"
+    fi
+
+    # Format modified.
+    if (( modified > 0 )); then
+      zstyle -s ':prezto:module:git:info:modified' format 'modified_format'
+      zformat -f modified_formatted "$modified_format" "m:$modified"
+    fi
+
+    # Format renamed.
+    if (( renamed > 0 )); then
+      zstyle -s ':prezto:module:git:info:renamed' format 'renamed_format'
+      zformat -f renamed_formatted "$renamed_format" "r:$renamed"
+    fi
+
+    # Format unmerged.
+    if (( unmerged > 0 )); then
+      zstyle -s ':prezto:module:git:info:unmerged' format 'unmerged_format'
+      zformat -f unmerged_formatted "$unmerged_format" "U:$unmerged"
+    fi
+
+    # Format untracked.
+    if (( untracked > 0 )); then
+      zstyle -s ':prezto:module:git:info:untracked' format 'untracked_format'
+      zformat -f untracked_formatted "$untracked_format" "u:$untracked"
+    fi
   fi
 
   # Format dirty and clean.
-  if (( $dirty > 0 )); then
+  if (( dirty > 0 )); then
     zstyle -s ':prezto:module:git:info:dirty' format 'dirty_format'
     zformat -f dirty_formatted "$dirty_format" "D:$dirty"
   else
@@ -342,27 +394,28 @@ function git-info {
   zstyle -a ':prezto:module:git:info:keys' format 'info_formats'
   for info_format in ${(k)info_formats}; do
     zformat -f REPLY "$info_formats[$info_format]" \
+      "a:$added_formatted" \
       "A:$ahead_formatted" \
       "B:$behind_formatted" \
-      "D:$dirty_formatted" \
-      "R:$remote_formatted" \
-      "S:$stashed_formatted" \
-      "U:$unmerged_formatted" \
-      "a:$added_formatted" \
       "b:$branch_formatted" \
       "C:$clean_formatted" \
       "c:$commit_formatted" \
       "d:$deleted_formatted" \
+      "D:$dirty_formatted" \
+      "i:$indexed_formatted" \
+      "I:$unindexed_formatted" \
       "m:$modified_formatted" \
       "p:$position_formatted" \
+      "R:$remote_formatted" \
       "r:$renamed_formatted" \
       "s:$action_formatted" \
+      "S:$stashed_formatted" \
+      "U:$unmerged_formatted" \
       "u:$untracked_formatted"
     git_info[$info_format]="$REPLY"
   done
 
   unset REPLY
-  unset _git_info_executing
 
   return 0
 }

modules/gpg-agent/README.md

@@ -1,25 +0,0 @@
-GPG-Agent
-=========
-
-Provides for an easier use of [gpg-agent][1].
-
-Settings
---------
-
-### SSH-Agent Protocol Emulation
-
-To enable SSH-Agent protocol emulation, add the following line to *zpreztorc*:
-
-    zstyle ':prezto:module:gpg-agent' ssh-support 'yes'
-
-Authors
--------
-
-*The authors of this module should be contacted via the [issue tracker][2].*
-
-  - [Florian Walch](https://github.com/fwalch)
-  - [Sorin Ionescu](https://github.com/sorin-ionescu)
-
-[1]: http://linux.die.net/man/1/gpg-agent
-[2]: https://github.com/sorin-ionescu/prezto/issues
-

modules/gpg-agent/init.zsh

@@ -1,44 +0,0 @@
-#
-# Provides for an easier use of gpg-agent.
-#
-# Authors:
-#   Florian Walch <florian.walch@gmx.at>
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-
-# Return if requirements are not found.
-if (( ! $+commands[gpg-agent] )); then
-  return 1
-fi
-
-_gpg_env="$HOME/.gnupg/gpg-agent.env"
-
-function _gpg-agent-start {
-  local ssh_support
-
-  zstyle -b ':prezto:module:gpg-agent' ssh-support 'ssh_support' \
-    || ssh_support=''
-
-  gpg-agent \
-    --daemon ${ssh_support:+'--enable-ssh-support'}
-    --write-env-file "${_gpg_env}" > /dev/null
-
-  chmod 600 "${_gpg_env}"
-  source "${_gpg_env}" > /dev/null
-}
-
-# Source GPG agent settings, if applicable.
-if [[ -s "${_gpg_env}" ]]; then
-  source "${_gpg_env}" > /dev/null
-  ps -ef | grep "${SSH_AGENT_PID}" | grep -q 'gpg-agent' || {
-    _gpg-agent-start
-  }
-else
-  _gpg-agent-start
-fi
-
-export GPG_AGENT_INFO
-export SSH_AUTH_SOCK
-export SSH_AGENT_PID
-export GPG_TTY="$(tty)"
-

modules/gpg/init.zsh

@@ -0,0 +1,44 @@
+#
+# Provides for an easier use of GPG by setting up gpg-agent.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+# Return if requirements are not found.
+if (( ! $+commands[gpg-agent] )); then
+  return 1
+fi
+
+# Set the default paths to gpg-agent files.
+_gpg_agent_conf="$HOME/.gnupg/gpg-agent.conf"
+_gpg_agent_env="$TMPDIR/gpg-agent.env"
+
+# Start gpg-agent if not started.
+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
+fi
+
+# Inform gpg-agent of the current TTY for user prompts.
+export GPG_TTY="$(tty)"
+
+# Integrate with the SSH module.
+if grep 'enable-ssh-support' "$_gpg_agent_conf" &> /dev/null; then
+  # Override the ssh-agent environment file default path.
+  _ssh_agent_env="$_gpg_agent_env"
+
+  # Load the SSH module for additional processing.
+  pmodload 'ssh'
+fi
+
+# Clean up.
+unset _gpg_agent_{conf,env}
+
+# Disable GUI prompts inside SSH.
+if [[ -n "$SSH_CONNECTION" ]]; then
+  export PINENTRY_USER_DATA='USE_CURSES=1'
+fi
+

modules/haskell/init.zsh

@@ -10,12 +10,9 @@ if (( ! $+commands[ghc] )); then
   return 1
 fi
 
-# Prepend Cabal per user directories to PATH/MANPATH.
-if [[ "$OSTYPE" == darwin* ]]; then
+# Prepend Cabal per user directories to PATH.
+if [[ "$OSTYPE" == darwin* && -d $HOME/Library/Haskell ]]; then
   path=($HOME/Library/Haskell/bin(/N) $path)
-  manpath=($HOME/Library/Haskell/man(/N) $manpath)
 else
   path=($HOME/.cabal/bin(/N) $path)
-  manpath=($HOME/.cabal/man(/N) $manpath)
 fi
-

modules/helper/functions/add-zsh-trap

@@ -6,14 +6,6 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-# Trap signals were generated with 'kill -l'.
-# DEBUG, EXIT, and ZERR are Zsh signals.
-_trap_signals=(
-  ABRT ALRM BUS CHLD CONT EMT FPE HUP ILL INFO INT IO KILL PIPE PROF QUIT
-  SEGV STOP SYS TERM TRAP TSTP TTIN TTOU URG USR1 USR2 VTALRM WINCH XCPU XFSZ
-  DEBUG EXIT ZERR
-)
-
 # Adds a function name to a list to be called when a trap is triggered.
 function add-zsh-trap {
   if (( $# < 2 )); then
@@ -21,7 +13,7 @@ function add-zsh-trap {
     return 1
   fi
 
-  if [[ -z "$_trap_signals[(r)$1]" ]]; then
+  if [[ -z "$signals[(r)$1]" ]]; then
     print "$0: unknown signal: $1" >&2
     return 1
   fi

modules/helper/init.zsh

@@ -30,7 +30,3 @@ function coalesce {
   return 1
 }
 
-# Defines a style if it is already not defined.
-function zstyle- {
-  zstyle -T "$1" "$2" && zstyle "$@"
-}

modules/history-substring-search/init.zsh

@@ -10,14 +10,26 @@
 pmodload 'editor'
 
 # Source module files.
-source "${0:h}/external/zsh-history-substring-search.zsh"
+source "${0:h}/external/zsh-history-substring-search.zsh" || return 1
 
 #
-# Styles
+# Search
 #
 
+zstyle -s ':prezto:module:history-substring-search:color' found \
+  'HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND' \
+    || HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND='bg=magenta,fg=white,bold'
+
+zstyle -s ':prezto:module:history-substring-search:color' not-found \
+  'HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND' \
+    || HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=white,bold'
+
+zstyle -s ':prezto:module:history-substring-search' globbing-flags \
+  'HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS' \
+    || HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS='i'
+
 if zstyle -t ':prezto:module:history-substring-search' case-sensitive; then
-  unset HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS
+  HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS="${HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS//i}"
 fi
 
 if ! zstyle -t ':prezto:module:history-substring-search' color; then
@@ -28,7 +40,7 @@ fi
 # Key Bindings
 #
 
-if [[ -n $key_info ]]; then
+if [[ -n "$key_info" ]]; then
   # Emacs
   bindkey -M emacs "$key_info[Control]P" history-substring-search-up
   bindkey -M emacs "$key_info[Control]N" history-substring-search-down

modules/homebrew/init.zsh

@@ -0,0 +1,25 @@
+#
+# Defines Homebrew aliases.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+# Return if requirements are not found.
+if [[ "$OSTYPE" != darwin* ]]; then
+  return 1
+fi
+
+#
+# Aliases
+#
+
+alias brewc='brew cleanup'
+alias brewC='brew cleanup --force'
+alias brewi='brew install'
+alias brewl='brew list'
+alias brews='brew search'
+alias brewu='brew upgrade'
+alias brewU='brew update && brew upgrade'
+alias brewx='brew remove'
+

modules/macports/init.zsh

@@ -15,18 +15,6 @@ fi
 # Paths
 #
 
-# Set the list of directories that info searches for manuals.
-infopath=(
-  /opt/local/share/info
-  $infopath
-)
-
-# Set the list of directories that man searches for manuals.
-manpath=(
-  /opt/local/share/man
-  $manpath
-)
-
 # Set the list of directories that Zsh searches for programs.
 path=(
   /opt/local/{bin,sbin}

modules/node/README.md

@@ -1,23 +0,0 @@
-Node.js
-=======
-
-Provides utility functions for [Node.js][1] and loads [npm][2] completion.
-
-Functions
----------
-
-  - `node-doc` opens the Node.js online [API documentation][3] in the default
-    browser.
-
-Authors
--------
-
-*The authors of this module should be contacted via the [issue tracker][4].*
-
-  - [Sorin Ionescu](https://github.com/sorin-ionescu)
-
-[1]: http://nodejs.org
-[2]: http://npmjs.org
-[3]: http://nodejs.org/api
-[4]: https://github.com/sorin-ionescu/prezto/issues
-

modules/node/functions/node-info

@@ -0,0 +1,25 @@
+#
+# Exposes information about the Node.js environment via the $node_info
+# associative array.
+#
+# Authors:
+#   Zeh Rizzatti <zehrizzatti@gmail.com>
+#
+
+local version
+local version_format
+local version_formatted
+
+unset node_info
+typeset -gA node_info
+
+if (( $+functions[nvm_version] )); then
+  version="${$(nvm_version)#v}"
+fi
+
+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

@@ -1,10 +1,16 @@
 #
-# Completes npm.
+# Loads the Node Version Manager and enables npm completion.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
+#   Zeh Rizzatti <zehrizzatti@gmail.com>
 #
 
+# Load NVM into the shell session.
+if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
+  source "$HOME/.nvm/nvm.sh"
+fi
+
 # Return if requirements are not found.
 if (( ! $+commands[node] )); then
   return 1