Merge remote-tracking branch 'upstream/master'

modules/directory/README.md

@@ -17,6 +17,13 @@ Sets directory options and defines directory aliases.
 
 ## Aliases
 
+Aliases are enabled by default. To disable them, add the following to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_.
+
+```sh
+zstyle ':prezto:module:directory:alias' skip 'yes'
+```
+
 - `d` prints the contents of the directory stack.
 - `1 ... 9` changes the directory to the **n** previous one.
 

modules/directory/init.zsh

@@ -25,6 +25,8 @@ unsetopt CLOBBER            # Do not overwrite existing files with > and >>.
 # Aliases
 #
 
-alias -- -='cd -'
+if ! zstyle -t ':prezto:module:directory:alias' skip; then
-alias d='dirs -v'
+  alias -- -='cd -'
-for index ({1..9}) alias "$index"="cd +${index}"; unset index
+  alias d='dirs -v'
+  for index ({1..9}) alias "$index"="cd +${index}"; unset index
+fi

modules/emacs/README.md

@@ -12,6 +12,13 @@ execution of `carton`.
 
 ## Aliases
 
+Aliases are enabled by default. To disable them, add the following to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_.
+
+```sh
+zstyle ':prezto:module:emacs:alias' skip 'yes'
+```
+
 ### Carton
 
 - `cai` installs dependencies.

modules/emacs/init.zsh

@@ -19,7 +19,9 @@ source "$HOME/.cask/etc/cask_completion.zsh" 2> /dev/null
 # Aliases
 #
 
-alias cai='cask install'
+if ! zstyle -t ':prezto:module:emacs:alias' skip; then
-alias cau='cask update'
+  alias cai='cask install'
-alias caI='cask init'
+  alias cau='cask update'
-alias cae='cask exec'
+  alias caI='cask init'
+  alias cae='cask exec'
+fi

modules/fasd/README.md

@@ -19,6 +19,13 @@ instead of the bundled version.
 
 ## Aliases
 
+Aliases are enabled by default. To disable them, add the following to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_.
+
+```sh
+zstyle ':prezto:module:fasd:alias' skip 'yes'
+```
+
 - `j` changes the current working directory interactively.
 
 ## Completion

modules/fasd/init.zsh

@@ -53,5 +53,7 @@ function fasd_cd {
 # Aliases
 #
 
-# Changes the current working directory interactively.
+if ! zstyle -t ':prezto:module:fasd:alias' skip; then
-alias j='fasd_cd -i'
+  # Changes the current working directory interactively.
+  alias j='fasd_cd -i'
+fi

modules/gnu-utility/init.zsh

@@ -44,8 +44,7 @@ _gnu_utility_cmds=(
   'libtool' 'libtoolize'
 
   # Miscellaneous
-  'egrep' 'fgrep' 'getopt' 'grep' 'indent' 'make' 'sed' 'tar' 'time' 'units'
+  'awk' 'getopt' 'grep' 'indent' 'make' 'sed' 'tar' 'time' 'units' 'which'
-  'which'
 )
 
 # Wrap GNU utilities in functions.

modules/history/README.md

@@ -36,6 +36,13 @@ Alternately, you can set `HISTFILE` manually to _`${ZDOTDIR:-$HOME}/.zhistory`_.
 
 ## Aliases
 
+Aliases are enabled by default. To disable them, add the following to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_.
+
+```sh
+zstyle ':prezto:module:history:alias' skip 'yes'
+```
+
 - `history-stat` lists the ten most used commands
 
 ## Settings

modules/history/init.zsh

@@ -26,42 +26,18 @@ setopt HIST_BEEP                 # Beep when accessing non-existent history.
 # Variables
 #
 
-zstyle -s ':prezto:module:history' histfile '_pmh_histfile' || _pmh_histfile="${HISTFILE:-${ZDOTDIR:-$HOME}/.zsh_history}"
+zstyle -s ':prezto:module:history' histfile 'HISTFILE' \
-zstyle -s ':prezto:module:history' histsize '_pmh_histsize' || _pmh_histsize=10000
+    || HISTFILE="${HISTFILE:-${ZDOTDIR:-$HOME}/.zsh_history}" # The path to the history file.
-zstyle -s ':prezto:module:history' savehist '_pmh_savehist' || _pmh_savehist=${_pmh_histsize}
+zstyle -s ':prezto:module:history' histsize 'HISTSIZE' \
-HISTFILE="${_pmh_histfile}"  # The path to the history file.
+    || HISTSIZE=10000                                         # The maximum number of events to save in the internal history.
-HISTSIZE="${_pmh_histsize}"  # The maximum number of events to save in the internal history.
+zstyle -s ':prezto:module:history' savehist 'SAVEHIST' \
-SAVEHIST="${_pmh_savehist}"  # The maximum number of events to save in the history file.
+    || SAVEHIST=$HISTSIZE                                     # The maximum number of events to save in the history file.
-unset _pmh_{hist{file,size},savehist}
 
 #
 # Aliases
 #
 
-# Lists the ten most used commands.
+if ! zstyle -t ':prezto:module:history:alias' skip; then
-alias history-stat="history 0 | awk '{print \$2}' | sort | uniq -c | sort -n -r | head"
+  # Lists the ten most used commands.
-
+  alias history-stat="history 0 | awk '{print \$2}' | sort | uniq -c | sort -n -r | head"
-if [[ -s "${OLD_HISTFILE::=${HISTFILE:h}/.zhistory}" ]]; then
-
-  # New 'HISTFILE' doesn't exist yet, rename legacy one if available and notify.
-  if [[ ! -s "$HISTFILE" ]]; then
-    <<EON
-NOTICE: Default path of 'HISTFILE' has changed from '${OLD_HISTFILE/#$HOME/~}'
-        to '${HISTFILE/#$HOME/~}'.
-        Attempting to rename the existing 'HISTFILE' ...
-EON
-    command mv -v "$OLD_HISTFILE" "$HISTFILE"
-
-  # New 'HISTFILE' does exist and is older than legacy one, just warn.
-  elif [[ "$OLD_HISTFILE" -nt "$HISTFILE" ]]; then
-    <<EOW
-WARNING: Default path of 'HISTFILE' has changed from '${OLD_HISTFILE/#$HOME/~}'
-         to '${HISTFILE/#$HOME/~}'.
-         Either set 'HISTFILE' in '${${0:h}/#$HOME/~}'
-         or move previous history from '${OLD_HISTFILE/#$HOME/~}' to
-         '${HISTFILE/#$HOME/~}'.
-EOW
-  fi
-
-  unset OLD_HISTFILE
 fi

modules/homebrew/README.md

@@ -12,6 +12,13 @@ brew shellenv
 
 ## Aliases
 
+Aliases are enabled by default. To disable them, add the following to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_.
+
+```sh
+zstyle ':prezto:module:homebrew:alias' skip 'yes'
+```
+
 ### Homebrew Core
 
 - `brewc` cleans outdated brews and their cached archives.

modules/homebrew/init.zsh

@@ -29,19 +29,21 @@ fi
 #
 
 # Homebrew
-alias brewc='brew cleanup'
+if ! zstyle -t ':prezto:module:homebrew:alias' skip; then
-alias brewi='brew install'
+  alias brewc='brew cleanup'
-alias brewL='brew leaves'
+  alias brewi='brew install'
-alias brewl='brew list'
+  alias brewL='brew leaves'
-alias brewo='brew outdated'
+  alias brewl='brew list'
-alias brews='brew search'
+  alias brewo='brew outdated'
-alias brewu='brew upgrade'
+  alias brews='brew search'
-alias brewx='brew uninstall'
+  alias brewu='brew upgrade'
+  alias brewx='brew uninstall'
 
-# Homebrew Cask
+  # Homebrew Cask
-alias caski='brew install --cask'
+  alias caski='brew install --cask'
-alias caskl='brew list --cask'
+  alias caskl='brew list --cask'
-alias casko='brew outdated --cask'
+  alias casko='brew outdated --cask'
-alias casks='brew search --cask'
+  alias casks='brew search --cask'
-alias casku='brew upgrade --cask'
+  alias casku='brew upgrade --cask'
-alias caskx='brew uninstall --cask'
+  alias caskx='brew uninstall --cask'
+fi

modules/macports/README.md

@@ -4,6 +4,13 @@ Defines MacPorts aliases and adds MacPorts directories to path variables.
 
 ## Aliases
 
+Aliases are enabled by default. To disable them, add the following to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_.
+
+```sh
+zstyle ':prezto:module:macports:alias' skip 'yes'
+```
+
 - `portc` cleans the files used to build ports.
 - `porti` installs a port.
 - `ports` searches for a port.

modules/macports/init.zsh

@@ -28,10 +28,12 @@ path=(
 # Aliases
 #
 
-alias portc='sudo port clean --all installed'
+if ! zstyle -t ':prezto:module:macports:alias' skip; then
-alias porti='sudo port install'
+  alias portc='sudo port clean --all installed'
-alias ports='port search'
+  alias porti='sudo port install'
-alias portU='sudo port selfupdate && sudo port upgrade outdated'
+  alias ports='port search'
-alias portu='sudo port upgrade'
+  alias portU='sudo port selfupdate && sudo port upgrade outdated'
-alias portX='sudo port -u uninstall'
+  alias portu='sudo port upgrade'
-alias portx='sudo port uninstall'
+  alias portX='sudo port -u uninstall'
+  alias portx='sudo port uninstall'
+fi

modules/node/README.md

@@ -29,6 +29,13 @@ _`$XDG_CONFIG_HOME/nvm`_, _`~/.nvm`_, or is installed with homebrew.
 
 ## Aliases
 
+Aliases are enabled by default. To disable them, add the following to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_.
+
+```sh
+zstyle ':prezto:module:node:alias' skip 'yes'
+```
+
 ### npm
 
 - `npmi` install a package.

modules/node/init.zsh

@@ -48,18 +48,20 @@ N_PREFIX="${XDG_CONFIG_HOME:-$HOME/.config}/n"  # The path to 'n' cache.
 # Aliases
 #
 
-# npm
+if ! zstyle -t ':prezto:module:node:alias' skip; then
-alias npmi='npm install'
+  # npm
-alias npml='npm list'
+  alias npmi='npm install'
-alias npmo='npm outdated'
+  alias npml='npm list'
-alias npmp='npm publish'
+  alias npmo='npm outdated'
-alias npmP='npm prune'
+  alias npmp='npm publish'
-alias npmr='npm run'
+  alias npmP='npm prune'
-alias npms='npm search'
+  alias npmr='npm run'
-alias npmt='npm test'
+  alias npms='npm search'
-alias npmu='npm update'
+  alias npmt='npm test'
-alias npmx='npm uninstall'
+  alias npmu='npm update'
+  alias npmx='npm uninstall'
 
-alias npmci='npm ci'
+  alias npmci='npm ci'
-alias npmcit='npm cit'
+  alias npmcit='npm cit'
-alias npmit='npm it'
+  alias npmit='npm it'
+fi

modules/osx/functions/manp

@@ -9,7 +9,7 @@ function manp {
   local page
   if (( $# > 0 )); then
     for page in "$@"; do
-      man -t "$page" | open -f -a Preview
+      mandoc -T pdf "$(/usr/bin/man -w $page)" | open -fa Preview
     done
   else
     print 'What manual page do you want?' >&2

modules/perl/README.md

@@ -40,6 +40,13 @@ The subcommands of _plenv_ is similar with _rbenv_.
 
 ## Aliases
 
+Aliases are enabled by default. To disable them, add the following to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_.
+
+```sh
+zstyle ':prezto:module:perl:alias' skip 'yes'
+```
+
 ### General
 
 - `pl` is short for `perl`.

modules/perl/init.zsh

@@ -61,13 +61,14 @@ fi
 # Aliases
 #
 
-# General
+if ! zstyle -t ':prezto:module:perl:alias' skip; then
-alias pl='perl'
+  # General
-alias pld='perldoc'
+  alias pl='perl'
-alias ple='perl -wlne'
+  alias pld='perldoc'
-
+  alias ple='perl -wlne'
-# Perlbrew
+
-if (( $+commands[perlbrew] )); then
+  # Perlbrew
+  if (( $+commands[perlbrew] )); then
     alias plb='perlbrew'
     alias plba='perlbrew available'
     alias plbi='perlbrew install'
@@ -78,7 +79,7 @@ if (( $+commands[perlbrew] )); then
     alias plbu='perlbrew use'
     alias plbx='perlbrew uninstall'
 
-elif (( $+commands[plenv] )); then
+  elif (( $+commands[plenv] )); then
     alias plv='plenv'
     alias plvc='plenv commands'
     alias plvl='plenv local'
@@ -94,4 +95,5 @@ elif (( $+commands[plenv] )); then
     alias plvm='plenv list-modules'
     alias plvM='plenv migrate-modules'
     alias plvI='plenv install-cpanm'
+  fi
 fi

modules/prompt/external/async

@@ -1 +1 @@
-Subproject commit bbbc92bd01592513a6b7739a45b7911af18acaef
+Subproject commit a66d76f8404bd9e7a26037640e6c892cf5871ff4

modules/prompt/external/powerlevel10k

@@ -1 +1 @@
-Subproject commit 8a676a9157d2b0e00e88d06456ac7317f11c0317
+Subproject commit 0af598cbed78660066f8a8f4465844501ba5695b

modules/prompt/external/pure

@@ -1 +1 @@
-Subproject commit 5b458ba5b75f49a8071d53c343f1a23631f7bced
+Subproject commit 2f13dea466466dde1ba844ba5211e7556f4ae2db

modules/prompt/init.zsh

@@ -10,18 +10,8 @@ autoload -Uz promptinit && promptinit
 
 # Load the prompt theme.
 zstyle -a ':prezto:module:prompt' theme 'prompt_argv'
-if [[ "$TERM" == (dumb|linux|*bsd*) ]] || (( $#prompt_argv < 1 )); then
+if [[ $TERM == (dumb|linux|*bsd*) ]] || (( $#prompt_argv < 1 )); then
   prompt 'off'
-elif [[ "$prompt_argv[1]" == 'powerlevel9k' ]] ; then
-  <<EOW
-WARNING: Prezto does not support 'powerlevel9k' anymore as it has
-         been deprecated and is not supported by its author.
-         Consider migrating to 'powerlevel10k' instead by setting:
-         zstyle ':prezto:module:prompt' theme 'powerlevel10k'
-         in ${${ZDOTDIR:-$HOME}/#$HOME/~}/.zpreztorc.
-         Switching to prezto default prompt 'sorin'..."
-EOW
-  prompt 'sorin'
 else
   prompt "$prompt_argv[@]"
 fi

modules/python/README.md

@@ -124,6 +124,13 @@ zstyle ':prezto:module:python:virtualenv' initialize 'no'
 
 ## Aliases
 
+Aliases are enabled by default. To disable them, add the following to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_.
+
+```sh
+zstyle ':prezto:module:python:alias' skip 'yes'
+```
+
 - `py` is short for `python`.
 - `py2` is short for `python2`.
 - `py3` is short for `python3`.

modules/python/functions/_pip

@@ -1,19 +0,0 @@
-#compdef -P pip[0-9.]#
-#autoload
-
-#
-# Pip completion, delegating to pip to do all the completion work.
-#
-# Authors:
-#   Indrajit Raychaudhuri <irc@indrajit.com>
-#
-
-if (( $+commands[$words[1]] )); then
-
-  function _pip_completion {
-    compadd -- $( COMP_WORDS="$words[*]" COMP_CWORD=$(( CURRENT - 1 )) \
-                  PIP_AUTO_COMPLETE=1 $words[1] 2>/dev/null )
-  }
-  _pip_completion "$@"
-
-fi

modules/python/init.zsh

@@ -50,7 +50,7 @@ fi
 unset local_pyenv
 
 # Return if requirements are not found.
-if (( ! $#commands[(i)python[23]#] && ! $+functions[pyenv] && ! $+commands[conda] )); then
+if (( ! $+commands[(i)python[0-9.]#] && ! $+functions[pyenv] && ! $+commands[conda] )); then
   return 1
 fi
 
@@ -136,8 +136,8 @@ if (( $+VIRTUALENVWRAPPER_VIRTUALENV || $+commands[virtualenv] )) \
 
   if [[ $pyenv_virtualenvwrapper_plugin_found != "true" ]]; then
     # Fallback to standard 'virtualenvwrapper' if 'python' is available in '$path'.
-    if (( ! $+VIRTUALENVWRAPPER_PYTHON )) && (( $#commands[(i)python[23]#] )); then
+    if (( ! $+VIRTUALENVWRAPPER_PYTHON )) && (( $+commands[(i)python[0-9.]#] )); then
-      VIRTUALENVWRAPPER_PYTHON=$commands[(i)python[23]#]
+      VIRTUALENVWRAPPER_PYTHON=$commands[(i)python[0-9.]#]
     fi
 
     virtualenvwrapper_sources=(
@@ -171,6 +171,8 @@ fi
 # Aliases
 #
 
-alias py='python'
+if ! zstyle -t ':prezto:module:python:alias' skip; then
-alias py2='python2'
+  alias py='python'
-alias py3='python3'
+  alias py2='python2'
+  alias py3='python3'
+fi

modules/rails/README.md

@@ -4,6 +4,13 @@ Defines [Ruby on Rails][1] aliases.
 
 ## Aliases
 
+Aliases are enabled by default. To disable them, add the following to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_.
+
+```sh
+zstyle ':prezto:module:rails:alias' skip 'yes'
+```
+
 - `ror` is short for `rails`.
 - `rorc` starts the Rails console.
 - `rordc` starts the Rails console connected to the database.

modules/rails/init.zsh

@@ -19,17 +19,19 @@ fi
 # Aliases
 #
 
-alias ror='bundle exec rails'
+if ! zstyle -t ':prezto:module:rails:alias' skip; then
-alias rorc='bundle exec rails console'
+  alias ror='bundle exec rails'
-alias rordc='bundle exec rails dbconsole'
+  alias rorc='bundle exec rails console'
-alias rordm='bundle exec rake db:migrate'
+  alias rordc='bundle exec rails dbconsole'
-alias rordM='bundle exec rake db:migrate db:test:clone'
+  alias rordm='bundle exec rake db:migrate'
-alias rordr='bundle exec rake db:rollback'
+  alias rordM='bundle exec rake db:migrate db:test:clone'
-alias rorg='bundle exec rails generate'
+  alias rordr='bundle exec rake db:rollback'
-alias rorl='tail -f "$(ruby-app-root)/log/development.log"'
+  alias rorg='bundle exec rails generate'
-alias rorlc='bundle exec rake log:clear'
+  alias rorl='tail -f "$(ruby-app-root)/log/development.log"'
-alias rorp='bundle exec rails plugin'
+  alias rorlc='bundle exec rake log:clear'
-alias rorr='bundle exec rails runner'
+  alias rorp='bundle exec rails plugin'
-alias rors='bundle exec rails server'
+  alias rorr='bundle exec rails runner'
-alias rorsd='bundle exec rails server --debugger'
+  alias rors='bundle exec rails server'
-alias rorx='bundle exec rails destroy'
+  alias rorsd='bundle exec rails server --debugger'
+  alias rorx='bundle exec rails destroy'
+fi

modules/ruby/README.md

@@ -54,6 +54,13 @@ dependencies, with [Bundler][5].
 
 ## Aliases
 
+Aliases are enabled by default. To disable them, add the following to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_.
+
+```sh
+zstyle ':prezto:module:ruby:alias' skip 'yes'
+```
+
 ### General
 
 - `rb` is short for `ruby`.

modules/ruby/init.zsh

@@ -59,11 +59,12 @@ fi
 # Aliases
 #
 
-# General
+if ! zstyle -t ':prezto:module:ruby:alias' skip; then
-alias rb='ruby'
+  # General
+  alias rb='ruby'
 
-# Bundler
+  # Bundler
-if (( $+commands[bundle] )); then
+  if (( $+commands[bundle] )); then
     alias rbb='bundle'
     alias rbbc='bundle clean'
     alias rbbe='bundle exec'
@@ -78,4 +79,5 @@ if (( $+commands[bundle] )); then
       && print vendor/assets >>! .gitignore \
       && print vendor/bundle >>! .gitignore \
       && print vendor/cache  >>! .gitignore'
+  fi
 fi

modules/screen/README.md

@@ -24,6 +24,13 @@ zstyle ':prezto:module:screen:auto-start' remote 'yes'
 
 ## Aliases
 
+Aliases are enabled by default. To disable them, add the following to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_.
+
+```sh
+zstyle ':prezto:module:screen:alias' skip 'yes'
+```
+
 - `scr` is short for `screen`.
 - `scrl` lists sessions/socket directory.
 - `scrn` starts a new session.

modules/screen/init.zsh

@@ -36,7 +36,9 @@ fi
 # Aliases
 #
 
-alias scr='screen'
+if ! zstyle -t ':prezto:module:screen:alias' skip; then
-alias scrl='screen -list'
+  alias scr='screen'
-alias scrn='screen -U -S'
+  alias scrl='screen -list'
-alias scrr='screen -a -A -U -D -R'
+  alias scrn='screen -U -S'
+  alias scrr='screen -a -A -U -D -R'
+fi

modules/tmux/README.md

@@ -53,6 +53,13 @@ Read [iTerm2 and tmux Integration][7] for more information.
 
 ## Aliases
 
+Aliases are enabled by default. To disable them, add the following to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_.
+
+```sh
+zstyle ':prezto:module:tmux:alias' skip 'yes'
+```
+
 - `tmuxa` attaches or switches to a tmux session.
 - `tmuxl` lists sessions managed by the tmux server.
 

modules/tmux/init.zsh

@@ -45,5 +45,7 @@ fi
 # Aliases
 #
 
-alias tmuxa="tmux $_tmux_iterm_integration new-session -A"
+if ! zstyle -t ':prezto:module:tmux:alias' skip; then
-alias tmuxl='tmux list-sessions'
+  alias tmuxa="tmux $_tmux_iterm_integration new-session -A"
+  alias tmuxl='tmux list-sessions'
+fi

runcoms/zlogin

@@ -10,7 +10,10 @@
   # Compile the completion dump to increase startup speed.
   zcompdump="${XDG_CACHE_HOME:-$HOME/.cache}/prezto/zcompdump"
   if [[ -s "$zcompdump" && (! -s "${zcompdump}.zwc" || "$zcompdump" -nt "${zcompdump}.zwc") ]]; then
+    if command mkdir "${zcompdump}.zwc.lock" 2>/dev/null; then
       zcompile "$zcompdump"
+      command rmdir  "${zcompdump}.zwc.lock" 2>/dev/null
+    fi
   fi
 } &!