Merge remote-tracking branch 'upstream/master'

* upstream/master: (56 commits)
  Replace table captions with headings
  Replace z with fasd in modules README
  [Fix sorin-ionescu#244] Add Git special action styles
  Simplify git-log zstyle documentation
  Fix the name of the theme setup function in READMEs
  [Fix sorin-ionescu#96] Add documentation for git
  Add zstyles for git-log formats
  Rename gk prefixed aliases to gC
  Rename git-info zstyle patterns
  Rename python-info zstyle patterns
  Rename ruby-info zstyle patterns
  Rename editor-info zstyle patterns
  Rename the Git status ignore submodules zstyle pattern
  Rename aliases gSu to gSI and gSU to gSu
  Rename the alias gsc to gsX
  Remove the gig alias
  Fix SSH-Agent casing in README
  [Fix sorin-ionescu#300] Disable SSH-Agent protocol emulation by default
  Update external completions
  [Fix sorin-ionescu#129, Fix sorin-ionescu#211] Add fasd
  ...

.gitmodules

@@ -7,6 +7,3 @@
 [submodule "modules/completion/external"]
 	path = modules/completion/external
 	url = https://github.com/zsh-users/zsh-completions.git
-[submodule "modules/z/external"]
-	path = modules/z/external
-	url = https://github.com/rupa/z.git

CONTRIBUTING.md

@@ -0,0 +1,42 @@
+Contributing
+------------
+
+This project would not exist without all of its users and [contributors][1].
+
+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][2].
+   - Use a topic branch to easily amend a pull request later, if necessary.
+   - Write [good commit messages][3].
+   - Squash commits on the topic branch before opening a pull request.
+   - Use the same coding style and spacing.
+   - Open a [pull request][4] that relates to but one subject with a clear
+     title and description in grammatically correct, complete sentences.
+
+#### Modules
+
+   - A *README.md* 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][5].
+
+[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
+

README.md

@@ -91,43 +91,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
-
-   - A *README.md* 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
 -------
 
@@ -154,16 +117,11 @@ 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/ij8Lv.png "sorin theme"
+[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

@@ -47,7 +47,7 @@ function pmodload {
 
   # Load Prezto modules.
   for pmodule in "$pmodules[@]"; do
-    if zstyle -t ":prezto:module:$pmodule" loaded; then
+    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

modules/README.md

@@ -0,0 +1,169 @@
+Modules
+=======
+
+Load modules in *zpreztorc*. The order matters.
+
+    zstyle ':prezto:load' pmodule 'environment' 'terminal'
+
+Archive
+-------
+
+Provides functions to extract and list popular archive formats.
+
+Command-Not-Found
+-----------------
+
+Loads the command-not-found tool on Debian-based distributions.
+
+Completion
+----------
+
+Loads and configures tab completion and provides additional completions from
+the zsh-completions project.
+
+Directory
+---------
+
+Sets directory options and defines directory aliases.
+
+Dpkg
+----
+
+Defines dpkg aliases and functions.
+
+Environment
+-----------
+
+Sets general shell options and defines environment variables.
+
+Fasd
+----
+
+Maintains a frequently used file and directory list for fast access.
+
+GNU Utility
+-----------
+
+Provides for the interactive use of GNU utilities on non-GNU systems.
+
+GPG-Agent
+---------
+
+Provides for an easier use of gpg-agent.
+
+Haskell
+-------
+
+Enables local Haskell package installation.
+
+Helper
+------
+
+Provides helper functions for developing modules.
+
+History Substring Search
+------------------------
+
+Integrates zsh-history-substring-search into Prezto.
+
+History
+-------
+
+Sets history options and defines history aliases.
+
+Macports
+--------
+
+Defines MacPorts aliases and adds MacPorts directories to path variables.
+
+Node.js
+-------
+
+Provides utility functions for Node.js and loads npm completion.
+
+OSX
+---
+
+Defines Mac OS X aliases and functions.
+
+Pacman
+------
+
+Provides aliases and functions for the Pacman package manager and frontends.
+
+Perl
+----
+
+Enables local Perl module installation on Mac OS X and defines alises.
+
+Prompt
+------
+
+Loads prompt themes.
+
+Python
+------
+
+Enables local Python and local Python package installation.
+
+Ruby on Rails
+-------------
+
+Defines Ruby on Rails aliases.
+
+Rsync
+-----
+
+Defines rsync aliases.
+
+Ruby
+----
+
+Configures Ruby local gem installation, loads version managers, and defines
+aliases.
+
+GNU Screen
+----------
+
+Defines GNU Screen aliases and provides for auto launching it at start-up.
+
+Spectrum
+--------
+
+Provides for easier use of 256 colors and effects.
+
+SSH-Agent
+---------
+
+Provides for an easier use of ssh-agent.
+
+Syntax Highlighting
+-------------------
+
+Integrates zsh-syntax-highlighting into Prezto.
+
+Terminal
+--------
+
+Sets terminal window and tab titles.
+
+Tmux
+----
+
+Defines tmux aliases and provides for auto launching it at start-up.
+
+Utility
+-------
+
+Defines general aliases and functions.
+
+Wake-on-LAN
+-----------
+
+This module provides a wrapper around the wakeonlan tool.
+
+Yum
+---
+
+Defines yum aliases.
+

modules/editor/init.zsh

@@ -18,27 +18,27 @@
 #   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:keymap' primary '>>>'
+#     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:keymap:primary' insert 'I'
+#     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:keymap:primary' overwrite 'O'
+#     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:keymap' alternate '<<<'
+#     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' completing '...'
+#     zstyle ':prezto:module:editor:info:completing' format '...'
 #
 
 # Return if requirements are not found.
@@ -53,10 +53,6 @@ fi
 # Beep on error in line editor.
 setopt BEEP
 
-# Allow command line editing in an external editor.
-autoload -Uz edit-command-line
-zle -N edit-command-line
-
 #
 # Variables
 #
@@ -95,13 +91,22 @@ key_info=(
 )
 
 # Do not bind any keys if there are empty values in $key_info.
-for key in "$key_info[@]"; do
-  if [[ -z "$key" ]]; then
+for key in "${(k)key_info[@]}"; do
+  if [[ -z "$key_info[$key]" ]]; then
     print "prezto: one or more keys are non-bindable" >&2
+    unset key{,_info}
     return 1
   fi
 done
 
+#
+# External Editor
+#
+
+# Allow command line editing in an external editor.
+autoload -Uz edit-command-line
+zle -N edit-command-line
+
 #
 # Functions
 #
@@ -114,17 +119,17 @@ function editor-info {
   typeset -gA editor_info
 
   if [[ "$KEYMAP" == 'vicmd' ]]; then
-    zstyle -s ':prezto:module:editor:keymap' alternate 'REPLY'
+    zstyle -s ':prezto:module:editor:info:keymap:alternate' format 'REPLY'
     editor_info[keymap]="$REPLY"
   else
-    zstyle -s ':prezto:module:editor:keymap' primary 'REPLY'
+    zstyle -s ':prezto:module:editor:info:keymap:primary' format 'REPLY'
     editor_info[keymap]="$REPLY"
 
     if [[ "$ZLE_STATE" == *overwrite* ]]; then
-      zstyle -s ':prezto:module:editor:keymap:primary' overwrite 'REPLY'
+      zstyle -s ':prezto:module:editor:info:keymap:primary:overwrite' format 'REPLY'
       editor_info[overwrite]="$REPLY"
     else
-      zstyle -s ':prezto:module:editor:keymap:primary' insert 'REPLY'
+      zstyle -s ':prezto:module:editor:info:keymap:primary:insert' format 'REPLY'
       editor_info[overwrite]="$REPLY"
     fi
   fi
@@ -186,7 +191,7 @@ zle -N expand-dot-to-parent-directory-path
 # Displays an indicator when completing.
 function expand-or-complete-with-indicator {
   local indicator
-  zstyle -s ':prezto:module:editor' completing 'indicator'
+  zstyle -s ':prezto:module:editor:info:completing' format 'indicator'
   print -Pn "$indicator"
   zle expand-or-complete
   zle redisplay