Merge commit '4abbc5572149baa6a5e7e38393a4b2006f01024f'

* commit '4abbc5572149baa6a5e7e38393a4b2006f01024f':
  remove mutually exclusive option
  Update syntax-highlighting submodule
  Remove old prompt tempfile and pid variable
  Updating submodules to lastest tags/master commits
  Fix typo: gupl --> gulp (sorin-ionescu#1668)
  python: Use brace expansion for pip compctl match
  Remove duplicated information from git module README (sorin-ionescu#1657)

modules/git/README.md

@@ -67,7 +67,7 @@ zstyle ':prezto:module:git:alias' skip 'yes'
   - `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.
+  - `gcSm` records changes to the repository with the given message. (Signed)
   - `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.

modules/history/README.md

@@ -8,8 +8,9 @@ Options
 
   - `BANG_HIST` treats the **!** character specially during expansion.
   - `EXTENDED_HISTORY` writes the history file in the *:start:elapsed;command* format.
-  - `INC_APPEND_HISTORY` writes to the history file immediately, not when the shell exits.
-  - `SHARE_HISTORY` shares history between all sessions.
+  - `SHARE_HISTORY` shares history between all sessions. Note that
+    `SHARE_HISTORY`, `INC_APPEND_HISTORY`, and `INC_APPEND_HISTORY_TIME` are
+    mutually exclusive.
   - `HIST_EXPIRE_DUPS_FIRST` expires a duplicate event first when trimming history.
   - `HIST_IGNORE_DUPS` does not record an event that was just recorded again.
   - `HIST_IGNORE_ALL_DUPS` deletes an old recorded event if a new event is a duplicate.

modules/history/init.zsh

@@ -12,7 +12,6 @@
 
 setopt BANG_HIST                 # Treat the '!' character specially during expansion.
 setopt EXTENDED_HISTORY          # Write the history file in the ':start:elapsed;command' format.
-setopt INC_APPEND_HISTORY        # Write to the history file immediately, not when the shell exits.
 setopt SHARE_HISTORY             # Share history between all sessions.
 setopt HIST_EXPIRE_DUPS_FIRST    # Expire a duplicate event first when trimming history.
 setopt HIST_IGNORE_DUPS          # Do not record an event that was just recorded again.

modules/node/init.zsh

@@ -34,7 +34,7 @@ fi
 typeset -A compl_commands=(
   npm   'npm completion'
   grunt 'grunt --completion=zsh'
-  gupl  'gulp --completion=zsh'
+  gulp  'gulp --completion=zsh'
 )
 
 for compl_command in "${(k)compl_commands[@]}"; do

modules/prompt/functions/prompt_sorin_setup

@@ -110,8 +110,6 @@ function prompt_sorin_setup {
   setopt LOCAL_OPTIONS
   unsetopt XTRACE KSH_ARRAYS
   prompt_opts=(cr percent sp subst)
-  _prompt_sorin_precmd_async_pid=0
-  _prompt_sorin_precmd_async_data=$(mktemp "${TMPDIR:-/tmp}/sorin-prompt-async-XXXXXXXXXX")
 
   # Load required functions.
   autoload -Uz add-zsh-hook

modules/python/init.zsh

@@ -160,7 +160,9 @@ if (( $#commands[(i)pip(|[23])] )); then
         || ! -s "$cache_file" ]]; then
     # pip is slow; cache its output. And also support 'pip2', 'pip3' variants
     $pip_command completion --zsh \
-      | sed -e "s/\(compctl -K [-_[:alnum:]]*\) pip.*/\1 pip(|[23](|.[0-9]))/" >! "$cache_file" 2> /dev/null
+      | sed -e "s/\(compctl -K [-_[:alnum:]]* pip\).*/\1{,2,3}{,.{0..9}}/" \
+      >! "$cache_file" \
+      2> /dev/null
   fi
 
   source "$cache_file"