Add comments for pdebuglog

Fixes #1534

.editorconfig

@@ -0,0 +1,9 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[{.gitattributes,.gitignore,.gitmodules}]
+indent_style = tab

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,24 @@
+<!-- Please check if a similar issue already exists or has been closed before before opening your issue. -->
+
+### Description
+<!-- Provide a general description of the bug or feature -->
+
+### Expected behavior
+
+<!-- What you expected to happen -->
+
+### Actual behavior
+
+<!-- What actually happened -->
+
+### Steps to Reproduce
+
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+### Versions
+
+  - Prezto commit:
+  - ZSH version:
+  - OS information:

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,10 @@
+Please be sure to check out our [contributing guidelines](https://github.com/sorin-ionescu/prezto/blob/master/CONTRIBUTING.md)
+before submitting your pull request.
+
+Fixes #
+
+## Proposed Changes
+
+  -
+  -
+  -

.gitignore

@@ -1,3 +1,4 @@
 *.zwc
 *.zwc.old
 modules/*/cache.zsh
+contrib

.gitmodules

@@ -1,3 +1,6 @@
+[submodule "modules/autosuggestions/external"]
+	path = modules/autosuggestions/external
+	url = https://github.com/zsh-users/zsh-autosuggestions.git
 [submodule "modules/history-substring-search/external"]
 	path = modules/history-substring-search/external
 	url = https://github.com/zsh-users/zsh-history-substring-search.git
@@ -7,3 +10,21 @@
 [submodule "modules/completion/external"]
 	path = modules/completion/external
 	url = https://github.com/zsh-users/zsh-completions.git
+[submodule "modules/prompt/external/powerline"]
+	path = modules/prompt/external/powerline
+	url = https://github.com/davidjrice/prezto_powerline.git
+[submodule "modules/prompt/external/agnoster"]
+	path = modules/prompt/external/agnoster
+	url = https://github.com/agnoster/agnoster-zsh-theme.git
+[submodule "modules/prompt/functions/pure"]
+	path = modules/prompt/external/pure
+	url = https://github.com/sindresorhus/pure.git
+[submodule "modules/fasd/external"]
+	path = modules/fasd/external
+	url = https://github.com/clvv/fasd.git
+[submodule "modules/prompt/external/async"]
+	path = modules/prompt/external/async
+	url = https://github.com/mafredri/zsh-async.git
+[submodule "modules/prompt/external/powerlevel9k"]
+	path = modules/prompt/external/powerlevel9k
+	url = https://github.com/bhilburn/powerlevel9k.git

CONTRIBUTING.md

@@ -23,6 +23,39 @@ improve its performance, do not hesitate to fork and send pull requests.
    - Open a [pull request][4] that relates to but one subject with a clear
      title and description in grammatically correct, complete sentences.
 
+#### Code Style
+
+This project follows the [Google Shell Style Guide][5] when possible. However,
+there are a number of additional things to keep in mind.
+
+   - Local variables should be used whenever possible.
+   - Prefer `zstyle` over environment variables for configuration.
+   - Prefer (( ... )) over [[ ... ]] for arithmetic expression.
+   - Use the function keyword to define functions.
+   - The 80 character hard limit can be waved for readability.
+
+#### Using an Alternative zprezto Directory
+
+To work on zprezto without messing with your current configuration:
+
+```sh
+mkdir devel-zprezto
+cd devel-zprezto
+git clone --recursive https://github.com/sorin-ionescu/prezto.git .zprezto
+ZDOTDIR=$(pwd)
+echo "Your development ZDOTDIR is $ZDOTDIR"
+setopt EXTENDED_GLOB
+for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do
+    ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}"
+done
+```
+
+Then to start zsh in this development environment you will run:
+
+```sh
+ZDOTDIR=/path/to/devel-zprezto zsh
+```
+
 #### Modules
 
    - A *README.md* must be present.
@@ -32,11 +65,11 @@ improve its performance, do not hesitate to fork and send pull requests.
 #### Themes
 
    - A screenshots section must be present in the file header.
-   - The pull request description must have [embedded screenshots][5].
+   - The pull request description must have [embedded screenshots][6].
 
 [1]: https://github.com/sorin-ionescu/prezto/contributors
 [2]: http://gun.io/blog/how-to-github-fork-branch-and-pull-request
 [3]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 [4]: https://help.github.com/articles/using-pull-requests
-[5]: http://daringfireball.net/projects/markdown/syntax#img
-
+[5]: https://google.github.io/styleguide/shell.xml
+[6]: http://daringfireball.net/projects/markdown/syntax#img

LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009-2011 Robby Russell and contributors
+Copyright (c) 2011-2017 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

README.md

@@ -8,44 +8,66 @@ and prompt themes.
 Installation
 ------------
 
-Prezto will work with any recent release of Zsh, but the minimum recommended
-version is 4.3.11. Unfortunately, [Cygwin][9] is not supported due to
-non-standard core utilities.
+Prezto will work with any recent release of Zsh, but the minimum required
+version is 4.3.11.
 
   1. Launch Zsh:
 
-        zsh
+     ```console
+     zsh
+     ```
 
   2. Clone the repository:
 
-        git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
+     ```console
+     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
+     ```sh
+     setopt EXTENDED_GLOB
+     for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do
+       ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}"
+     done
+     ```
+
+     Note: If you already have any of the given config files, ln will error. In
+     simple cases you can add `source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"` to
+     the bottom of your `.zshrc` to load prezto but keep your config intact. For
+     more complicated setups, it is recommended that you back up your original
+     configs and replace them with the provided prezto runcoms.
 
   4. Set Zsh as your default shell:
 
-        chsh -s /bin/zsh
+     ```console
+     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
+modify the `PATH` variable in *~/.zprofile* then open a new Zsh terminal
 window or tab.
 
 Updating
 --------
 
-Pull the latest changes and update submodules.
+Run `zprezto-update` to automatically check if there is an update to zprezto.
+If there are no file conflicts, zprezto and its submodules will be
+automatically updated. If there are conflicts you will instructed to go into
+the `$ZPREZTODIR` directory and resolve them yourself.
 
-    git pull && git submodule update --init --recursive
+To pull the latest changes and update submodules manually:
+
+```console
+cd $ZPREZTODIR
+git pull
+git submodule update --init --recursive
+```
 
 Usage
 -----
@@ -68,6 +90,19 @@ accompanying README files to learn of what is available.
 
      ![sorin theme][2]
 
+### External Modules
+
+  1. By default modules will be loaded from */modules* and */contrib*.
+  2. Additional module directories can be added to the
+     `:prezto:load:pmodule-dirs` setting in *~/.zpreztorc*.
+
+     Note that module names need to be unique or they will cause an error when
+     loading.
+
+     ```console
+     zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto-contrib
+     ```
+
 Customization
 -------------
 
@@ -84,35 +119,13 @@ The [Zsh Reference Card][7] and the [zsh-lovers][8] man page are indispensable.
 License
 -------
 
-(The MIT License)
-
-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
-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.
+This project is licensed under the MIT License.
 
 [1]: http://www.zsh.org
-[2]: http://i.imgur.com/nBEEZ.png "sorin theme"
+[2]: http://i.imgur.com/nrGV6pg.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]: http://www.cygwin.com
-

documentation/man/man1/prezto-archive.1

@@ -1,55 +0,0 @@
-.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

@@ -1,17 +0,0 @@
-.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

@@ -1,27 +0,0 @@
-.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

@@ -1,49 +0,0 @@
-.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

@@ -1,63 +0,0 @@
-.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

@@ -1,22 +0,0 @@
-.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

@@ -1,31 +0,0 @@
-.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

@@ -1,20 +0,0 @@
-.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

@@ -1,27 +0,0 @@
-.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

@@ -1,29 +0,0 @@
-.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

@@ -1,55 +0,0 @@
-.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

@@ -1,62 +0,0 @@
-.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

@@ -1,35 +0,0 @@
-.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

@@ -1,29 +0,0 @@
-.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

@@ -1,48 +0,0 @@
-.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

@@ -1,84 +0,0 @@
-.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

@@ -1,74 +0,0 @@
-.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

@@ -1,108 +0,0 @@
-.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

@@ -1,119 +0,0 @@
-.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

@@ -1,56 +0,0 @@
-.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

@@ -1,34 +0,0 @@
-.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

@@ -1,97 +0,0 @@
-.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

@@ -1,37 +0,0 @@
-.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

@@ -1,145 +0,0 @@
-.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

@@ -1,53 +0,0 @@
-.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

@@ -1,53 +0,0 @@
-.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

@@ -1,26 +0,0 @@
-.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

@@ -1,61 +0,0 @@
-.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

@@ -1,233 +0,0 @@
-.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

@@ -1,43 +0,0 @@
-.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

@@ -1,40 +0,0 @@
-.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

@@ -1,23 +0,0 @@
-.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

@@ -1,199 +0,0 @@
-.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,41 +0,0 @@
-Archive
-=======
-
-Provides functions to list and extract archives.
-
-Functions
----------
-
-  - `lsarchive` lists the contents of one or more archives.
-  - `unarchive` extracts the contents of one or more archives.
-
-Supported Formats
------------------
-
-The following archive formats are supported when the required utilities are
-installed:
-
-  - *.tar.gz*, *.tgz* require `tar`.
-  - *.tar.bz2*, *.tbz* require `tar`.
-  - *.tar.xz*, *.txz* require `tar` with *xz* support.
-  - *.tar.zma*, *.tlz* require `tar` with *lzma* support.
-  - *.tar* requires `tar`.
-  - *.gz* requires `gunzip`.
-  - *.bz2* requires `bunzip2`.
-  - *.xz* requires `unxz`.
-  - *.lzma* requires `unlzma`.
-  - *.Z* requires `uncompress`.
-  - *.zip* requires `unzip`.
-  - *.rar* requires `unrar` or `rar`.
-  - *.7z* requires `7za`.
-  - *.deb* requires `ar`, `tar`.
-
-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-command-not-found.md

@@ -1,16 +0,0 @@
-Command-Not-Found
-=================
-
-Displays installation information for not found commands by loading the
-[command-not-found][1] tool on Debian-based and Arch Linux-based distributions.
-
-Authors
--------
-
-*The authors of this module should be contacted via the [issue tracker][2].*
-
-  - [Joseph Booker](https://github.com/sargas)
-
-[1]: https://code.launchpad.net/command-not-found
-[2]: https://github.com/sorin-ionescu/prezto/issues
-

documentation/markdown/prezto-editor.md

@@ -1,63 +0,0 @@
-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-perl.md

@@ -1,64 +0,0 @@
-Perl
-====
-
-Enables local [Perl][1] module installation on Mac OS X and defines alises.
-
-Local Module Installation
--------------------------
-
-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 *~/Library/Perl/5.12* by altering the environment.
-
-### Usage
-
-For Perl versions older than 5.14, install *local::lib*.
-
-    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
-
-Install *cpanminus*:
-
-    curl -L http://cpanmin.us | perl - --self-upgrade
-
-Perlbrew
---------
-
-An alternative to the above is to use [Perlbrew][2], which allows for the
-management of multiple, isolated Perl installations in the home directory.
-
-Aliases
--------
-
-### General
-
-  - `pl` is short for `perl`.
-  - `pld` looks up Perl documentation (`perldoc`).
-  - `ple` executes a one line program in a loop (`perl -wlne`).
-
-### Perlbrew
-
-  - `plb` manages Perl environments.
-  - `plba` lists available Perl versions.
-  - `plbi` installs a Perl version.
-  - `plbl` lists installed Perl versions.
-  - `plbo` temporarily turns off Perlbrew.
-  - `plbO` turns off Perlbrew.
-  - `plbs` switches to a Perl version.
-  - `plbu` uninstalls a Perl version.
-  - `plbx` temporarily sets the Perl version to use.
-
-Authors
--------
-
-*The authors of this module should be contacted via the [issue tracker][3].*
-
-  - [Sorin Ionescu](https://github.com/sorin-ionescu)
-
-[1]: http://www.perl.org
-[2]: http://perlbrew.pl
-[3]: https://github.com/sorin-ionescu/prezto/issues
-

documentation/markdown/prezto-python.md

@@ -1,100 +0,0 @@
-Python
-======
-
-Enables local Python and local Python package installation.
-
-Local Python Installation
--------------------------
-
-[pyenv][4] builds and installs multiple Python versions locally in the home
-directory.
-
-This module prepends the pyenv directory to the path variable to enable the
-execution of `pyenv`.
-
-### Usage
-
-Install Python versions with `pyenv install` into *~/.pyenv/versions*.
-
-Local Package Installation
---------------------------
-
-Since version 2.6, Python supports per user package installation, as defined in
-[PEP 370][1].
-
-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.
-
-### Usage
-
-Install packages into the per user site directory with `easy_install --user` or
-`pip install --user`.
-
-virtualenvwrapper
------------------
-
-[virtualenvwrapper][2] is a frontend to the popular [virtualenv][3] utility.
-
-virtualenv creates isolated Python environments and virtualenvwrapper provides
-convenient shell functions to create, switch, and manage them.
-
-### Usage
-
-Install virtualenvwrapper.
-
-Virtual environments are stored in *~/.virtualenvs*.
-
-There are configuration variables that have to be set to enable certain features.
-If you wish to use these features, export the variables in *~/.zshenv*
-
-The variable `$PROJECT_HOME` tells virtualenvwrapper where to place project
-working directories. It must be set and the directory created before `mkproject`
-is used. Replace *Developer* with your projects directory.
-
-    export PROJECT_HOME="$HOME/Developer"
-
-The variable `$VIRTUALENVWRAPPER_VIRTUALENV_ARGS` tells virtualenvwrapper what
-arguments to pass to `virtualenv`. For example, set the value to
-*--no-site-packages* to ensure that all new environments are isolated from the
-system site-packages directory.
-
-    export VIRTUALENVWRAPPER_VIRTUALENV_ARGS='--no-site-packages'
-
-Aliases
--------
-
-  - `py` is short for `python`.
-
-Functions
----------
-
-  - `python-info` exposes information about the Python environment via the
-    `$python_info` associative array.
-
-Theming
--------
-
-To display the name of the current virtual enviroment in a prompt, define the
-following style in the `prompt_name_setup` function.
-
-    # %v - virtualenv name.
-    zstyle ':prezto:module:python:info:virtualenv' format 'virtualenv:%v'
-
-Then add `$python_info[virtualenv]` to `$PROMPT` or `$RPROMPT` and call
-`python-info` in the `prompt_name_preexec` hook function.
-
-Authors
--------
-
-*The authors of this module should be contacted via the [issue tracker][5].*
-
-  - [Sorin Ionescu](https://github.com/sorin-ionescu)
-  - [Sebastian Wiesner](https://github.com/lunaryorn)
-
-[1]: http://www.python.org/dev/peps/pep-0370/
-[2]: http://www.doughellmann.com/projects/virtualenvwrapper/
-[3]: http://pypi.python.org/pypi/virtualenv
-[4]: https://github.com/yyuu/pyenv
-[5]: https://github.com/sorin-ionescu/prezto/issues
-

documentation/markdown/prezto.md

@@ -1,151 +0,0 @@
-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

@@ -12,11 +12,73 @@
 # Check for the minimum supported version.
 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
+  printf "prezto: old shell detected, minimum required: %s\n" "$min_zsh_version" >&2
   return 1
 fi
 unset min_zsh_version
 
+# Change the resolution of the SECONDS variable to be more useful for debugging.
+typeset -F SECONDS
+
+# logging convenience, mostly meant for debugging performance issues.
+function pdebuglog {
+  if ! zstyle -t ":prezto" debug; then
+    return
+  fi
+
+  local format="$1"
+  shift
+  printf "[%f] $format\n" $SECONDS "$@"
+}
+
+# zprezto convenience updater
+# The function is surrounded by ( ) instead of { } so it starts in a subshell
+# and won't affect the environment of the calling shell
+function zprezto-update {
+  (
+    function cannot-fast-forward {
+      local STATUS="$1"
+      [[ -n "${STATUS}" ]] && printf "%s\n" "${STATUS}"
+      printf "Unable to fast-forward the changes. You can fix this by "
+      printf "running\ncd '%s' and then\n'git pull' " "${ZPREZTODIR}"
+      printf "to manually pull and possibly merge in changes\n"
+    }
+    cd -q -- "${ZPREZTODIR}" || return 7
+    local orig_branch="$(git symbolic-ref HEAD 2> /dev/null | cut -d '/' -f 3)"
+    if [[ "$orig_branch" == "master" ]]; then
+      git fetch || return "$?"
+      local UPSTREAM=$(git rev-parse '@{u}')
+      local LOCAL=$(git rev-parse HEAD)
+      local REMOTE=$(git rev-parse "$UPSTREAM")
+      local BASE=$(git merge-base HEAD "$UPSTREAM")
+      if [[ $LOCAL == $REMOTE ]]; then
+        printf "There are no updates.\n"
+        return 0
+      elif [[ $LOCAL == $BASE ]]; then
+        printf "There is an update available. Trying to pull.\n\n"
+        if git pull --ff-only; then
+          printf "Syncing submodules\n"
+          git submodule update --recursive
+          return $?
+        else
+          cannot-fast-forward
+          return 1
+        fi
+      elif [[ $REMOTE == $BASE ]]; then
+        cannot-fast-forward "Commits in master that aren't in upstream."
+        return 1
+      else
+        cannot-fast-forward "Upstream and local have diverged."
+        return 1
+      fi
+    else
+      printf "zprezto install at '%s' is not on the master branch " "${ZPREZTODIR}"
+      printf "(you're on '%s')\nUnable to automatically update.\n" "${orig_branch}"
+      return 1
+    fi
+    return 1
+  )
+}
 #
 # Module Loader
 #
@@ -24,44 +86,71 @@ unset min_zsh_version
 # Loads Prezto modules.
 function pmodload {
   local -a pmodules
+  local -a pmodule_dirs
+  local -a locations
   local pmodule
-  local pfunction_glob='^([_.]*|prompt_*_setup|README*)(.N:t)'
+  local pmodule_location
+  local pfunction_glob='^([_.]*|prompt_*_setup|README*|*~)(-.N:t)'
+
+  # Load in any additional directories and warn if they don't exist
+  zstyle -a ':prezto:load' pmodule-dirs 'user_pmodule_dirs'
+  for user_dir in "$user_pmodule_dirs[@]"; do
+    if [[ ! -d "$user_dir" ]]; then
+      echo "$0: Missing user module dir: $user_dir"
+    fi
+  done
+
+  pmodule_dirs=("$ZPREZTODIR/modules" "$ZPREZTODIR/contrib" "$user_pmodule_dirs[@]")
 
   # $argv is overridden in the anonymous function.
   pmodules=("$argv[@]")
 
-  # Add functions to $fpath.
-  fpath=(${pmodules:+${ZDOTDIR:-$HOME}/.zprezto/modules/${^pmodules}/functions(/FN)} $fpath)
-
-  function {
-    local pfunction
-
-    # Extended globbing is needed for listing autoloadable function directories.
-    setopt LOCAL_OPTIONS EXTENDED_GLOB
-
-    # Load Prezto functions.
-    for pfunction in ${ZDOTDIR:-$HOME}/.zprezto/modules/${^pmodules}/functions/$~pfunction_glob; do
-      autoload -Uz "$pfunction"
-    done
-  }
-
   # Load Prezto modules.
   for pmodule in "$pmodules[@]"; do
+    pdebuglog "Started loading %q" $pmodule
     if zstyle -t ":prezto:module:$pmodule" loaded 'yes' 'no'; then
-      continue
-    elif [[ ! -d "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule" ]]; then
-      print "$0: no such module: $pmodule" >&2
+      pdebuglog "Module %q already loaded" $pmodule
       continue
     else
-      if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/init.zsh" ]]; then
-        source "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/init.zsh"
+      locations=(${pmodule_dirs:+${^pmodule_dirs}/$pmodule(-/FN)})
+      if (( ${#locations} > 1 )); then
+        print "$0: conflicting module locations: $locations"
+        continue
+      elif (( ${#locations} < 1 )); then
+        print "$0: no such module: $pmodule"
+        continue
+      fi
+
+      # Grab the full path to this module
+      pmodule_location=${locations[1]}
+
+      # Add functions to $fpath.
+      fpath=(${pmodule_location}/functions(/FN) $fpath)
+
+      function {
+        local pfunction
+
+        # Extended globbing is needed for listing autoloadable function directories.
+        setopt LOCAL_OPTIONS EXTENDED_GLOB
+
+        # Load Prezto functions.
+        for pfunction in ${pmodule_location}/functions/$~pfunction_glob; do
+          autoload -Uz "$pfunction"
+        done
+      }
+
+      if [[ -s "${pmodule_location}/init.zsh" ]]; then
+        source "${pmodule_location}/init.zsh"
+      elif [[ -s "${pmodule_location}/${pmodule}.plugin.zsh" ]]; then
+        source "${pmodule_location}/${pmodule}.plugin.zsh"
       fi
 
       if (( $? == 0 )); then
         zstyle ":prezto:module:$pmodule" loaded 'yes'
+        pdebuglog "Module %q loaded" $pmodule
       else
         # Remove the $fpath entry.
-        fpath[(r)${ZDOTDIR:-$HOME}/.zprezto/modules/${pmodule}/functions]=()
+        fpath[(r)${pmodule_location}/functions]=()
 
         function {
           local pfunction
@@ -71,11 +160,12 @@ function pmodload {
           setopt LOCAL_OPTIONS EXTENDED_GLOB
 
           # Unload Prezto functions.
-          for pfunction in ${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/functions/$~pfunction_glob; do
+          for pfunction in ${pmodule_location}/functions/$~pfunction_glob; do
             unfunction "$pfunction"
           done
         }
 
+        pdebuglog "Module %q failed to load" $pmodule
         zstyle ":prezto:module:$pmodule" loaded 'no'
       fi
     fi
@@ -86,6 +176,12 @@ function pmodload {
 # Prezto Initialization
 #
 
+# This finds the directory prezto is installed to so plugin managers don't need
+# to rely on dirty hacks to force prezto into a directory. Additionally, it
+# needs to be done here because inside the pmodload function ${0:h} evaluates to
+# the current directory of the shell rather than the prezto dir.
+ZPREZTODIR=${0:h}
+
 # Source the Prezto configuration file.
 if [[ -s "${ZDOTDIR:-$HOME}/.zpreztorc" ]]; then
   source "${ZDOTDIR:-$HOME}/.zpreztorc"
@@ -111,4 +207,3 @@ unset zfunction{s,}
 zstyle -a ':prezto:load' pmodule 'pmodules'
 pmodload "$pmodules[@]"
 unset pmodules
-

modules/README.md

@@ -3,13 +3,20 @@ Modules
 
 Load modules in *zpreztorc*. The order matters.
 
-    zstyle ':prezto:load' pmodule 'environment' 'terminal'
+```sh
+zstyle ':prezto:load' pmodule 'environment' 'terminal'
+```
 
 Archive
 -------
 
 Provides functions to list and extract archives.
 
+Autosuggestions
+---------------
+
+Integrates zsh-autosuggestions into Prezto.
+
 Command-Not-Found
 -----------------
 
@@ -26,6 +33,11 @@ Directory
 
 Sets directory options and defines directory aliases.
 
+DNF
+---
+
+Defines dnf aliases.
+
 Dpkg
 ----
 
@@ -92,7 +104,7 @@ Homebrew
 
 Defines Homebrew aliases.
 
-Macports
+MacPorts
 --------
 
 Defines MacPorts aliases and adds MacPorts directories to path variables.
@@ -102,10 +114,10 @@ Node.js
 
 Provides utility functions for Node.js and loads npm completion.
 
-Ocaml
+OCaml
 -----
 
-Initializes Ocaml package management.
+Initializes OCaml package management.
 
 OSX
 ---
@@ -192,4 +204,3 @@ Yum
 ---
 
 Defines yum aliases.
-

modules/archive/README.md

@@ -0,0 +1,52 @@
+Archive
+=======
+
+Provides functions to create, list, and extract archives.
+
+Functions
+---------
+
+  - `archive` creates an archive based on the provided archive name.
+  - `lsarchive` lists the contents of one or more archives.
+  - `unarchive` extracts the contents of one or more archives.
+
+Supported Formats
+-----------------
+
+The following archive formats are supported when the required utilities are
+installed:
+
+  - *.tar.gz*, *.tgz* require `tar` (optionally `pigz`).
+  - *.tar.bz2*, *.tbz* require `tar` (optionally `pbzip2`).
+  - *.tar.xz*, *.txz* require `tar` with *xz* support.
+  - *.tar.zma*, *.tlz* require `tar` with *lzma* support.
+  - *.tar* requires `tar`.
+  - *.gz* requires `gunzip`.
+  - *.bz2* requires `bunzip2`.
+  - *.xz* requires `unxz`.
+  - *.lzma* requires `unlzma`.
+  - *.Z* requires `uncompress`.
+  - *.zip*, *.jar* requires `unzip`.
+  - *.rar* requires `rar` (needed for `archive` support), `unrar` or `lsar` and `unar`.
+  - *.7z* requires `7za`.
+  - *.deb* requires `ar`, `tar`.
+
+Additionally, if `pigz` and/or `pbzip2` are installed, `archive` will use them over
+their traditional counterparts, `gzip` and `bzip2` respectively, to take full advantage
+of all available CPU cores for compression.
+
+Alternatives
+------------
+
+Specifically on macOS, [The Unarchiver][1] provides a similar command line tool
+which doesn't depend on a number of other programs being installed.
+
+Authors
+-------
+
+*The authors of this module should be contacted via the [issue tracker][1].*
+
+  - [Sorin Ionescu](https://github.com/sorin-ionescu)
+  - [Matt Hamilton](https://github.com/Eriner)
+
+[1]: https://theunarchiver.com/command-line

modules/archive/functions/_lsarchive

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

modules/archive/functions/_unarchive

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

modules/archive/functions/archive

@@ -0,0 +1,71 @@
+#!/usr/bin/env zsh
+#
+# Creates archive file
+#
+# Authors:
+#   Matt Hamilton <m@tthamilton.com>
+#
+
+# function archive {
+
+local archive_name dir_to_archive _gzip_bin _bzip2_bin
+
+if (( $# != 2 )); then
+  cat >&2 <<EOF
+usage: $0 [archive_name.zip] [/path/to/include/into/archive]
+
+Where 'archive.zip' uses any of the following extensions:
+
+.tar.gz, .tar.bz2, .tar.xz, .tar.lzma, .tar, .zip, .rar, .7z
+
+There is no '-v' switch; all operations are verbose.
+EOF
+return 1
+fi
+
+# we are quitting (above) if there are not exactly 2 vars,
+#  so we don't need any argc check here.
+
+# strip the path, just in case one is provided for some reason
+archive_name="${1:t}"
+# use absolute paths, and follow symlinks
+dir_to_archive="${2}"
+
+# if the directory doesn't exist, quit. Nothing to archive
+if [[ ! -e "${dir_to_archive}" ]]; then
+  print "$0: file or directory not valid: ${dir_to_archive}" >&2
+  return 1
+fi
+
+# here, we check for dropin/multi-threaded replacements
+# this should eventually be moved to modules/archive/init.zsh
+# as a global alias
+if (( $+commands[pigz] )); then
+  _gzip_bin='pigz'
+else
+  _gzip_bin='gzip'
+fi
+
+if (( $+commands[pbzip2] )); then
+  _bzip2_bin='pbzip2'
+else
+  _bzip2_bin='bzip2'
+fi
+
+case "${archive_name}" in
+  (*.tar.gz|*.tgz) tar -cvf "${archive_name}" --use-compress-program="${_gzip_bin}" "${dir_to_archive}" ;;
+  (*.tar.bz2|*.tbz|*.tbz2) tar -cvf "${archive_name}" --use-compress-program="${_bzip2_bin}" "${dir_to_archive}" ;;
+  (*.tar.xz|*.txz) tar -cvJf "${archive_name}" "${dir_to_archive}" ;;
+  (*.tar.lzma|*.tlz) tar -cvf "${archive_name}" --lzma "${dir_to_archive}" ;;
+  (*.tar) tar -cvf "${archive_name}" "${dir_to_archive}" ;;
+  (*.zip|*.jar) zip -r "${archive_name}" "${dir_to_archive}" ;;
+  (*.rar) rar a "${archive_name}" "${dir_to_archive}" ;;
+  (*.7z) 7za a "${archive_name}" "${dir_to_archive}" ;;
+  (*.gz) print "\n.gz is only useful for single files, and does not capture permissions. Use .tar.gz" ;;
+  (*.bz2) print "\n.bzip2 is only useful for single files, and does not capture permissions. Use .tar.bz2" ;;
+  (*.xz) print "\n.xz is only useful for single files, and does not capture permissions. Use .tar.xz" ;;
+  (*.lzma) print "\n.lzma is only useful for single files, and does not capture permissions. Use .tar.lzma" ;;
+  (*) print "\nunknown archive type for archive: ${archive_name}" ;;
+esac
+
+# }

modules/archive/functions/lsarchive

@@ -5,6 +5,8 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# function lsarchive {
+
 local verbose
 
 if (( $# == 0 )); then
@@ -30,7 +32,7 @@ while (( $# > 0 )); do
     continue
   fi
 
-  case "$1" in
+  case "$1:l" in
     (*.tar.gz|*.tgz) tar t${verbose:+v}vzf "$1" ;;
     (*.tar.bz2|*.tbz|*.tbz2) tar t${verbose:+v}jf "$1" ;;
     (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
@@ -40,13 +42,15 @@ while (( $# > 0 )); do
       && tar --lzma -t${verbose:+v}f "$1" \
       || lzcat "$1" | tar x${verbose:+v}f - ;;
     (*.tar) tar t${verbose:+v}f "$1" ;;
-    (*.zip) unzip -l${verbose:+v} "$1" ;;
-    (*.rar) unrar &> /dev/null \
-      && unrar ${${verbose:+v}:-l} "$1" \
-      || rar ${${verbose:+v}:-l} "$1" ;;
+    (*.zip|*.jar) unzip -l${verbose:+v} "$1" ;;
+    (*.rar) ( (( $+commands[unrar] )) \
+      && unrar ${${verbose:+v}:-l} "$1" ) \
+      || ( (( $+commands[rar] )) \
+      && rar ${${verbose:+v}:-l} "$1" ) \
+      || lsar ${verbose:+-l} "$1" ;;
     (*.7z) 7za l "$1" ;;
     (*)
-			print "$0: cannot list: $1" >&2
+      print "$0: cannot list: $1" >&2
       success=1
     ;;
   esac
@@ -54,3 +58,4 @@ while (( $# > 0 )); do
   shift
 done
 
+# }

modules/archive/functions/unarchive

@@ -5,9 +5,12 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# function unarchive {
+
 local remove_archive
 local success
 local file_name
+local file_path
 local extract_dir
 
 if (( $# == 0 )); then
@@ -36,8 +39,9 @@ while (( $# > 0 )); do
 
   success=0
   file_name="${1:t}"
+  file_path="${1:A}"
   extract_dir="${file_name:r}"
-  case "$1" in
+  case "$1:l" in
     (*.tar.gz|*.tgz) tar xvzf "$1" ;;
     (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
     (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
@@ -52,18 +56,20 @@ while (( $# > 0 )); do
     (*.xz) unxz "$1" ;;
     (*.lzma) unlzma "$1" ;;
     (*.Z) uncompress "$1" ;;
-    (*.zip) unzip "$1" -d $extract_dir ;;
-    (*.rar) unrar &> /dev/null \
-      && unrar e -ad "$1" \
-      || rar e -ad "$1" ;;
+    (*.zip|*.jar) unzip "$1" -d $extract_dir ;;
+    (*.rar) ( (( $+commands[unrar] )) \
+      && unrar x -ad "$1" ) \
+      || ( (( $+commands[rar] )) \
+      && rar x -ad "$1" ) \
+      || unar -d "$1" ;;
     (*.7z) 7za x "$1" ;;
     (*.deb)
       mkdir -p "$extract_dir/control"
       mkdir -p "$extract_dir/data"
-      cd "$extract_dir"; ar vx "../${1}" > /dev/null
-      cd control; tar xzvf ../control.tar.gz
-      cd ../data; tar xzvf ../data.tar.gz
-      cd ..; rm *.tar.gz debian-binary
+      cd "$extract_dir"; ar vx "${file_path}" > /dev/null
+      cd control; tar xvf ../control.tar.*
+      cd ../data; tar xvf ../data.tar.*
+      cd ..; rm control.tar.* data.tar.* debian-binary
       cd ..
     ;;
     (*)
@@ -77,3 +83,4 @@ while (( $# > 0 )); do
   shift
 done
 
+# }

modules/autosuggestions/README.md

@@ -0,0 +1,58 @@
+Autosuggestions
+---------------
+
+Integrates zsh-autosuggestions into Prezto.
+
+Autosuggestions
+===============
+
+Integrates [zsh-autosuggestions][1] into Prezto, which implements the
+[Fish shell][2]'s autosuggestions feature, where the user can type in any part
+of a previously entered command and Zsh suggests commands as you type based on
+history and completions.
+
+If this module is used in conjunction with the *syntax-highlighting* module,
+this module must be loaded **after** the *syntax-highlighting* module.
+
+If this module is used in conjunction with the *history-substring-search*
+module, this module must be loaded **after** the *history-substring-search*
+module.
+
+Contributors
+------------
+
+New features and bug fixes should be submitted to the [zsh-autosuggestions][1]
+project according to its rules and regulations. This module will be synchronized
+against it.
+
+Settings
+--------
+
+### Highlighting
+
+If colors are enabled, *autosuggestions* will automatically highlight
+positive results.
+
+To enable highlighting for this module only, add the following line to
+*zpreztorc*:
+
+```sh
+zstyle ':prezto:module:autosuggestions' color 'yes'
+```
+
+To set the query found color, add the following line to *zpreztorc*:
+
+```sh
+zstyle ':prezto:module:autosuggestions:color' found ''
+```
+
+Authors
+-------
+
+*The authors of this module should be contacted via the [issue tracker][3].*
+
+  - [Sorin Ionescu](https://github.com/sorin-ionescu)
+
+[1]: https://github.com/tarruda/zsh-autosuggestions
+[2]: http://fishshell.com
+[3]: https://github.com/sorin-ionescu/prezto/issues

modules/autosuggestions/init.zsh

@@ -0,0 +1,35 @@
+#
+# Integrates zsh-autosuggestions into Prezto.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+# Load dependencies.
+pmodload 'editor'
+
+# Source module files.
+source "${0:h}/external/zsh-autosuggestions.zsh" || return 1
+
+#
+# Highlighting
+#
+
+# Set highlight color, default 'fg=8'.
+zstyle -s ':prezto:module:autosuggestions:color' found \
+  'ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE' || ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
+
+# Disable highlighting.
+if ! zstyle -t ':prezto:module:autosuggestions' color; then
+  ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE=''
+fi
+
+#
+# Key Bindings
+#
+
+if [[ -n "$key_info" ]]; then
+  # vi
+  bindkey -M viins "$key_info[Control]F" vi-forward-word
+  bindkey -M viins "$key_info[Control]E" vi-add-eol
+fi

modules/command-not-found/README.md

@@ -0,0 +1,23 @@
+Command-Not-Found
+=================
+
+When you try to use a command that is not available locally, searches
+the package manager for a package offering that command and suggests
+the proper install command. 
+
+Debian-based and Arch Linux-based distributions use the [`command-not-found`][1] tool.
+
+macOS uses Homebrew's [`command-not-found` clone][2]. Note that you also need to [follow the instructions to tap the `command-not-found` homebrew repository][3].
+
+
+Authors
+-------
+
+*The authors of this module should be contacted via the [issue tracker][4].*
+
+  - [Joseph Booker](https://github.com/sargas)
+
+[1]: https://code.launchpad.net/command-not-found
+[2]: https://github.com/Homebrew/homebrew-command-not-found
+[3]: https://github.com/Homebrew/homebrew-command-not-found#install
+[4]: https://github.com/sorin-ionescu/prezto/issues

modules/command-not-found/init.zsh

@@ -3,6 +3,7 @@
 #
 # Authors:
 #   Joseph Jon Booker <joe@neoturbine.net>
+#   Indrajit Raychaudhuri <irc+code@indrajit.com>
 #
 
 # Load command-not-found on Debian-based distributions.
@@ -11,8 +12,10 @@ if [[ -s '/etc/zsh_command_not_found' ]]; then
 # 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'
+# Load command-not-found on Mac OS X when homebrew tap is configured.
+elif (( $+commands[brew] )) && brew command command-not-found-init > /dev/null 2>&1; then
+  eval "$(brew command-not-found-init)"
 # Return if requirements are not found.
 else
   return 1
 fi
-

modules/completion/README.md

@@ -6,6 +6,23 @@ the [zsh-completions][1] project.
 
 This module must be loaded **after** the *utility* module.
 
+Settings
+--------
+
+### Ignore */etc/hosts* Entries
+
+To ignore certain entries from static */etc/hosts* for host completion, add the
+following lines in *zpreztorc* with the IP addresses of the hosts as they
+appear in */etc/hosts*. Both IP address and the corresponding hostname will be
+ignored during host completion. However, some of the entries ignored from
+*/etc/hosts* still might appear during completion because of their presence in
+*ssh* configuration or history).
+
+```sh
+zstyle ':prezto:module:completion:*:hosts' etc-host-ignores \
+  '0.0.0.0' '127.0.0.1'
+```
+
 Contributors
 ------------
 
@@ -21,4 +38,3 @@ Authors
 
 [1]: https://github.com/zsh-users/zsh-completions
 [2]: https://github.com/sorin-ionescu/prezto/issues
-

modules/completion/init.zsh

@@ -14,9 +14,6 @@ fi
 # Add zsh-completions to $fpath.
 fpath=("${0:h}/external/src" $fpath)
 
-# Load and initialize the completion system ignoring insecure directories.
-autoload -Uz compinit && compinit -i
-
 #
 # Options
 #
@@ -24,17 +21,30 @@ autoload -Uz compinit && compinit -i
 setopt COMPLETE_IN_WORD    # Complete from both ends of a word.
 setopt ALWAYS_TO_END       # Move cursor to the end of a completed word.
 setopt PATH_DIRS           # Perform path search even on command names with slashes.
-setopt AUTO_MENU           # Show completion menu on a succesive tab press.
+setopt AUTO_MENU           # Show completion menu on a successive tab press.
 setopt AUTO_LIST           # Automatically list choices on ambiguous completion.
 setopt AUTO_PARAM_SLASH    # If completed parameter is a directory, add a trailing slash.
+setopt EXTENDED_GLOB       # Needed for file modification glob modifiers with compinit
 unsetopt MENU_COMPLETE     # Do not autoselect the first completion entry.
 unsetopt FLOW_CONTROL      # Disable start/stop characters in shell editor.
 
+# Load and initialize the completion system ignoring insecure directories with a
+# cache time of 20 hours, so it should almost always regenerate the first time a
+# shell is opened each day.
+autoload -Uz compinit
+_comp_files=(${ZDOTDIR:-$HOME}/.zcompdump(Nm-20))
+if (( $#_comp_files )); then
+  compinit -i -C
+else
+  compinit -i
+fi
+unset _comp_files
+
 #
 # Styles
 #
 
-# Use caching to make completion for cammands such as dpkg and apt usable.
+# Use caching to make completion for commands such as dpkg and apt usable.
 zstyle ':completion::complete:*' use-cache on
 zstyle ':completion::complete:*' cache-path "${ZDOTDIR:-$HOME}/.zcompcache"
 
@@ -66,8 +76,9 @@ zstyle ':completion:*' completer _complete _match _approximate
 zstyle ':completion:*:match:*' original only
 zstyle ':completion:*:approximate:*' max-errors 1 numeric
 
-# Increase the number of errors based on the length of the typed word.
-zstyle -e ':completion:*:approximate:*' max-errors 'reply=($((($#PREFIX+$#SUFFIX)/3))numeric)'
+# Increase the number of errors based on the length of the typed word. But make
+# sure to cap (at 7) the max-errors to avoid hanging.
+zstyle -e ':completion:*:approximate:*' max-errors 'reply=($((($#PREFIX+$#SUFFIX)/3>7?7:($#PREFIX+$#SUFFIX)/3))numeric)'
 
 # Don't complete unavailable commands.
 zstyle ':completion:*:functions' ignored-patterns '(_*|pre(cmd|exec))'
@@ -91,11 +102,14 @@ zstyle ':completion:*:history-words' menu yes
 # Environmental Variables
 zstyle ':completion::*:(-command-|export):*' fake-parameters ${${${_comps[(I)-value-*]#*,}%%,*}:#-*-}
 
-# Populate hostname completion.
+# Populate hostname completion. But allow ignoring custom entries from static
+# */etc/hosts* which might be uninteresting.
+zstyle -a ':prezto:module:completion:*:hosts' etc-host-ignores '_etc_host_ignores'
+
 zstyle -e ':completion:*:hosts' hosts 'reply=(
-  ${=${=${=${${(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 }:#*\**}:#*\?*}}
+  ${=${=${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) 2> /dev/null)"}%%[#| ]*}//\]:[0-9]*/ }//,/ }//\[/ }
+  ${=${(f)"$(cat /etc/hosts(|)(N) <<(ypcat hosts 2> /dev/null))"}%%(\#${_etc_host_ignores:+|${(j:|:)~_etc_host_ignores}})*}
+  ${=${${${${(@M)${(f)"$(cat ~/.ssh/config 2> /dev/null)"}:#Host *}#Host }:#*\**}:#*\?*}}
 )'
 
 # Don't complete uninteresting users...
@@ -116,7 +130,7 @@ zstyle ':completion:*:(rm|kill|diff):*' ignore-line other
 zstyle ':completion:*:rm:*' file-patterns '*:all-files'
 
 # Kill
-zstyle ':completion:*:*:*:*:processes' command 'ps -u $USER -o pid,user,comm -w'
+zstyle ':completion:*:*:*:*:processes' command 'ps -u $LOGNAME -o pid,user,command -w'
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;36=0=01'
 zstyle ':completion:*:*:kill:*' menu yes select
 zstyle ':completion:*:*:kill:*' force-list always
@@ -139,11 +153,9 @@ if [[ -s "$HOME/.mutt/aliases" ]]; then
 fi
 
 # SSH/SCP/RSYNC
-zstyle ':completion:*:(scp|rsync):*' tag-order 'hosts:-host:host hosts:-domain:domain hosts:-ipaddr:ip\ address *'
+zstyle ':completion:*:(ssh|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 '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/directory/README.md

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

modules/directory/init.zsh

@@ -16,7 +16,6 @@ setopt PUSHD_IGNORE_DUPS    # Do not store duplicates in the stack.
 setopt PUSHD_SILENT         # Do not print the directory stack after pushd or popd.
 setopt PUSHD_TO_HOME        # Push to home directory when no argument is given.
 setopt CDABLE_VARS          # Change directory to a path stored in a variable.
-setopt AUTO_NAME_DIRS       # Auto add variable-stored paths to ~ list.
 setopt MULTIOS              # Write to multiple descriptors.
 setopt EXTENDED_GLOB        # Use extended globbing syntax.
 unsetopt CLOBBER            # Do not overwrite existing files with > and >>.
@@ -28,4 +27,3 @@ unsetopt CLOBBER            # Do not overwrite existing files with > and >>.
 
 alias d='dirs -v'
 for index ({1..9}) alias "$index"="cd +${index}"; unset index
-

modules/dnf/README.md

@@ -0,0 +1,29 @@
+DNF
+===
+
+Defines [dnf][1] aliases.
+
+Aliases
+-------
+
+  - `dnfc` removes package(s) and leaves.
+  - `dnfi` installs package(s).
+  - `dnfh` displays history.
+  - `dnfl` lists packages.
+  - `dnfL` lists installed packages.
+  - `dnfq` displays package information.
+  - `dnfr` removes package(s).
+  - `dnfs` searches for a package.
+  - `dnfu` updates packages.
+  - `dnfU` upgrades packages.
+
+Authors
+-------
+
+*The authors of this module should be contacted via the [issue tracker][2].*
+
+  - [Sorin Ionescu](https://github.com/sorin-ionescu)
+
+[1]: https://fedoraproject.org/wiki/Features/DNF
+[2]: https://github.com/sorin-ionescu/prezto/issues
+

modules/dnf/init.zsh

@@ -0,0 +1,28 @@
+#
+# Defines dnf aliases.
+#
+# Authors:
+#   FireWave <firewave@free.fr>
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+# Return if requirements are not found.
+if (( ! $+commands[dnf] )); then
+  return 1
+fi
+
+#
+# Aliases
+#
+
+alias dnfc='sudo dnf clean all'    # Cleans the cache.
+alias dnfh='dnf history'           # Displays history.
+alias dnfi='sudo dnf install'      # Installs package(s).
+alias dnfl='dnf list'              # Lists packages.
+alias dnfL='dnf list installed'    # Lists installed packages.
+alias dnfq='dnf info'              # Displays package information.
+alias dnfr='sudo dnf remove'       # Removes package(s).
+alias dnfs='dnf search'            # Searches for a package.
+alias dnfu='sudo dnf update'       # Updates packages.
+alias dnfU='sudo dnf upgrade'      # Upgrades packages.
+

modules/docker/README.md

@@ -0,0 +1,190 @@
+# ZSH Docker Aliases
+
+Defines [Docker][1] aliases and functions.
+
+## Aliases
+
+### Docker
+
+- `dk` is short for `docker`
+- `dka` Attach to a running container
+- `dkb` Build an image from a Dockerfile
+- `dkd` Inspect changes on a container's filesystem
+- `dkdf` Show docker filesystem usage
+- `dke` Run a command in a running container
+- `dkE` Run an interactive command in a running container
+- `dkh` Show the history of an image
+- `dki` List images
+- `dkin` Return low-level information on a container, image or task
+- `dkk` Kill a running container
+- `dkl` Fetch the logs of a container
+- `dkli` Log in to a Docker registry
+- `dklo` Log out from a Docker registry
+- `dkls` is alias for `dkps`
+- `dkp` Pause all processes within one or more containers<Paste>
+- `dkP` Unpause all processes within one or more containers
+- `dkpl` Pull an image or a repository from a registry
+- `dkph` Push an image or a repository to a registry
+- `dkps` List containers
+- `dkpsa` List all containers (default lists just running)
+- `dkr` Run a command in a new container
+- `dkR` Run an interactive command in a new container and automatically remove the container when it exits
+- `dkRe` like `dkR` and set entry point to `/bin/bash`
+- `dkrm` Remove one or more containers
+- `dkrmi` Remove one or more images
+- `dkrmC` Clean up exited containers
+- `dkrmI` Clean up dangling images
+- `dkrmV` Clean up unused volumes ( Docker >= 1.9 )
+- `dkrn` Rename a container
+- `dks` Start one or more stopped containers
+- `dkS` Restart a container
+- `dkss` Display a live stream of container(s) resource usage statistics
+- `dksv` Save one or more images to a tar archive (streamed to STDOUT by default)
+- `dkt` Tag an image into a repository
+- `dktop` Display the running processes of a container
+- `dkup` Update configuration of one or more containers
+- `dkV` Manage Docker volumes
+- `dkv` Show the Docker version information
+- `dkw` Block until a container stops, then print its exit code<Paste>
+- `dkx` Stop a running container
+
+#### container (C)
+
+- `dkC` Manage containers
+- `dkCa` Attach to a running container
+- `dkCcp` Copy files/folders between a container and the local filesystem
+- `dkCd` Inspect changes on a container's filesystem
+- `dkCe` Run a command in a running container
+- `dkCin` Display detailed information on one or more containers
+- `dkCk` Kill one or more running containers
+- `dkCl` Fetch the logs of a container
+- `dkCls` List containers
+- `dkCp` Pause all processes within one or more containers
+- `dkCpr` Remove all stopped containers
+- `dkCrn` Rename a container
+- `dkCS` Restart one or more containers
+- `dkCrm` Remove one or more containers
+- `dkCr` Run a command in a new container
+- `dkCR` Run an interactive command in a new container and automatically remove the container when it exits
+- `dkCRe` like `dkCR` and set entry point to `/bin/bash`
+- `dkCs` Start one or more stopped containers
+- `dkCss` Display a live stream of container(s) resource usage statistics
+- `dkCx` Stop one or more running containers
+- `dkCtop` Display the running processes of a container
+- `dkCP` Unpause all processes within one or more containers
+- `dkCup` Update configuration of one or more containers
+- `dkCw` Block until one or more containers stop, then print their exit codes
+
+#### image (I)
+
+- `dkI` Manage images
+- `dkIb` Build an image from a Dockerfile
+- `dkIh` Show the history of an image
+- `dkIim` Import the contents from a tarball to create a filesystem image
+- `dkIin` Display detailed information on one or more images
+- `dkIls` List images
+- `dkIpr` Remove unused images
+- `dkIpl` Pull an image or a repository from a registry
+- `dkIph` Push an image or a repository to a registry
+- `dkIrm` Remove one or more images
+- `dkIsv` Save one or more images to a tar archive (streamed to STDOUT by default)
+- `dkIt` Tag an image into a repository
+
+#### volume (V)
+
+- `dkV` Manage volumes
+- `dkVin` Display detailed information on one or more volumes
+- `dkVls` List volumes
+- `dkVpr` Remove all unused volumes
+- `dkVrm` Remove one or more volumes
+
+#### network (N)
+
+- `dkN` Manage networks
+- `dkNs` Connect a container to a network
+- `dkNx` Disconnects a container from a network
+- `dkNin` Displays detailed information on a network
+- `dkNls` Lists all the networks created by the user
+- `dkNpr` Remove all unused networks
+- `dkNrm` Deletes one or more networks
+
+#### system (Y)
+
+- `dkY` Manage Docker
+- `dkYdf` Show docker filesystem usage
+- `dkYpr` Remove unused data
+
+#### stack (K)
+
+- `dkK` Manage Docker stacks
+- `dkKls` List stacks
+- `dkKps` List the tasks in the stack
+- `dkKrm` Remove the stack
+
+#### swarm (W)
+
+- `dkW` Manage Docker Swarm
+
+### Docker Machine
+
+- `dkm` is short for `docker-machine`
+- `dkma` Get or set the active machine
+- `dkmcp` Copy files between machines
+- `dkmd` Set up the default machine ; alowing you to use `dkme` without arguments
+- `dkme` Set up the environment for the Docker client (eg: `dkme staging` to toggle to staging)
+- `dkmin` Inspect information about a machine
+- `dkmip` Get the IP address of a machine
+- `dkmk` Kill a machine
+- `dkmls` List machines
+- `dkmpr` Re-provision existing machines
+- `dkmps` is alias for `dkmls`
+- `dkmrg` Regenerate TLS Certificates for a machine
+- `dkmrm` Remove a machine
+- `dkms` Start a machine
+- `dkmsh` Log into or run a command on a machine with SSH
+- `dkmst` Get the status of a machine
+- `dkmS` Restart a machine
+- `dkmu` Get the URL of a machine
+- `dkmup` Upgrade a machine to the latest version of Docker
+- `dkmV` Show the Docker Machine version or a machine docker version
+- `dkmx` Stop a machine
+
+### Docker Compose
+
+- `dkc` is short for `docker-compose`
+- `dkcb` Build or rebuild services
+- `dkcB` Build or rebuild services and do not use cache when building the image
+- `dkcd` Stop and remove containers, networks, images, and volumes
+- `dkce` Execute a command in a running container
+- `dkck` Kill containers
+- `dkcl` View output from containers
+- `dkcls` is alias for `dkcps`
+- `dkcp` Pause services
+- `dkcP` Unpause services
+- `dkcpl` Pull service images
+- `dkcph` Push service images
+- `dkcps` List containers
+- `dkcr` Run a one-off command
+- `dkcR` Run a one-off command and remove container after run.
+- `dkcrm` Remove stopped containers
+- `dkcs` Start services
+- `dkcsc` Set number of containers for a service
+- `dkcS` Restart services
+- `dkcu` Create and start containers
+- `dkcU` Create and start containers in detached mode:
+           Run containers in the background, print new container names
+- `dkcV` Show the Docker-Compose version information
+- `dkcx` Stop services
+
+## Support
+
+If you're having problems, use the [Prezto issue tracker][2].
+
+## Acknowledgements
+
+This module is a copy of [akarzim/zsh-docker-aliases][3] by [François Vantomme][4] (MIT License).
+
+[1]: https://www.docker.com/
+[2]: https://github.com/zsh-users/prezto/issues
+[3]: https://github.com/akarzim/zsh-docker-aliases
+[4]: https://github.com/akarzim

modules/docker/alias.zsh

@@ -0,0 +1,177 @@
+#
+# Defines Docker aliases.
+#
+# Author:
+#   François Vantomme <akarzim@gmail.com>
+#
+
+#
+# Aliases
+#
+
+# Docker
+alias dk='docker'
+alias dka='docker attach'
+alias dkb='docker build'
+alias dkd='docker diff'
+alias dkdf='docker system df'
+alias dke='docker exec'
+alias dkE='docker exec -it'
+alias dkh='docker history'
+alias dki='docker images'
+alias dkin='docker inspect'
+alias dkim='docker import'
+alias dkk='docker kill'
+alias dkl='docker logs'
+alias dkli='docker login'
+alias dklo='docker logout'
+alias dkls='docker ps'
+alias dkp='docker pause'
+alias dkP='docker unpause'
+alias dkpl='docker pull'
+alias dkph='docker push'
+alias dkps='docker ps'
+alias dkpsa='docker ps -a'
+alias dkr='docker run'
+alias dkR='docker run -it --rm'
+alias dkRe='docker run -it --rm --entrypoint /bin/bash'
+alias dkRM='docker system prune'
+alias dkrm='docker rm'
+alias dkrmi='docker rmi'
+alias dkrn='docker rename'
+alias dks='docker start'
+alias dkS='docker restart'
+alias dkss='docker stats'
+alias dksv='docker save'
+alias dkt='docker tag'
+alias dktop='docker top'
+alias dkup='docker update'
+alias dkV='docker volume'
+alias dkv='docker version'
+alias dkw='docker wait'
+alias dkx='docker stop'
+
+## Container (C)
+alias dkC='docker container'
+alias dkCa='docker container attach'
+alias dkCcp='docker container cp'
+alias dkCd='docker container diff'
+alias dkCe='docker container exec'
+alias dkCin='docker container inspect'
+alias dkCk='docker container kill'
+alias dkCl='docker container logs'
+alias dkCls='docker container ls'
+alias dkCp='docker container pause'
+alias dkCpr='docker container prune'
+alias dkCrn='docker container rename'
+alias dkCS='docker container restart'
+alias dkCrm='docker container rm'
+alias dkCr='docker container run'
+alias dkCR='docker container run -it --rm'
+alias dkCRe='docker container run -it --rm --entrypoint /bin/bash'
+alias dkCs='docker container start'
+alias dkCss='docker container stats'
+alias dkCx='docker container stop'
+alias dkCtop='docker container top'
+alias dkCP='docker container unpause'
+alias dkCup='docker container update'
+alias dkCw='docker container wait'
+
+## Image (I)
+alias dkI='docker image'
+alias dkIb='docker image build'
+alias dkIh='docker image history'
+alias dkIim='docker image import'
+alias dkIin='docker image inspect'
+alias dkIls='docker image ls'
+alias dkIpr='docker image prune'
+alias dkIpl='docker image pull'
+alias dkIph='docker image push'
+alias dkIrm='docker image rm'
+alias dkIsv='docker image save'
+alias dkIt='docker image tag'
+
+## Volume (V)
+alias dkV='docker volume'
+alias dkVin='docker volume inspect'
+alias dkVls='docker volume ls'
+alias dkVpr='docker volume prune'
+alias dkVrm='docker volume rm'
+
+## Network (N)
+alias dkN='docker network'
+alias dkNs='docker network connect'
+alias dkNx='docker network disconnect'
+alias dkNin='docker network inspect'
+alias dkNls='docker network ls'
+alias dkNpr='docker network prune'
+alias dkNrm='docker network rm'
+
+## System (Y)
+alias dkY='docker system'
+alias dkYdf='docker system df'
+alias dkYpr='docker system prune'
+
+## Stack (K)
+alias dkK='docker stack'
+alias dkKls='docker stack ls'
+alias dkKps='docker stack ps'
+alias dkKrm='docker stack rm'
+
+## Swarm (W)
+alias dkW='docker swarm'
+
+## CleanUp (rm)
+# Clean up exited containers (docker < 1.13)
+alias dkrmC='docker rm $(docker ps -qaf status=exited)'
+# Clean up dangling images (docker < 1.13)
+alias dkrmI='docker rmi $(docker images -qf dangling=true)'
+# Clean up dangling volumes (docker < 1.13)
+alias dkrmV='docker volume rm $(docker volume ls -qf dangling=true)'
+
+
+# Docker Machine (m)
+alias dkm='docker-machine'
+alias dkma='docker-machine active'
+alias dkmcp='docker-machine scp'
+alias dkmin='docker-machine inspect'
+alias dkmip='docker-machine ip'
+alias dkmk='docker-machine kill'
+alias dkmls='docker-machine ls'
+alias dkmpr='docker-machine provision'
+alias dkmps='docker-machine ps'
+alias dkmrg='docker-machine regenerate-certs'
+alias dkmrm='docker-machine rm'
+alias dkms='docker-machine start'
+alias dkmsh='docker-machine ssh'
+alias dkmst='docker-machine status'
+alias dkmS='docker-machine restart'
+alias dkmu='docker-machine url'
+alias dkmup='docker-machine upgrade'
+alias dkmv='docker-machine version'
+alias dkmx='docker-machine stop'
+
+# Docker Compose (c)
+alias dkc='docker-compose'
+alias dkcb='docker-compose build'
+alias dkcB='docker-compose build --no-cache'
+alias dkcd='docker-compose down'
+alias dkce='docker-compose exec'
+alias dkck='docker-compose kill'
+alias dkcl='docker-compose logs'
+alias dkcls='docker-compose ps'
+alias dkcp='docker-compose pause'
+alias dkcP='docker-compose unpause'
+alias dkcpl='docker-compose pull'
+alias dkcph='docker-compose push'
+alias dkcps='docker-compose ps'
+alias dkcr='docker-compose run'
+alias dkcR='docker-compose run --rm'
+alias dkcrm='docker-compose rm'
+alias dkcs='docker-compose start'
+alias dkcsc='docker-compose scale'
+alias dkcS='docker-compose restart'
+alias dkcu='docker-compose up'
+alias dkcU='docker-compose up -d'
+alias dkcv='docker-compose version'
+alias dkcx='docker-compose stop'

modules/docker/init.zsh

@@ -0,0 +1,57 @@
+#
+# Defines Docker aliases.
+#
+# Author:
+#   François Vantomme <akarzim@gmail.com>
+#
+
+# Return if requirements are not found.
+if (( ! $+commands[docker] )); then
+  return 1
+fi
+
+#
+# Functions
+#
+
+# Set Docker Machine environment
+function dkme {
+  if (( ! $+commands[docker-machine] )); then
+    return 1
+  fi
+
+  eval $(docker-machine env $1)
+}
+
+# Set Docker Machine default machine
+function dkmd {
+  if (( ! $+commands[docker-machine] )); then
+    return 1
+  fi
+
+  pushd ~/.docker/machine/machines
+
+  if [[ ! -d $1 ]]; then
+    echo "Docker machine '$1' does not exists. Abort."
+    popd
+    return 1
+  fi
+
+  if [[ -L default ]]; then
+    eval $(rm -f default)
+  elif [[ -d default ]]; then
+    echo "A default machine already exists. Abort."
+    popd
+    return 1
+  elif [[ -e default ]]; then
+    echo "A file named 'default' already exists. Abort."
+    popd
+    return 1
+  fi
+
+  eval $(ln -s $1 default)
+  popd
+}
+
+# Source module files.
+source "${0:h}/alias.zsh"

modules/dpkg/README.md

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

modules/dpkg/functions/deb-clone

@@ -6,6 +6,8 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# function deb-clone {
+
 local clone_script="${0}.sh"
 local package_list=$(
   perl \
@@ -24,3 +26,4 @@ print '#!/bin/sh\n' > "$clone_script"
 print "aptitude install ${package_list}\n" >> "$clone_script"
 chmod +x "$clone_script"
 
+# }

modules/dpkg/functions/deb-history

@@ -7,6 +7,8 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# function deb-history {
+
 case "$1" in
   (install)
     zgrep --no-filename 'install ' $(ls -rt /var/log/dpkg*)
@@ -35,3 +37,4 @@ EOF
   ;;
 esac
 
+# }

modules/dpkg/functions/deb-kbuild

@@ -6,6 +6,8 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# function deb-kbuild {
+
 make-kpkg clean
 MAKEFLAGS='' time fakeroot make-kpkg \
   --append-to-version '-custom' \
@@ -13,3 +15,4 @@ MAKEFLAGS='' time fakeroot make-kpkg \
   kernel_image \
   kernel_headers
 
+# }

modules/dpkg/init.zsh

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

modules/editor/README.md

@@ -0,0 +1,99 @@
+Editor
+======
+
+Sets key bindings.
+
+Settings
+--------
+
+### Key bindings
+
+To enable key bindings, add the following to *zpreztorc*, and replace 'bindings'
+with 'emacs' or 'vi'.
+
+```sh
+zstyle ':prezto:module:editor' key-bindings 'bindings'
+```
+
+### Dot Expansion
+
+To enable the auto conversion of .... to ../.., add the following to
+*zpreztorc*.
+
+```sh
+zstyle ':prezto:module:editor' dot-expansion 'yes'
+```
+
+### PS Context
+
+To enable the prompt context to be set, add the following to your
+*zpreztorc*.
+
+```sh
+zstyle ':prezto:module:editor' ps-context 'yes'
+```
+
+Theming
+-------
+
+To indicate when the editor is in the primary keymap (emacs or viins), add
+the following to your `theme_prompt_setup` function.
+
+```sh
+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.
+
+```sh
+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.
+
+```sh
+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.
+
+```sh
+zstyle ':prezto:module:editor:info:keymap:alternate' format '<<<'
+```
+
+To indicate when the editor is completing, add the following to your
+`theme_prompt_setup` function.
+
+```sh
+zstyle ':prezto:module:editor:info:completing' format '...'
+```
+
+Then add `$editor_info[context]`, where context is *keymap*, *insert*, or
+*overwrite*, to `$PROMPT` or `$RPROMPT`.
+
+Convenience Functions
+---------------------
+
+### bindkey-all
+
+Provides a function `bindkey-all` which can be useful for checking how all of the
+keys are bound. Normal `bindkey` command will only list the keys bound for one
+keymap, which is not as useful if you want to grep through the output. The
+keymap's names go to stderr so when you grep through bindkey-all's output you
+will still see the headings and can tell which keymap each binding goes to.
+
+It will also pass through arguments so you can use bindkey-all to set bindings
+for all keymaps at once. If provided arguments it will *not* print out the
+names of each of the keymaps, and just run the command for each keymap.
+
+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

modules/editor/init.zsh

@@ -14,8 +14,7 @@ fi
 # Options
 #
 
-# Beep on error in line editor.
-setopt BEEP
+setopt BEEP                     # Beep on error in line editor.
 
 #
 # Variables
@@ -28,40 +27,44 @@ WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
 zmodload zsh/terminfo
 typeset -gA key_info
 key_info=(
-  'Control'   '\C-'
-  'Escape'    '\e'
-  'Meta'      '\M-'
-  'Backspace' "^?"
-  'Delete'    "^[[3~"
-  'F1'        "$terminfo[kf1]"
-  'F2'        "$terminfo[kf2]"
-  'F3'        "$terminfo[kf3]"
-  'F4'        "$terminfo[kf4]"
-  'F5'        "$terminfo[kf5]"
-  'F6'        "$terminfo[kf6]"
-  'F7'        "$terminfo[kf7]"
-  'F8'        "$terminfo[kf8]"
-  'F9'        "$terminfo[kf9]"
-  'F10'       "$terminfo[kf10]"
-  'F11'       "$terminfo[kf11]"
-  'F12'       "$terminfo[kf12]"
-  'Insert'    "$terminfo[kich1]"
-  'Home'      "$terminfo[khome]"
-  'PageUp'    "$terminfo[kpp]"
-  'End'       "$terminfo[kend]"
-  'PageDown'  "$terminfo[knp]"
-  'Up'        "$terminfo[kcuu1]"
-  'Left'      "$terminfo[kcub1]"
-  'Down'      "$terminfo[kcud1]"
-  'Right'     "$terminfo[kcuf1]"
-  'BackTab'   "$terminfo[kcbt]"
+  'Control'         '\C-'
+  'ControlLeft'     '\e[1;5D \e[5D \e\e[D \eOd'
+  'ControlRight'    '\e[1;5C \e[5C \e\e[C \eOc'
+  'ControlPageUp'   '\e[5;5~'
+  'ControlPageDown' '\e[6;5~'
+  'Escape'       '\e'
+  'Meta'         '\M-'
+  'Backspace'    "^?"
+  'Delete'       "^[[3~"
+  'F1'           "$terminfo[kf1]"
+  'F2'           "$terminfo[kf2]"
+  'F3'           "$terminfo[kf3]"
+  'F4'           "$terminfo[kf4]"
+  'F5'           "$terminfo[kf5]"
+  'F6'           "$terminfo[kf6]"
+  'F7'           "$terminfo[kf7]"
+  'F8'           "$terminfo[kf8]"
+  'F9'           "$terminfo[kf9]"
+  'F10'          "$terminfo[kf10]"
+  'F11'          "$terminfo[kf11]"
+  'F12'          "$terminfo[kf12]"
+  'Insert'       "$terminfo[kich1]"
+  'Home'         "$terminfo[khome]"
+  'PageUp'       "$terminfo[kpp]"
+  'End'          "$terminfo[kend]"
+  'PageDown'     "$terminfo[knp]"
+  'Up'           "$terminfo[kcuu1]"
+  'Left'         "$terminfo[kcub1]"
+  'Down'         "$terminfo[kcud1]"
+  'Right'        "$terminfo[kcuf1]"
+  'BackTab'      "$terminfo[kcbt]"
 )
 
 # Set empty $key_info values to an invalid UTF-8 sequence to induce silent
 # bindkey failure.
 for key in "${(k)key_info[@]}"; do
   if [[ -z "$key_info[$key]" ]]; then
-    key_info["$key"]='<27>'
+    key_info[$key]='<27>'
   fi
 done
 
@@ -76,7 +79,15 @@ zle -N edit-command-line
 #
 # Functions
 #
-
+# Runs bindkey but for all of the keymaps. Running it with no arguments will
+# print out the mappings for all of the keymaps.
+function bindkey-all {
+  local keymap=''
+  for keymap in $(bindkey -l); do
+    [[ "$#" -eq 0 ]] && printf "#### %s\n" "${keymap}" 1>&2
+    bindkey -M "${keymap}" "$@"
+  done
+}
 # Exposes information about the Zsh Line Editor via the $editor_info associative
 # array.
 function editor-info {
@@ -101,37 +112,61 @@ function editor-info {
   fi
 
   unset REPLY
-
-  zle reset-prompt
-  zle -R
+  zle zle-reset-prompt
 }
 zle -N editor-info
 
-# Ensures that $terminfo values are valid and updates editor information when
-# the keymap changes.
-function zle-keymap-select zle-line-init zle-line-finish {
+# Reset the prompt based on the current context and
+# the ps-context option.
+function zle-reset-prompt {
+  if zstyle -t ':prezto:module:editor' ps-context; then
+    # If we aren't within one of the specified contexts, then we want to reset
+    # the prompt with the appropriate editor_info[keymap] if there is one.
+    if [[ $CONTEXT != (select|cont) ]]; then
+      zle reset-prompt
+      zle -R
+    fi
+  else
+    zle reset-prompt
+    zle -R
+  fi
+}
+zle -N zle-reset-prompt
+
+# Updates editor information when the keymap changes.
+function zle-keymap-select {
+  zle editor-info
+}
+zle -N zle-keymap-select
+
+# Enables terminal application mode and updates editor information.
+function zle-line-init {
   # The terminal must be in application mode when ZLE is active for $terminfo
   # values to be valid.
-  if (( $+terminfo[smkx] && $+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
+  if (( $+terminfo[smkx] )); then
+    # Enable terminal application mode.
+    echoti smkx
   fi
 
   # Update editor information.
   zle editor-info
 }
-zle -N zle-keymap-select
-zle -N zle-line-finish
 zle -N zle-line-init
 
+# Disables terminal application mode and updates editor information.
+function zle-line-finish {
+  # The terminal must be in application mode when ZLE is active for $terminfo
+  # values to be valid.
+  if (( $+terminfo[rmkx] )); then
+    # Disable terminal application mode.
+    echoti rmkx
+  fi
+
+  # Update editor information.
+  zle editor-info
+}
+zle -N zle-line-finish
+
 # Toggles emacs overwrite mode and updates editor information.
 function overwrite-mode {
   zle .overwrite-mode
@@ -175,6 +210,14 @@ zle -N expand-dot-to-parent-directory-path
 function expand-or-complete-with-indicator {
   local indicator
   zstyle -s ':prezto:module:editor:info:completing' format 'indicator'
+
+  # This is included to work around a bug in zsh which shows up when interacting
+  # with multi-line prompts.
+  if [[ -z "$indicator" ]]; then
+    zle expand-or-complete
+    return
+  fi
+
   print -Pn "$indicator"
   zle expand-or-complete
   zle redisplay
@@ -190,6 +233,35 @@ function prepend-sudo {
 }
 zle -N prepend-sudo
 
+# Expand aliases
+function glob-alias {
+  zle _expand_alias
+  zle expand-word
+  zle magic-space
+}
+zle -N glob-alias
+
+# Toggle the comment character at the start of the line. This is meant to work
+# around a buggy implementation of pound-insert in zsh.
+#
+# This is currently only used for the emacs keys because vi-pound-insert has
+# been reported to work properly.
+function pound-toggle {
+  if [[ "$BUFFER" = '#'* ]]; then
+    # Because of an oddity in how zsh handles the cursor when the buffer size
+    # changes, we need to make this check before we modify the buffer and let
+    # zsh handle moving the cursor back if it's past the end of the line.
+    if [[ $CURSOR != $#BUFFER ]]; then
+      (( CURSOR -= 1 ))
+    fi
+    BUFFER="${BUFFER:1}"
+  else
+    BUFFER="#$BUFFER"
+    (( CURSOR += 1 ))
+  fi
+}
+zle -N pound-toggle
+
 # Reset to default key bindings.
 bindkey -d
 
@@ -197,10 +269,10 @@ bindkey -d
 # Emacs Key Bindings
 #
 
-for key ("$key_info[Escape]"{B,b}) bindkey -M emacs "$key" emacs-backward-word
-for key ("$key_info[Escape]"{F,f}) bindkey -M emacs "$key" emacs-forward-word
-bindkey -M emacs "$key_info[Escape]$key_info[Left]" emacs-backward-word
-bindkey -M emacs "$key_info[Escape]$key_info[Right]" emacs-forward-word
+for key in "$key_info[Escape]"{B,b} "${(s: :)key_info[ControlLeft]}"
+  bindkey -M emacs "$key" emacs-backward-word
+for key in "$key_info[Escape]"{F,f} "${(s: :)key_info[ControlRight]}"
+  bindkey -M emacs "$key" emacs-forward-word
 
 # Kill to the beginning of the line.
 for key in "$key_info[Escape]"{K,k}
@@ -225,12 +297,18 @@ if (( $+widgets[history-incremental-pattern-search-backward] )); then
     history-incremental-pattern-search-forward
 fi
 
+# Toggle comment at the start of the line. Note that we use pound-toggle which
+# is similar to pount insert, but meant to work around some issues that were
+# being seen in iTerm.
+bindkey -M emacs "$key_info[Escape];" pound-toggle
+
+
 #
 # Vi Key Bindings
 #
 
-# Edit command in an external editor.
-bindkey -M vicmd "v" edit-command-line
+# Edit command in an external editor emacs style (v is used for visual mode)
+bindkey -M vicmd "$key_info[Control]X$key_info[Control]E" edit-command-line
 
 # Undo/Redo
 bindkey -M vicmd "u" undo
@@ -244,14 +322,61 @@ else
   bindkey -M vicmd "/" history-incremental-search-forward
 fi
 
+# Toggle comment at the start of the line.
+bindkey -M vicmd "#" vi-pound-insert
+
 #
 # Emacs and Vi Key Bindings
 #
 
-for keymap in 'emacs' 'viins'; do
+# Unbound keys in vicmd and viins mode will cause really odd things to happen
+# such as the casing of all the characters you have typed changing or other
+# undefined things. In emacs mode they just insert a tilde, but bind these keys
+# in the main keymap to a noop op so if there is no keybind in the users mode
+# it will fall back and do nothing.
+function _prezto-zle-noop {  ; }
+zle -N _prezto-zle-noop
+local -a unbound_keys
+unbound_keys=(
+  "${key_info[F1]}"
+  "${key_info[F2]}"
+  "${key_info[F3]}"
+  "${key_info[F4]}"
+  "${key_info[F5]}"
+  "${key_info[F6]}"
+  "${key_info[F7]}"
+  "${key_info[F8]}"
+  "${key_info[F9]}"
+  "${key_info[F10]}"
+  "${key_info[F11]}"
+  "${key_info[F12]}"
+  "${key_info[PageUp]}"
+  "${key_info[PageDown]}"
+  "${key_info[ControlPageUp]}"
+  "${key_info[ControlPageDown]}"
+)
+for keymap in $unbound_keys; do
+  bindkey -M viins "${keymap}" _prezto-zle-noop
+  bindkey -M vicmd "${keymap}" _prezto-zle-noop
+done
+
+# Keybinds for all keymaps
+for keymap in 'emacs' 'viins' 'vicmd'; do
   bindkey -M "$keymap" "$key_info[Home]" beginning-of-line
   bindkey -M "$keymap" "$key_info[End]" end-of-line
+done
 
+# Keybinds for all vi keymaps
+for keymap in viins vicmd; do
+  # Ctrl + Left and Ctrl + Right bindings to forward/backward word
+  for key in "${(s: :)key_info[ControlLeft]}"
+    bindkey -M "$keymap" "$key" vi-backward-word
+  for key in "${(s: :)key_info[ControlRight]}"
+    bindkey -M "$keymap" "$key" vi-forward-word
+done
+
+# Keybinds for emacs and vi insert mode
+for keymap in 'emacs' 'viins'; do
   bindkey -M "$keymap" "$key_info[Insert]" overwrite-mode
   bindkey -M "$keymap" "$key_info[Delete]" delete-char
   bindkey -M "$keymap" "$key_info[Backspace]" backward-delete-char
@@ -294,8 +419,14 @@ for keymap in 'emacs' 'viins'; do
 
   # Insert 'sudo ' at the beginning of the line.
   bindkey -M "$keymap" "$key_info[Control]X$key_info[Control]S" prepend-sudo
+
+  # control-space expands all aliases, including global
+  bindkey -M "$keymap" "$key_info[Control] " glob-alias
 done
 
+# Delete key deletes character in vimcmd cmd mode instead of weird default functionality
+bindkey -M vicmd "$key_info[Delete]" delete-char
+
 # Do not expand .... to ../.. during incremental search.
 if zstyle -t ':prezto:module:editor' dot-expansion; then
   bindkey -M isearch . self-insert 2> /dev/null
@@ -315,5 +446,4 @@ else
   print "prezto: editor: invalid key bindings: $key_bindings" >&2
 fi
 
-unset key{,map,bindings}
-
+unset key{,map,_bindings}

modules/environment/README.md

@@ -13,14 +13,14 @@ Contributors
 
 This module **MUST NOT** rely on any command not built in Zsh.
 
-Non-interactive environment variables should be defined in *zshenv*.
+Non-interactive environment variables should be defined in [`zshenv`][1].
 
 Authors
 -------
 
-*The authors of this module should be contacted via the [issue tracker][1].*
+*The authors of this module should be contacted via the [issue tracker][2].*
 
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
-[1]: https://github.com/sorin-ionescu/prezto/issues
-
+[1]: https://github.com/sorin-ionescu/prezto/blob/master/runcoms/zshenv
+[2]: https://github.com/sorin-ionescu/prezto/issues

modules/environment/init.zsh

@@ -9,18 +9,34 @@
 # Smart URLs
 #
 
-autoload -Uz url-quote-magic
-zle -N self-insert url-quote-magic
+# This logic comes from an old version of zim. Essentially, bracketed-paste was
+# added as a requirement of url-quote-magic in 5.1, but in 5.1.1 bracketed
+# paste had a regression. Additionally, 5.2 added bracketed-paste-url-magic
+# which is generally better than url-quote-magic so we load that when possible.
+autoload -Uz is-at-least
+if [[ ${ZSH_VERSION} != 5.1.1 ]]; then
+  if is-at-least 5.2; then
+    autoload -Uz bracketed-paste-url-magic
+    zle -N bracketed-paste bracketed-paste-url-magic
+  else
+    if is-at-least 5.1; then
+      autoload -Uz bracketed-paste-magic
+      zle -N bracketed-paste bracketed-paste-magic
+    fi
+  fi
+  autoload -Uz url-quote-magic
+  zle -N self-insert url-quote-magic
+fi
 
 #
 # General
 #
 
-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.
+setopt COMBINING_CHARS      # Combine zero-length punctuation characters (accents)
+                            # with the base character.
+setopt INTERACTIVE_COMMENTS # Enable comments in interactive shell.
+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.
 
 #
 # Jobs
@@ -33,15 +49,6 @@ unsetopt BG_NICE          # Don't run all background jobs at a lower priority.
 unsetopt HUP              # Don't kill jobs on shell exit.
 unsetopt CHECK_JOBS       # Don't report on jobs when shell exit.
 
-#
-# Grep
-#
-
-if zstyle -t ':prezto:environment:grep' color; then
-  export GREP_COLOR='37;45'
-  export GREP_OPTIONS='--color=auto'
-fi
-
 #
 # Termcap
 #
@@ -55,14 +62,3 @@ if zstyle -t ':prezto:environment:termcap' color; then
   export LESS_TERMCAP_ue=$'\E[0m'          # Ends underline.
   export LESS_TERMCAP_us=$'\E[01;32m'      # Begins underline.
 fi
-
-#
-# Paths
-#
-
-# Set the list of directories that man searches for manuals.
-manpath=(
-  ${ZDOTDIR:-$HOME}/.zprezto/documentation/man
-  $manpath
-)
-

modules/fasd/README.md

@@ -12,6 +12,12 @@ module.
 The Prezto Fasd configuration differs from the default. The default aliases have
 been disabled.
 
+Installation
+------------
+
+`fasd` is bundled with prezto as a git submodule. Alternatively, you can manually install `fasd`.
+If a manual install is found, it will be used instead of the bundled version.
+
 Aliases
 -------
 
@@ -36,4 +42,3 @@ Authors
 [3]: https://github.com/rupa/z
 [4]: https://github.com/rupa/v
 [5]: https://github.com/sorin-ionescu/prezto/issues
-

modules/fasd/init.zsh

@@ -9,16 +9,17 @@
 # Load dependencies.
 pmodload 'editor'
 
-# Return if requirements are not found.
+# If the command doesn't exist externally, we need to fall back to the bundled
+# submodule.
 if (( ! $+commands[fasd] )); then
-  return 1
+  source "${0:h}/external/fasd" || return 1
 fi
 
 #
 # Initialization
 #
 
-cache_file="${0:h}/cache.zsh"
+cache_file="${TMPDIR:-/tmp}/prezto-fasd-cache.$UID.zsh"
 if [[ "${commands[fasd]}" -nt "$cache_file" || ! -s "$cache_file"  ]]; then
   # Set the base init arguments.
   init_args=(zsh-hook)
@@ -51,4 +52,3 @@ function fasd_cd {
 
 # Changes the current working directory interactively.
 alias j='fasd_cd -i'
-

modules/git/README.md

@@ -15,20 +15,30 @@ 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
 `--pretty=format:` switch.
 
-    zstyle ':prezto:module:git:log:context' format ''
+```sh
+zstyle ':prezto:module:git:log:context' format ''
+```
 
 ### Status
 
 Retrieving the status of a repository with submodules can take a long time.
 Submodules may be ignored when they are *dirty*, *untracked*, *all*, or *none*.
 
-    zstyle ':prezto:module:git:status:ignore' submodules 'all'
+```sh
+zstyle ':prezto:module:git:status:ignore' submodules 'all'
+```
 
 This setting affects all aliases and functions that call `git-status`.
 
 Aliases
 -------
 
+Aliases are enabled by default. You can disable them with:
+
+```sh
+zstyle ':prezto:module:git:alias' skip 'yes'
+```
+
 ### Git
 
   - `g` is short for `git`.
@@ -37,15 +47,17 @@ Aliases
 
   - `gb` lists, creates, renames, and deletes branches.
   - `gbc` creates a new branch.
-  - `gbl` lists branches and their commits.
-  - `gbL` lists local and remote branches and their commits.
+  - `gbl` lists branches and their commits. (also `gbv`)
+  - `gbL` lists all local and remote branches and their commits.
+  - `gbr` renames a branch. (also `gbm`)
+  - `gbR` renames a branch even if the new branch name already exists. (also
+    `gbM`)
   - `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.
-  - `gbm` renames a branch.
-  - `gbM` renames a branch even if the new branch name already exists.
+  - `gbV` lists branches with more verbose information about their commits.
+  - `gbx` deletes a branch. (also `gbd`)
+  - `gbX` deletes a branch irrespective of its merged status. (also `gbD`)
 
 
 ### Commit
@@ -53,11 +65,16 @@ Aliases
   - `gc` records changes to the repository.
   - `gca` stages all modified and deleted files.
   - `gcm` records changes to the repository with the given message.
+  - `gcS` records changes to the repository. (Signed)
+  - `gcSa` stages all modified and deleted files. (Signed)
+  - `gcSm` records changes to the repository with the given message. (Signed)  - `gco`  checks out a branch or paths to work tree.
+  - `gcam` stages all modified and deleted files, and records changes to the repository with the given message.
   - `gco` checks out a branch or paths to work tree.
   - `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 using the same log message as *HEAD*.
+  - `gcSf` amends the tip of the current branch using the same log message as *HEAD*. (Signed)
   - `gcF` amends the tip of the current branch.
+  - `gcSF` amends the tip of the current branch. (Signed)
   - `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
@@ -89,10 +106,86 @@ Aliases
 ### Fetch
 
   - `gf` downloads objects and references from another repository.
+  - `gfa` downloads objects and references from all remote repositories.
   - `gfc` clones a repository into a new directory.
+  - `gfcr` clones a repository into a new directory including all submodules.
   - `gfm` fetches from and merges with another repository or local branch.
   - `gfr` fetches from and rebases on another repository or local branch.
 
+### Flow
+
+  - `gFi` is short for `git flow init`
+
+#### Feature
+
+  - `gFf` is short for `git flow feature`
+  - `gFfl` is short for `git flow feature list`
+  - `gFfs` is short for `git flow feature start`
+  - `gFff` is short for `git flow feature finish`
+  - `gFfp` is short for `git flow feature publish`
+  - `gFft` is short for `git flow feature track`
+  - `gFfd` is short for `git flow feature diff`
+  - `gFfr` is short for `git flow feature rebase`
+  - `gFfc` is short for `git flow feature checkout`
+  - `gFfm` is short for `git flow feature pull`
+  - `gFfx` is short for `git flow feature delete`
+
+#### Bugfix
+
+  - `gFb` is short for `git flow bugfix`
+  - `gFbl` is short for `git flow bugfix list`
+  - `gFbs` is short for `git flow bugfix start`
+  - `gFbf` is short for `git flow bugfix finish`
+  - `gFbp` is short for `git flow bugfix publish`
+  - `gFbt` is short for `git flow bugfix track`
+  - `gFbd` is short for `git flow bugfix diff`
+  - `gFbr` is short for `git flow bugfix rebase`
+  - `gFbc` is short for `git flow bugfix checkout`
+  - `gFbm` is short for `git flow bugfix pull`
+  - `gFbx` is short for `git flow bugfix delete`
+
+#### Release
+
+  - `gFl` is short for `git flow release`
+  - `gFll` is short for `git flow release list`
+  - `gFls` is short for `git flow release start`
+  - `gFlf` is short for `git flow release finish`
+  - `gFlp` is short for `git flow release publish`
+  - `gFlt` is short for `git flow release track`
+  - `gFld` is short for `git flow release diff`
+  - `gFlr` is short for `git flow release rebase`
+  - `gFlc` is short for `git flow release checkout`
+  - `gFlm` is short for `git flow release pull`
+  - `gFlx` is short for `git flow release delete`
+
+#### Hotfix
+
+  - `gFh` is short for `git flow hotfix`
+  - `gFhl` is short for `git flow hotfix list`
+  - `gFhs` is short for `git flow hotfix start`
+  - `gFhf` is short for `git flow hotfix finish`
+  - `gFhp` is short for `git flow hotfix publish`
+  - `gFht` is short for `git flow hotfix track`
+  - `gFhd` is short for `git flow hotfix diff`
+  - `gFhr` is short for `git flow hotfix rebase`
+  - `gFhc` is short for `git flow hotfix checkout`
+  - `gFhm` is short for `git flow hotfix pull`
+  - `gFhx` is short for `git flow hotfix delete`
+
+#### Support
+
+  - `gFs` is short for `git flow support`
+  - `gFsl` is short for `git flow support list`
+  - `gFss` is short for `git flow support start`
+  - `gFsf` is short for `git flow support finish`
+  - `gFsp` is short for `git flow support publish`
+  - `gFst` is short for `git flow support track`
+  - `gFsd` is short for `git flow support diff`
+  - `gFsr` is short for `git flow support rebase`
+  - `gFsc` is short for `git flow support checkout`
+  - `gFsm` is short for `git flow support pull`
+  - `gFsx` is short for `git flow support delete`
+
 ### Grep
 
   - `gg` displays lines matching a pattern.
@@ -109,6 +202,8 @@ 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).
+  - `gii` temporarily ignore differences in a given file.
+  - `giI` unignore differences in a given file.
   - `gir` resets the current HEAD to the specified state.
   - `giR` resets the current index interactively.
   - `gix` removes files/directories from the index (recursively).
@@ -214,6 +309,7 @@ The following aliases may shadow system commands:
 
   - `gpt` shadows the [GUID partition table maintenance utility][4].
   - `gs` shadows the [Ghostscript][5].
+  - `gb` shadows the [GB][9].
 
 If you frequently use the above commands, you may wish to remove said aliases
 from this module or to disable them at the bottom of the zshrc with `unalias`.
@@ -228,7 +324,7 @@ Functions
   - `git-commit-lost` lists lost commits.
   - `git-dir` displays the path to the Git directory.
   - `git-hub-browse` opens the [GitHub][3] repository in the default browser.
-  - `git-hub-shorten-url` shortens GitHub URLs.
+  - `git-hub-shorten-url` shortens [GitHub URLs][10].
   - `git-info` exposes repository information via the `$git_info` associative
     array.
   - `git-root` displays the path to the working tree root.
@@ -245,7 +341,9 @@ To display information about the current repository in a prompt, define the
 following styles in the `prompt_name_setup` function, where the syntax for
 setting a style is as follows.
 
-    zstyle ':prezto:module:git:info:context:subcontext' format 'string'
+```sh
+zstyle ':prezto:module:git:info:context:subcontext' format 'string'
+```
 
 ### Main Contexts
 
@@ -272,7 +370,9 @@ setting a style is as follows.
 
 The following contexts must be enabled with the following zstyle:
 
-    zstyle ':prezto:module:git:info' verbose 'yes'
+```sh
+zstyle ':prezto:module:git:info' verbose 'yes'
+```
 
 ### Verbose Contexts
 
@@ -299,18 +399,24 @@ The following contexts must be enabled with the following zstyle:
 | rebase               |    value    | Rebasing
 | rebase-interactive   |    value    | Rebasing interactively
 | rebase-merge         |    value    | Rebasing merge
+| revert               |    value    | Reverting
+| revert-sequence      |    value    | Reverting sequence
 
 First, format the repository state attributes. For example, to format the branch
 and remote names, define the following styles.
 
-    zstyle ':prezto:module:git:info:branch' format 'branch:%b'
-    zstyle ':prezto:module:git:info:remote' format 'remote:%R'
+```sh
+zstyle ':prezto:module:git:info:branch' format 'branch:%b'
+zstyle ':prezto:module:git:info:remote' format 'remote:%R'
+```
 
 Second, format how the above attributes are displayed in prompts.
 
-    zstyle ':prezto:module:git:info:keys' format \
-      'prompt'  ' git(%b)' \
-      'rprompt' '[%R]'
+```sh
+zstyle ':prezto:module:git:info:keys' format \
+  'prompt'  ' git(%b)' \
+  'rprompt' '[%R]'
+```
 
 Last, add `$git_info[prompt]` to `$PROMPT` and `$git_info[rprompt]` to
 `$RPROMPT` respectively and call `git-info` in the `prompt_name_preexec` hook
@@ -332,4 +438,5 @@ Authors
 [6]: https://github.com/sorin-ionescu/prezto/issues
 [7]: https://github.com/sorin-ionescu/prezto/issues/219
 [8]: http://www.kernel.org/pub/software/scm/git/docs/git-log.html
-
+[9]: https://getgb.io/
+[10]: https://github.com/blog/985-git-io-github-url-shortener

modules/git/alias.zsh

@@ -26,157 +26,239 @@ zstyle -s ':prezto:module:git:status:ignore' submodules '_git_status_ignore_subm
 # Aliases
 #
 
-# Git
-alias g='git'
+if ! zstyle -t ':prezto:module:git:alias' skip 'yes'; then
+  # Git
+  alias g='git'
 
-# Branch (b)
-alias gb='git branch'
-alias gbc='git checkout -b'
-alias gbl='git branch -v'
-alias gbL='git branch -av'
-alias gbx='git branch -d'
-alias gbX='git branch -D'
-alias gbm='git branch -m'
-alias gbM='git branch -M'
-alias gbs='git show-branch'
-alias gbS='git show-branch -a'
+  # Branch (b)
+  alias gb='git branch'
+  alias gba='git branch --all --verbose'
+  alias gbc='git checkout -b'
+  alias gbd='git branch --delete'
+  alias gbD='git branch --delete --force'
+  alias gbl='git branch --verbose'
+  alias gbL='git branch --all --verbose'
+  alias gbm='git branch --move'
+  alias gbM='git branch --move --force'
+  alias gbr='git branch --move'
+  alias gbR='git branch --move --force'
+  alias gbs='git show-branch'
+  alias gbS='git show-branch --all'
+  alias gbv='git branch --verbose'
+  alias gbV='git branch --verbose --verbose'
+  alias gbx='git branch --delete'
+  alias gbX='git branch --delete --force'
 
-# Commit (c)
-alias gc='git commit --verbose'
-alias gca='git commit --verbose --all'
-alias gcm='git commit --message'
-alias gco='git checkout'
-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'
-alias gcR='git reset "HEAD^"'
-alias gcs='git show'
-alias gcl='git-commit-lost'
+  # Commit (c)
+  alias gc='git commit --verbose'
+  alias gca='git commit --verbose --all'
+  alias gcm='git commit --message'
+  alias gcS='git commit -S --verbose'
+  alias gcSa='git commit -S --verbose --all'
+  alias gcSm='git commit -S --message'
+  alias gcam='git commit --all --message'
+  alias gco='git checkout'
+  alias gcO='git checkout --patch'
+  alias gcf='git commit --amend --reuse-message HEAD'
+  alias gcSf='git commit -S --amend --reuse-message HEAD'
+  alias gcF='git commit --verbose --amend'
+  alias gcSF='git commit -S --verbose --amend'
+  alias gcp='git cherry-pick --ff'
+  alias gcP='git cherry-pick --no-commit'
+  alias gcr='git revert'
+  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)'
+  # Conflict (C)
+  alias gCl='git --no-pager diff --name-only --diff-filter=U'
+  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'
-alias gdx='git ls-files --deleted'
-alias gdm='git ls-files --modified'
-alias gdu='git ls-files --other --exclude-standard'
-alias gdk='git ls-files --killed'
-alias gdi='git status --porcelain --short --ignored | sed -n "s/^!! //p"'
+  # Data (d)
+  alias gd='git ls-files'
+  alias gdc='git ls-files --cached'
+  alias gdx='git ls-files --deleted'
+  alias gdm='git ls-files --modified'
+  alias gdu='git ls-files --other --exclude-standard'
+  alias gdk='git ls-files --killed'
+  alias gdi='git status --porcelain --short --ignored | sed -n "s/^!! //p"'
 
-# Fetch (f)
-alias gf='git fetch'
-alias gfc='git clone'
-alias gfm='git pull'
-alias gfr='git pull --rebase'
+  # Fetch (f)
+  alias gf='git fetch'
+  alias gfa='git fetch --all'
+  alias gfc='git clone'
+  alias gfcr='git clone --recurse-submodules'
+  alias gfm='git pull'
+  alias gfr='git pull --rebase'
 
-# Grep (g)
-alias gg='git grep'
-alias ggi='git grep --ignore-case'
-alias ggl='git grep --files-with-matches'
-alias ggL='git grep --files-without-matches'
-alias ggv='git grep --invert-match'
-alias ggw='git grep --word-regexp'
+  # Flow (F)
+  alias gFi='git flow init'
+  alias gFf='git flow feature'
+  alias gFb='git flow bugfix'
+  alias gFl='git flow release'
+  alias gFh='git flow hotfix'
+  alias gFs='git flow support'
 
-# Index (i)
-alias gia='git add'
-alias giA='git add --patch'
-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 --patch'
-alias gix='git rm -r --cached'
-alias giX='git rm -rf --cached'
+  alias gFfl='git flow feature list'
+  alias gFfs='git flow feature start'
+  alias gFff='git flow feature finish'
+  alias gFfp='git flow feature publish'
+  alias gFft='git flow feature track'
+  alias gFfd='git flow feature diff'
+  alias gFfr='git flow feature rebase'
+  alias gFfc='git flow feature checkout'
+  alias gFfm='git flow feature pull'
+  alias gFfx='git flow feature delete'
 
-# 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}'
-alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:${_git_log_medium_format}'
-alias glo='git log --topo-order --pretty=format:${_git_log_oneline_format}'
-alias glg='git log --topo-order --all --graph --pretty=format:${_git_log_oneline_format}'
-alias glb='git log --topo-order --pretty=format:${_git_log_brief_format}'
-alias glc='git shortlog --summary --numbered'
+  alias gFbl='git flow bugfix list'
+  alias gFbs='git flow bugfix start'
+  alias gFbf='git flow bugfix finish'
+  alias gFbp='git flow bugfix publish'
+  alias gFbt='git flow bugfix track'
+  alias gFbd='git flow bugfix diff'
+  alias gFbr='git flow bugfix rebase'
+  alias gFbc='git flow bugfix checkout'
+  alias gFbm='git flow bugfix pull'
+  alias gFbx='git flow bugfix delete'
 
-# Merge (m)
-alias gm='git merge'
-alias gmC='git merge --no-commit'
-alias gmF='git merge --no-ff'
-alias gma='git merge --abort'
-alias gmt='git mergetool'
+  alias gFll='git flow release list'
+  alias gFls='git flow release start'
+  alias gFlf='git flow release finish'
+  alias gFlp='git flow release publish'
+  alias gFlt='git flow release track'
+  alias gFld='git flow release diff'
+  alias gFlr='git flow release rebase'
+  alias gFlc='git flow release checkout'
+  alias gFlm='git flow release pull'
+  alias gFlx='git flow release delete'
 
-# Push (p)
-alias gp='git push'
-alias gpf='git push --force'
-alias gpa='git push --all'
-alias gpA='git push --all && git push --tags'
-alias gpt='git push --tags'
-alias gpc='git push --set-upstream origin "$(git-branch-current 2> /dev/null)"'
-alias gpp='git pull origin "$(git-branch-current 2> /dev/null)" && git push origin "$(git-branch-current 2> /dev/null)"'
+  alias gFhl='git flow hotfix list'
+  alias gFhs='git flow hotfix start'
+  alias gFhf='git flow hotfix finish'
+  alias gFhp='git flow hotfix publish'
+  alias gFht='git flow hotfix track'
+  alias gFhd='git flow hotfix diff'
+  alias gFhr='git flow hotfix rebase'
+  alias gFhc='git flow hotfix checkout'
+  alias gFhm='git flow hotfix pull'
+  alias gFhx='git flow hotfix delete'
 
-# Rebase (r)
-alias gr='git rebase'
-alias gra='git rebase --abort'
-alias grc='git rebase --continue'
-alias gri='git rebase --interactive'
-alias grs='git rebase --skip'
+  alias gFsl='git flow support list'
+  alias gFss='git flow support start'
+  alias gFsf='git flow support finish'
+  alias gFsp='git flow support publish'
+  alias gFst='git flow support track'
+  alias gFsd='git flow support diff'
+  alias gFsr='git flow support rebase'
+  alias gFsc='git flow support checkout'
+  alias gFsm='git flow support pull'
+  alias gFsx='git flow support delete'
 
-# Remote (R)
-alias gR='git remote'
-alias gRl='git remote --verbose'
-alias gRa='git remote add'
-alias gRx='git remote rm'
-alias gRm='git remote rename'
-alias gRu='git remote update'
-alias gRp='git remote prune'
-alias gRs='git remote show'
-alias gRb='git-hub-browse'
+  # Grep (g)
+  alias gg='git grep'
+  alias ggi='git grep --ignore-case'
+  alias ggl='git grep --files-with-matches'
+  alias ggL='git grep --files-without-matches'
+  alias ggv='git grep --invert-match'
+  alias ggw='git grep --word-regexp'
 
-# Stash (s)
-alias gs='git stash'
-alias gsa='git stash apply'
-alias gsx='git stash drop'
-alias gsX='git-stash-clear-interactive'
-alias gsl='git stash list'
-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'
-alias gsS='git stash save --patch --no-keep-index'
-alias gsw='git stash save --include-untracked --keep-index'
+  # Index (i)
+  alias gia='git add'
+  alias giA='git add --patch'
+  alias giu='git add --update'
+  alias gid='git diff --no-ext-diff --cached'
+  alias giD='git diff --no-ext-diff --cached --word-diff'
+  alias gii='git update-index --assume-unchanged'
+  alias giI='git update-index --no-assume-unchanged'
+  alias gir='git reset'
+  alias giR='git reset --patch'
+  alias gix='git rm -r --cached'
+  alias giX='git rm -rf --cached'
 
-# Submodule (S)
-alias gS='git submodule'
-alias gSa='git submodule add'
-alias gSf='git submodule foreach'
-alias gSi='git submodule init'
-alias gSI='git submodule update --init --recursive'
-alias gSl='git submodule status'
-alias gSm='git-submodule-move'
-alias gSs='git submodule sync'
-alias gSu='git submodule foreach git pull origin master'
-alias gSx='git-submodule-remove'
+  # 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}"'
+  alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:"${_git_log_medium_format}"'
+  alias glo='git log --topo-order --pretty=format:"${_git_log_oneline_format}"'
+  alias glg='git log --topo-order --all --graph --pretty=format:"${_git_log_oneline_format}"'
+  alias glb='git log --topo-order --pretty=format:"${_git_log_brief_format}"'
+  alias glc='git shortlog --summary --numbered'
 
-# Working Copy (w)
-alias gws='git status --ignore-submodules=${_git_status_ignore_submodules} --short'
-alias gwS='git status --ignore-submodules=${_git_status_ignore_submodules}'
-alias gwd='git diff --no-ext-diff'
-alias gwD='git diff --no-ext-diff --word-diff'
-alias gwr='git reset --soft'
-alias gwR='git reset --hard'
-alias gwc='git clean -n'
-alias gwC='git clean -f'
-alias gwx='git rm -r'
-alias gwX='git rm -rf'
+  # Merge (m)
+  alias gm='git merge'
+  alias gmC='git merge --no-commit'
+  alias gmF='git merge --no-ff'
+  alias gma='git merge --abort'
+  alias gmt='git mergetool'
 
+  # Push (p)
+  alias gp='git push'
+  alias gpf='git push --force-with-lease'
+  alias gpF='git push --force'
+  alias gpa='git push --all'
+  alias gpA='git push --all && git push --tags'
+  alias gpt='git push --tags'
+  alias gpc='git push --set-upstream origin "$(git-branch-current 2> /dev/null)"'
+  alias gpp='git pull origin "$(git-branch-current 2> /dev/null)" && git push origin "$(git-branch-current 2> /dev/null)"'
+
+  # Rebase (r)
+  alias gr='git rebase'
+  alias gra='git rebase --abort'
+  alias grc='git rebase --continue'
+  alias gri='git rebase --interactive'
+  alias grs='git rebase --skip'
+
+  # Remote (R)
+  alias gR='git remote'
+  alias gRl='git remote --verbose'
+  alias gRa='git remote add'
+  alias gRx='git remote rm'
+  alias gRm='git remote rename'
+  alias gRu='git remote update'
+  alias gRp='git remote prune'
+  alias gRs='git remote show'
+  alias gRb='git-hub-browse'
+
+  # Stash (s)
+  alias gs='git stash'
+  alias gsa='git stash apply'
+  alias gsx='git stash drop'
+  alias gsX='git-stash-clear-interactive'
+  alias gsl='git stash list'
+  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'
+  alias gsS='git stash save --patch --no-keep-index'
+  alias gsw='git stash save --include-untracked --keep-index'
+
+  # Submodule (S)
+  alias gS='git submodule'
+  alias gSa='git submodule add'
+  alias gSf='git submodule foreach'
+  alias gSi='git submodule init'
+  alias gSI='git submodule update --init --recursive'
+  alias gSl='git submodule status'
+  alias gSm='git-submodule-move'
+  alias gSs='git submodule sync'
+  alias gSu='git submodule foreach git pull origin master'
+  alias gSx='git-submodule-remove'
+
+  # Working Copy (w)
+  alias gws='git status --ignore-submodules=${_git_status_ignore_submodules} --short'
+  alias gwS='git status --ignore-submodules=${_git_status_ignore_submodules}'
+  alias gwd='git diff --no-ext-diff'
+  alias gwD='git diff --no-ext-diff --word-diff'
+  alias gwr='git reset --soft'
+  alias gwR='git reset --hard'
+  alias gwc='git clean -n'
+  alias gwC='git clean -f'
+  alias gwx='git rm -r'
+  alias gwX='git rm -rf'
+fi

modules/git/functions/_git-hub-browse

@@ -29,7 +29,7 @@ case "$state" in
     remote="$words[(($CURRENT - 1))]"
 
     branches_or_tags=($(
-      git ls-remote --heads --tags "$remote" 2>/dev/null | cut -f2
+      git ls-remote --heads --tags "$remote" 2> /dev/null | cut -f2
     ))
 
     branches=(HEAD ${${(M)branches_or_tags[@]##refs/heads/?##}##refs/heads/})
@@ -39,10 +39,9 @@ case "$state" in
     _describe -t tag 'tags' tags && ret=0
   ;;
   (file)
-    files=(${(0)"$(_call_program files git ls-files -z --exclude-standard 2>/dev/null)"})
+    files=(${(0)"$(_call_program files git ls-files -z --exclude-standard 2> /dev/null)"})
     _wanted file expl 'file' _multi_parts - / files && ret=0
   ;;
 esac
 
 return $ret
-

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

@@ -8,5 +8,9 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-_arguments '1:url:' && return 0
+local service="$service"
 
+zstyle ":completion:*:${service}:*:prefixes" ignored-patterns '^http(|s)://'
+zstyle ":completion:*:${service}:*:hosts" ignored-patterns '^*github.com'
+
+_arguments '1::GitHub URL:_urls' '2::code:' && return 0

modules/git/functions/_git-info

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

modules/git/functions/_git-submodule-move

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

modules/git/functions/_git-submodule-remove

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

modules/git/functions/git-branch-current

@@ -5,6 +5,8 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# function git-branch-current {
+
 if ! git rev-parse 2> /dev/null; then
   print "$0: not a repository: $PWD" >&2
   return 1
@@ -19,3 +21,4 @@ else
   return 1
 fi
 
+# }

modules/git/functions/git-commit-lost

@@ -5,6 +5,8 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# function git-commit-lost {
+
 if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
   print "$0: not a repository work tree: $PWD" >&2
   return 1
@@ -19,3 +21,4 @@ git fsck 2> /dev/null \
       --stdin \
       --pretty=format:${_git_log_oneline_format}
 
+# }

modules/git/functions/git-dir

@@ -5,6 +5,8 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# function git-dir {
+
 local git_dir="${$(git rev-parse --git-dir):A}"
 
 if [[ -n "$git_dir" ]]; then
@@ -15,3 +17,4 @@ else
   return 1
 fi
 
+# }

modules/git/functions/git-hub-browse

@@ -5,6 +5,8 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# function git-hub-browse {
+
 if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
   print "$0: not a repository work tree: $PWD" >&2
   return 1
@@ -37,7 +39,7 @@ if (( $references[(i)$reference] == $#references + 1 )); then
 fi
 
 if [[ "$reference" == 'HEAD' ]]; then
-  reference="$(git rev-parse HEAD 2>/dev/null)"
+  reference="$(git rev-parse HEAD 2> /dev/null)"
 fi
 
 file="$3"
@@ -57,3 +59,4 @@ else
   return 1
 fi
 
+# }

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

@@ -5,19 +5,24 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-local url="$1"
+# function git-hub-shorten-url {
+
+local url="$1" code="$2"
 
 if [[ "$url" == '-' ]]; then
   read url <&0
 fi
 
-if [[ -z "$url" ]]; then
-  print "usage: $0 [ url | - ]" >&2
+if [[ -z "$url" || ! "$url" =~ ^https?:\/\/.*github.com\/ ]]; then
+  print "usage: $0 [ url | - ] [code] ; url must be a github.com URL" >&2
+  return 1
 fi
 
 if (( $+commands[curl] )); then
-  curl -s -i 'http://git.io' -F "url=$url" | grep 'Location:' | sed 's/Location: //'
+  curl -s -i 'https://git.io' -F "url=$url" ${(s: :)code:+ -F "code=$code"} | sed -n 's/^Location: //p'
 else
   print "$0: command not found: curl" >&2
+  return 1
 fi
 
+# }

modules/git/functions/git-info

@@ -5,7 +5,7 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-# Gets the Git special action (am, bisect, cherry, merge, rebase).
+# Gets the Git special action (am, bisect, cherry, merge, rebase, revert).
 # Borrowed from vcs_info and edited.
 function _git-action {
   local action_dir
@@ -18,6 +18,8 @@ function _git-action {
   local rebase_formatted
   local rebase_interactive_formatted
   local rebase_merge_formatted
+  local revert_formatted
+  local revert_sequence_formatted
 
   for action_dir in \
     "${git_dir}/rebase-apply" \
@@ -80,6 +82,18 @@ function _git-action {
     return 0
   fi
 
+  if [[ -f "${git_dir}/REVERT_HEAD" ]]; then
+    if [[ -d "${git_dir}/sequencer" ]] ; then
+      zstyle -s ':prezto:module:git:info:action:revert-sequence' format 'revert_sequence_formatted' || revert_sequence_formatted='revert-sequence'
+      print "$revert_sequence_formatted"
+    else
+      zstyle -s ':prezto:module:git:info:action:revert' format 'revert_formatted' || revert_formatted='revert'
+      print "$revert_formatted"
+    fi
+
+    return 0
+  fi
+
   if [[ -f "${git_dir}/BISECT_LOG" ]]; then
     zstyle -s ':prezto:module:git:info:action:bisect' format 'bisect_formatted' || bisect_formatted='bisect'
     print "$bisect_formatted"
@@ -348,13 +362,13 @@ function git-info {
     # Format added.
     if (( added > 0 )); then
       zstyle -s ':prezto:module:git:info:added' format 'added_format'
-      zformat -f added_formatted "$added_format" "a:$added_format"
+      zformat -f added_formatted "$added_format" "a:$added"
     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"
+      zformat -f deleted_formatted "$deleted_format" "d:$deleted"
     fi
 
     # Format modified.
@@ -421,4 +435,3 @@ function git-info {
 }
 
 git-info "$@"
-

modules/git/functions/git-root

@@ -5,6 +5,8 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# function git-root {
+
 local root="$(git rev-parse --show-toplevel 2> /dev/null)"
 
 if [[ -n "$root" ]]; then
@@ -15,3 +17,4 @@ else
   return 1
 fi
 
+# }

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

@@ -5,6 +5,8 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# function git-stash-clear-interactive {
+
 if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
   print "$0: not a repository work tree: $PWD" >&2
   return 1
@@ -21,3 +23,4 @@ if [[ -f "$(git-dir)/refs/stash" ]]; then
   fi
 fi
 
+# }

modules/git/functions/git-stash-dropped

@@ -5,6 +5,8 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# function git-stash-dropped {
+
 if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
   print "$0: not a repository work tree: $PWD" >&2
   return 1
@@ -21,3 +23,4 @@ git fsck --unreachable 2> /dev/null \
       --no-walk \
       --stdin
 
+# }

modules/git/functions/git-stash-recover

@@ -5,6 +5,8 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# function git-stash-recover {
+
 if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
   print "$0: not a repository work tree: $PWD" >&2
   return 1
@@ -17,3 +19,4 @@ for commit in "$@"; do
     -m "$(git log -1 --pretty="format:%s" "$commit")" refs/stash "$commit"
 done
 
+# }