Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Set WORDCHARS in the editor module
  [Fix sorin-ionescu#422] Revert "Remove no longer necessary key bindings"
  Update external history-substring-search
  Sort Git conflict aliases
  [Fix sorin-ionescu#403] Display accented characters properly
  Correct typos in git module README
  Wrap errant long line in git module README
  Fix misspellings of the word bellow in READMEs
  Remove no longer necessary key bindings
  Update external history-substring-search
  Update external syntax-highlighting
  Update external completions
  [Fix sorin-ionescu#399] Only enable the main syntax highlighter
  Use the builtin $signals array
  Add Emacs module
  [Fix sorin-ionescu#396] Remove the osx trash function
  [Fix sorin-ionescu#398] Manually set locale

Conflicts:
	runcoms/zpreztorc

modules/completion/init.zsh

@@ -30,9 +30,6 @@ setopt AUTO_PARAM_SLASH    # If completed parameter is a directory, add a traili
 unsetopt MENU_COMPLETE     # Do not autoselect the first completion entry.
 unsetopt FLOW_CONTROL      # Disable start/stop characters in shell editor.
 
-# Treat these characters as part of a word.
-WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
-
 #
 # Styles
 #

modules/editor/init.zsh

@@ -57,6 +57,9 @@ setopt BEEP
 # Variables
 #
 
+# Treat these characters as part of a word.
+WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
+
 # Use human-friendly identifiers.
 zmodload zsh/terminfo
 typeset -gA key_info

modules/emacs/README.md

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

modules/emacs/init.zsh

@@ -0,0 +1,15 @@
+#
+# Configures Emacs dependency management.
+#
+# Authors: Sebastian Wiesner <[email protected]>
+#
+
+# Enable Carton
+if [[ -d "$HOME/.carton" ]]; then
+    path=($HOME/.carton/bin $path)
+
+    alias cai='carton install'
+    alias cau='carton update'
+    alias caI='carton init'
+    alias cae='carton exec'
+fi

modules/environment/init.zsh

@@ -17,6 +17,8 @@ zle -N self-insert url-quote-magic
 #
 
 setopt BRACE_CCL          # Allow brace character class list expansion.
+setopt COMBINING_CHARS    # Combine zero-length punctuation characters (accents)
+                          # with the base character.
 setopt RC_QUOTES          # Allow 'Henry''s Garage' instead of 'Henry'\''s Garage'.
 unsetopt MAIL_WARNING     # Don't print a warning message if a mail file has been accessed.
 

modules/git/README.md

@@ -1,7 +1,8 @@
 Git
 ===
 
-Enhances the [Git][1] distributed version control system by providing aliases, functions and by exposing repository status information to prompts.
+Enhances the [Git][1] distributed version control system by providing aliases,
+functions and by exposing repository status information to prompts.
 
 Git **1.7.2** is the [minimum required version][7].
 
@@ -12,7 +13,7 @@ Settings
 
 The format of the [git-log][8] output is configurable via the following style,
 where context is *brief*, *oneline*, and *medium*, which will be passed to the
-`--prety=format:` switch.
+`--pretty=format:` switch.
 
     zstyle ':prezto:module:git:log:context' format ''
 
@@ -38,8 +39,8 @@ Aliases
   - `gbc` creates a new branch.
   - `gbl` lists branches and their commits.
   - `gbL` lists local and remote branches and their commits.
-  - `gbs` lists branches and their commits with ancestery graphs.
-  - `gbS` lists local and remote branches and their commits with ancestery
+  - `gbs` lists branches and their commits with ancestry graphs.
+  - `gbS` lists local and remote branches and their commits with ancestry
     graphs.
   - `gbx` deletes a branch.
   - `gbX` deletes a branch irrespective of its merged status.
@@ -65,6 +66,16 @@ Aliases
   - `gcs` displays various types of objects.
   - `gcl` displays lost commits.
 
+### Conflict
+
+  - `gCl` lists unmerged files.
+  - `gCa` adds unmerged file contents to the index.
+  - `gCe` executes merge-tool on all unmerged file.
+  - `gCo` checks out our changes for unmerged paths.
+  - `gCO` checks out our changes for all unmerged paths.
+  - `gCt` checks out their changes for unmerged paths.
+  - `gCT` checks out their changes for all unmerged paths.
+
 ### Data
 
   - `gd` displays information about files in the index and the work tree.
@@ -103,16 +114,6 @@ Aliases
   - `gix` removes files/directories from the index (recursively).
   - `giX` removes files/directories from the index (recursively and forced).
 
-### Conflict
-
-  - `gCl` lists unmerged files.
-  - `gCa` adds unmerged file contents to the index.
-  - `gCe` executes merge-tool on all unmerged file.
-  - `gCo` checks out our changes for unmerged paths.
-  - `gCO` checks out our changes for all unmerged paths.
-  - `gCt` checks out their changes for unmerged paths.
-  - `gCT` checks out their changes for all unmerged paths.
-
 ### Log
 
   - `gl` displays the log.

modules/git/alias.zsh

@@ -56,6 +56,15 @@ alias gcR='git reset "HEAD^"'
 alias gcs='git show'
 alias gcl='git-commit-lost'
 
+# Conflict (C)
+alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
+alias gCa='git add $(gCl)'
+alias gCe='git mergetool $(gCl)'
+alias gCo='git checkout --ours --'
+alias gCO='gCo $(gCl)'
+alias gCt='git checkout --theirs --'
+alias gCT='gCt $(gCl)'
+
 # Data (d)
 alias gd='git ls-files'
 alias gdc='git ls-files --cached'
@@ -90,15 +99,6 @@ alias giR='git reset --patch'
 alias gix='git rm -r --cached'
 alias giX='git rm -rf --cached'
 
-# Conflict (C)
-alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
-alias gCa='git add $(gCl)'
-alias gCe='git mergetool $(gCl)'
-alias gCo='git checkout --ours --'
-alias gCO='gCo $(gCl)'
-alias gCt='git checkout --theirs --'
-alias gCT='gCt $(gCl)'
-
 # Log (l)
 alias gl='git log --topo-order --pretty=format:${_git_log_medium_format}'
 alias gls='git log --topo-order --stat --pretty=format:${_git_log_medium_format}'

modules/helper/functions/add-zsh-trap

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

modules/osx/README.md

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

modules/prompt/README.md

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

modules/syntax-highlighting/init.zsh

@@ -16,6 +16,6 @@ source "${0:h}/external/zsh-syntax-highlighting.zsh"
 # Set the highlighters.
 zstyle -a ':prezto:module:syntax-highlighting' highlighters 'ZSH_HIGHLIGHT_HIGHLIGHTERS'
 if (( ${#ZSH_HIGHLIGHT_HIGHLIGHTERS[@]} == 0 )); then
-  ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets cursor)
+  ZSH_HIGHLIGHT_HIGHLIGHTERS=(main)
 fi
 

runcoms/README.md

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

runcoms/zpreztorc

@@ -110,26 +110,11 @@ zstyle ':prezto:module:ssh-agent' identities 'id_rsa'
 #
 
 # Set syntax highlighters.
-# By default main, brackets, and cursor are enabled.
+# By default, only the main highlighter is enabled.
 zstyle ':prezto:module:syntax-highlighting' color 'yes'
 # zstyle ':prezto:module:syntax-highlighting' highlighters \
 #   'main' \
 #   'brackets' \
 #   'pattern' \
 #   'cursor' \
 #   'root'
-
-#
-# Terminal
-#
-
-# Auto set the tab and window titles.
-zstyle ':prezto:module:terminal' auto-title 'yes'
-
-#
-# Tmux
-#
-
-# Auto start a session when Zsh is launched.
-# zstyle ':prezto:module:tmux' auto-start 'yes'
-

runcoms/zshenv

@@ -26,7 +26,7 @@ export PAGER='less'
 #
 
 if [[ -z "$LANG" ]]; then
-  eval "$(locale)"
+  export LANG='en_US.UTF-8'
 fi
 
 #

runcoms/zshrc

@@ -27,3 +27,6 @@ alias my="mysql -u root -pmeh"
 
 # List all git aliases
 alias git_aliases="alias | ag --nocolor '^g.*git'"
+
+# Drush
+alias dr='drush'