Merge upstream/master

modules/directory/init.zsh

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

modules/emacs/init.zsh

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

modules/fasd/init.zsh

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

modules/history/init.zsh

@@ -38,8 +38,10 @@ unset _pmh_{hist{file,size},savehist}
 # Aliases
 #
 
+if ! zstyle -t ':prezto:module:history:alias' skip; then
   # Lists the ten most used commands.
   alias history-stat="history 0 | awk '{print \$2}' | sort | uniq -c | sort -n -r | head"
+fi
 
 if [[ -s "${OLD_HISTFILE::=${HISTFILE:h}/.zhistory}" ]]; then
 

modules/homebrew/init.zsh

@@ -29,6 +29,7 @@ fi
 #
 
 # Homebrew
+if ! zstyle -t ':prezto:module:homebrew:alias' skip; then
   alias brewc='brew cleanup'
   alias brewi='brew install'
   alias brewL='brew leaves'
@@ -45,3 +46,4 @@ alias casko='brew outdated --cask'
   alias casks='brew search --cask'
   alias casku='brew upgrade --cask'
   alias caskx='brew uninstall --cask'
+fi

modules/macports/init.zsh

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

modules/node/init.zsh

@@ -48,6 +48,7 @@ N_PREFIX="${XDG_CONFIG_HOME:-$HOME/.config}/n"  # The path to 'n' cache.
 # Aliases
 #
 
+if ! zstyle -t ':prezto:module:node:alias' skip; then
   # npm
   alias npmi='npm install'
   alias npml='npm list'
@@ -63,3 +64,4 @@ alias npmx='npm uninstall'
   alias npmci='npm ci'
   alias npmcit='npm cit'
   alias npmit='npm it'
+fi

modules/perl/init.zsh

@@ -61,6 +61,7 @@ fi
 # Aliases
 #
 
+if ! zstyle -t ':prezto:module:perl:alias' skip; then
   # General
   alias pl='perl'
   alias pld='perldoc'
@@ -95,3 +96,4 @@ elif (( $+commands[plenv] )); then
     alias plvM='plenv migrate-modules'
     alias plvI='plenv install-cpanm'
   fi
+fi

modules/python/init.zsh

@@ -171,6 +171,8 @@ fi
 # Aliases
 #
 
+if ! zstyle -t ':prezto:module:python:alias' skip; then
   alias py='python'
   alias py2='python2'
   alias py3='python3'
+fi

modules/rails/init.zsh

@@ -19,6 +19,7 @@ fi
 # Aliases
 #
 
+if ! zstyle -t ':prezto:module:rails:alias' skip; then
   alias ror='bundle exec rails'
   alias rorc='bundle exec rails console'
   alias rordc='bundle exec rails dbconsole'
@@ -33,3 +34,4 @@ alias rorr='bundle exec rails runner'
   alias rors='bundle exec rails server'
   alias rorsd='bundle exec rails server --debugger'
   alias rorx='bundle exec rails destroy'
+fi

modules/ruby/init.zsh

@@ -59,6 +59,7 @@ fi
 # Aliases
 #
 
+if ! zstyle -t ':prezto:module:ruby:alias' skip; then
   # General
   alias rb='ruby'
 
@@ -79,3 +80,4 @@ if (( $+commands[bundle] )); then
       && print vendor/bundle >>! .gitignore \
       && print vendor/cache  >>! .gitignore'
   fi
+fi

modules/screen/init.zsh

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

modules/tmux/init.zsh

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