From e50b93ca882aa58b0119b2e90818c4157e30c794 Mon Sep 17 00:00:00 2001
From: huyz <huyz@users.noreply.github.com>
Date: Fri, 23 Dec 2022 00:31:55 -0800
Subject: [PATCH 01/46] Fix zcompile race condition

sorin-ionescu/prezto#2028
---
 runcoms/zlogin | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/runcoms/zlogin b/runcoms/zlogin
index ac4d3422..2f834353 100644
--- a/runcoms/zlogin
+++ b/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
-    zcompile "$zcompdump"
+    if command mkdir "${zcompdump}.zwc.lock" 2>/dev/null; then
+      zcompile "$zcompdump"
+      command rmdir  "${zcompdump}.zwc.lock" 2>/dev/null
+    fi
   fi
 } &!
 

From a4ca9243109a2a03a844afc93a1d4d3212752f15 Mon Sep 17 00:00:00 2001
From: Roman Perepelitsa <roman.perepelitsa@gmail.com>
Date: Sat, 14 Jan 2023 15:18:03 +0100
Subject: [PATCH 02/46] prompt: update powerlevel10k submodule to v1.17.0

Release notes:

  - https://github.com/romkatv/powerlevel10k/releases/tag/v1.17.0
---
 modules/prompt/external/powerlevel10k | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/prompt/external/powerlevel10k b/modules/prompt/external/powerlevel10k
index 8a676a91..a066b55f 160000
--- a/modules/prompt/external/powerlevel10k
+++ b/modules/prompt/external/powerlevel10k
@@ -1 +1 @@
-Subproject commit 8a676a9157d2b0e00e88d06456ac7317f11c0317
+Subproject commit a066b55f855c8e488d3ea9e26e861bdd5ecd4fe8

From 8be95c9c7e816cb1277f127eb281d5b5408ed22d Mon Sep 17 00:00:00 2001
From: mattmc3 <mattmc3@gmail.com>
Date: Sat, 28 Jan 2023 21:29:09 -0500
Subject: [PATCH 03/46] Fix osx module manp function

---
 modules/osx/functions/manp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/osx/functions/manp b/modules/osx/functions/manp
index fcb2a026..d31bbc40 100644
--- a/modules/osx/functions/manp
+++ b/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

From fc444f57e11131b2cad68f474bcf1201cba062a4 Mon Sep 17 00:00:00 2001
From: Julio Batista Silva <julio@juliobs.com>
Date: Tue, 31 Jan 2023 18:02:09 +0100
Subject: [PATCH 04/46] gnu-utility: add awk

https://www.gnu.org/software/gawk/
https://formulae.brew.sh/formula/gawk
---
 modules/gnu-utility/init.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gnu-utility/init.zsh b/modules/gnu-utility/init.zsh
index 85e86050..a8521f0c 100644
--- a/modules/gnu-utility/init.zsh
+++ b/modules/gnu-utility/init.zsh
@@ -44,8 +44,8 @@ _gnu_utility_cmds=(
   'libtool' 'libtoolize'
 
   # Miscellaneous
-  'egrep' 'fgrep' 'getopt' 'grep' 'indent' 'make' 'sed' 'tar' 'time' 'units'
-  'which'
+  'awk' 'egrep' 'fgrep' 'getopt' 'grep' 'indent' 'make' 'sed' 'tar' 'time'
+  'units' 'which'
 )
 
 # Wrap GNU utilities in functions.

From da87c79b3a35f5a4a504ea331e9ec52b4f786976 Mon Sep 17 00:00:00 2001
From: mattmc3 <mattmc3@gmail.com>
Date: Wed, 12 Apr 2023 22:02:41 -0400
Subject: [PATCH 05/46] Add zstyle to skip aliases for additional modules

---
 modules/directory/init.zsh |  8 +++--
 modules/emacs/init.zsh     | 10 +++---
 modules/fasd/init.zsh      |  6 ++--
 modules/history/init.zsh   |  6 ++--
 modules/homebrew/init.zsh  | 32 ++++++++++---------
 modules/macports/init.zsh  | 16 +++++-----
 modules/node/init.zsh      | 30 +++++++++---------
 modules/perl/init.zsh      | 64 ++++++++++++++++++++------------------
 modules/python/init.zsh    |  8 +++--
 modules/rails/init.zsh     | 30 +++++++++---------
 modules/ruby/init.zsh      | 38 +++++++++++-----------
 modules/screen/init.zsh    | 10 +++---
 modules/tmux/init.zsh      |  6 ++--
 13 files changed, 145 insertions(+), 119 deletions(-)

diff --git a/modules/directory/init.zsh b/modules/directory/init.zsh
index c5a01f1d..caf08d2a 100644
--- a/modules/directory/init.zsh
+++ b/modules/directory/init.zsh
@@ -25,6 +25,8 @@ unsetopt CLOBBER            # Do not overwrite existing files with > and >>.
 # Aliases
 #
 
-alias -- -='cd -'
-alias d='dirs -v'
-for index ({1..9}) alias "$index"="cd +${index}"; unset index
+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
diff --git a/modules/emacs/init.zsh b/modules/emacs/init.zsh
index 3acc965c..a53285ab 100644
--- a/modules/emacs/init.zsh
+++ b/modules/emacs/init.zsh
@@ -19,7 +19,9 @@ source "$HOME/.cask/etc/cask_completion.zsh" 2> /dev/null
 # Aliases
 #
 
-alias cai='cask install'
-alias cau='cask update'
-alias caI='cask init'
-alias cae='cask exec'
+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
diff --git a/modules/fasd/init.zsh b/modules/fasd/init.zsh
index f948789e..bd142f80 100644
--- a/modules/fasd/init.zsh
+++ b/modules/fasd/init.zsh
@@ -53,5 +53,7 @@ function fasd_cd {
 # Aliases
 #
 
-# Changes the current working directory interactively.
-alias j='fasd_cd -i'
+if ! zstyle -t ':prezto:module:fasd:alias' skip; then
+  # Changes the current working directory interactively.
+  alias j='fasd_cd -i'
+fi
diff --git a/modules/history/init.zsh b/modules/history/init.zsh
index 1f9a09b4..3ef52ea4 100644
--- a/modules/history/init.zsh
+++ b/modules/history/init.zsh
@@ -38,8 +38,10 @@ unset _pmh_{hist{file,size},savehist}
 # Aliases
 #
 
-# Lists the ten most used commands.
-alias history-stat="history 0 | awk '{print \$2}' | sort | uniq -c | sort -n -r | head"
+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
 
diff --git a/modules/homebrew/init.zsh b/modules/homebrew/init.zsh
index 4b0fb86a..78992587 100644
--- a/modules/homebrew/init.zsh
+++ b/modules/homebrew/init.zsh
@@ -29,19 +29,21 @@ fi
 #
 
 # Homebrew
-alias brewc='brew cleanup'
-alias brewi='brew install'
-alias brewL='brew leaves'
-alias brewl='brew list'
-alias brewo='brew outdated'
-alias brews='brew search'
-alias brewu='brew upgrade'
-alias brewx='brew uninstall'
+if ! zstyle -t ':prezto:module:homebrew:alias' skip; then
+  alias brewc='brew cleanup'
+  alias brewi='brew install'
+  alias brewL='brew leaves'
+  alias brewl='brew list'
+  alias brewo='brew outdated'
+  alias brews='brew search'
+  alias brewu='brew upgrade'
+  alias brewx='brew uninstall'
 
-# Homebrew Cask
-alias caski='brew install --cask'
-alias caskl='brew list --cask'
-alias casko='brew outdated --cask'
-alias casks='brew search --cask'
-alias casku='brew upgrade --cask'
-alias caskx='brew uninstall --cask'
+  # Homebrew Cask
+  alias caski='brew install --cask'
+  alias caskl='brew list --cask'
+  alias casko='brew outdated --cask'
+  alias casks='brew search --cask'
+  alias casku='brew upgrade --cask'
+  alias caskx='brew uninstall --cask'
+fi
diff --git a/modules/macports/init.zsh b/modules/macports/init.zsh
index 7bf4ab29..1ac3c531 100644
--- a/modules/macports/init.zsh
+++ b/modules/macports/init.zsh
@@ -28,10 +28,12 @@ path=(
 # Aliases
 #
 
-alias portc='sudo port clean --all installed'
-alias porti='sudo port install'
-alias ports='port search'
-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'
+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'
+  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
diff --git a/modules/node/init.zsh b/modules/node/init.zsh
index b3591049..0c27764d 100644
--- a/modules/node/init.zsh
+++ b/modules/node/init.zsh
@@ -48,18 +48,20 @@ N_PREFIX="${XDG_CONFIG_HOME:-$HOME/.config}/n"  # The path to 'n' cache.
 # Aliases
 #
 
-# npm
-alias npmi='npm install'
-alias npml='npm list'
-alias npmo='npm outdated'
-alias npmp='npm publish'
-alias npmP='npm prune'
-alias npmr='npm run'
-alias npms='npm search'
-alias npmt='npm test'
-alias npmu='npm update'
-alias npmx='npm uninstall'
+if ! zstyle -t ':prezto:module:node:alias' skip; then
+  # npm
+  alias npmi='npm install'
+  alias npml='npm list'
+  alias npmo='npm outdated'
+  alias npmp='npm publish'
+  alias npmP='npm prune'
+  alias npmr='npm run'
+  alias npms='npm search'
+  alias npmt='npm test'
+  alias npmu='npm update'
+  alias npmx='npm uninstall'
 
-alias npmci='npm ci'
-alias npmcit='npm cit'
-alias npmit='npm it'
+  alias npmci='npm ci'
+  alias npmcit='npm cit'
+  alias npmit='npm it'
+fi
diff --git a/modules/perl/init.zsh b/modules/perl/init.zsh
index 1b5e6657..efadd9ea 100644
--- a/modules/perl/init.zsh
+++ b/modules/perl/init.zsh
@@ -61,37 +61,39 @@ fi
 # Aliases
 #
 
-# General
-alias pl='perl'
-alias pld='perldoc'
-alias ple='perl -wlne'
+if ! zstyle -t ':prezto:module:perl:alias' skip; then
+  # General
+  alias pl='perl'
+  alias pld='perldoc'
+  alias ple='perl -wlne'
 
-# Perlbrew
-if (( $+commands[perlbrew] )); then
-  alias plb='perlbrew'
-  alias plba='perlbrew available'
-  alias plbi='perlbrew install'
-  alias plbl='perlbrew list'
-  alias plbo='perlbrew off'
-  alias plbO='perlbrew switch-off'
-  alias plbs='perlbrew switch'
-  alias plbu='perlbrew use'
-  alias plbx='perlbrew uninstall'
+  # Perlbrew
+  if (( $+commands[perlbrew] )); then
+    alias plb='perlbrew'
+    alias plba='perlbrew available'
+    alias plbi='perlbrew install'
+    alias plbl='perlbrew list'
+    alias plbo='perlbrew off'
+    alias plbO='perlbrew switch-off'
+    alias plbs='perlbrew switch'
+    alias plbu='perlbrew use'
+    alias plbx='perlbrew uninstall'
 
-elif (( $+commands[plenv] )); then
-  alias plv='plenv'
-  alias plvc='plenv commands'
-  alias plvl='plenv local'
-  alias plvg='plenv global'
-  alias plvs='plenv shell'
-  alias plvi='plenv install'
-  alias plvu='plenv uninstall'
-  alias plvr='plenv rehash'
-  alias plvv='plenv version'
-  alias plvV='plenv versions'
-  alias plvw='plenv which'
-  alias plvW='plenv whence'
-  alias plvm='plenv list-modules'
-  alias plvM='plenv migrate-modules'
-  alias plvI='plenv install-cpanm'
+  elif (( $+commands[plenv] )); then
+    alias plv='plenv'
+    alias plvc='plenv commands'
+    alias plvl='plenv local'
+    alias plvg='plenv global'
+    alias plvs='plenv shell'
+    alias plvi='plenv install'
+    alias plvu='plenv uninstall'
+    alias plvr='plenv rehash'
+    alias plvv='plenv version'
+    alias plvV='plenv versions'
+    alias plvw='plenv which'
+    alias plvW='plenv whence'
+    alias plvm='plenv list-modules'
+    alias plvM='plenv migrate-modules'
+    alias plvI='plenv install-cpanm'
+  fi
 fi
diff --git a/modules/python/init.zsh b/modules/python/init.zsh
index a80a9c47..02eb52d7 100644
--- a/modules/python/init.zsh
+++ b/modules/python/init.zsh
@@ -171,6 +171,8 @@ fi
 # Aliases
 #
 
-alias py='python'
-alias py2='python2'
-alias py3='python3'
+if ! zstyle -t ':prezto:module:python:alias' skip; then
+  alias py='python'
+  alias py2='python2'
+  alias py3='python3'
+fi
diff --git a/modules/rails/init.zsh b/modules/rails/init.zsh
index 44b53e90..ed86372b 100644
--- a/modules/rails/init.zsh
+++ b/modules/rails/init.zsh
@@ -19,17 +19,19 @@ fi
 # Aliases
 #
 
-alias ror='bundle exec rails'
-alias rorc='bundle exec rails console'
-alias rordc='bundle exec rails dbconsole'
-alias rordm='bundle exec rake db:migrate'
-alias rordM='bundle exec rake db:migrate db:test:clone'
-alias rordr='bundle exec rake db:rollback'
-alias rorg='bundle exec rails generate'
-alias rorl='tail -f "$(ruby-app-root)/log/development.log"'
-alias rorlc='bundle exec rake log:clear'
-alias rorp='bundle exec rails plugin'
-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'
+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'
+  alias rordm='bundle exec rake db:migrate'
+  alias rordM='bundle exec rake db:migrate db:test:clone'
+  alias rordr='bundle exec rake db:rollback'
+  alias rorg='bundle exec rails generate'
+  alias rorl='tail -f "$(ruby-app-root)/log/development.log"'
+  alias rorlc='bundle exec rake log:clear'
+  alias rorp='bundle exec rails plugin'
+  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
diff --git a/modules/ruby/init.zsh b/modules/ruby/init.zsh
index cf55bc50..86ab43ce 100644
--- a/modules/ruby/init.zsh
+++ b/modules/ruby/init.zsh
@@ -59,23 +59,25 @@ fi
 # Aliases
 #
 
-# General
-alias rb='ruby'
+if ! zstyle -t ':prezto:module:ruby:alias' skip; then
+  # General
+  alias rb='ruby'
 
-# Bundler
-if (( $+commands[bundle] )); then
-  alias rbb='bundle'
-  alias rbbc='bundle clean'
-  alias rbbe='bundle exec'
-  alias rbbi='bundle install --path vendor/bundle'
-  alias rbbl='bundle list'
-  alias rbbo='bundle open'
-  alias rbbp='bundle package'
-  alias rbbu='bundle update'
-  alias rbbI='rbbi \
-    && bundle package \
-    && print .bundle       >>! .gitignore \
-    && print vendor/assets >>! .gitignore \
-    && print vendor/bundle >>! .gitignore \
-    && print vendor/cache  >>! .gitignore'
+  # Bundler
+  if (( $+commands[bundle] )); then
+    alias rbb='bundle'
+    alias rbbc='bundle clean'
+    alias rbbe='bundle exec'
+    alias rbbi='bundle install --path vendor/bundle'
+    alias rbbl='bundle list'
+    alias rbbo='bundle open'
+    alias rbbp='bundle package'
+    alias rbbu='bundle update'
+    alias rbbI='rbbi \
+      && bundle package \
+      && print .bundle       >>! .gitignore \
+      && print vendor/assets >>! .gitignore \
+      && print vendor/bundle >>! .gitignore \
+      && print vendor/cache  >>! .gitignore'
+  fi
 fi
diff --git a/modules/screen/init.zsh b/modules/screen/init.zsh
index 0dee1c96..4dea5661 100644
--- a/modules/screen/init.zsh
+++ b/modules/screen/init.zsh
@@ -36,7 +36,9 @@ fi
 # Aliases
 #
 
-alias scr='screen'
-alias scrl='screen -list'
-alias scrn='screen -U -S'
-alias scrr='screen -a -A -U -D -R'
+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
diff --git a/modules/tmux/init.zsh b/modules/tmux/init.zsh
index 2075daa3..17006c82 100644
--- a/modules/tmux/init.zsh
+++ b/modules/tmux/init.zsh
@@ -45,5 +45,7 @@ fi
 # Aliases
 #
 
-alias tmuxa="tmux $_tmux_iterm_integration new-session -A"
-alias tmuxl='tmux list-sessions'
+if ! zstyle -t ':prezto:module:tmux:alias' skip; then
+  alias tmuxa="tmux $_tmux_iterm_integration new-session -A"
+  alias tmuxl='tmux list-sessions'
+fi

From 0c364cdd5eae97438d7615259d09af5b6d2f4e65 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Wed, 26 Apr 2023 19:25:39 -0500
Subject: [PATCH 06/46] prompt: Update async submodule to 1.8.6

---
 modules/prompt/external/async | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/prompt/external/async b/modules/prompt/external/async
index bbbc92bd..a66d76f8 160000
--- a/modules/prompt/external/async
+++ b/modules/prompt/external/async
@@ -1 +1 @@
-Subproject commit bbbc92bd01592513a6b7739a45b7911af18acaef
+Subproject commit a66d76f8404bd9e7a26037640e6c892cf5871ff4

From f5dff4fe2237def19d392d5ffa9b719b51b47166 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Wed, 26 Apr 2023 19:26:09 -0500
Subject: [PATCH 07/46] prompt: Update pure submodule to 1.21.0

---
 modules/prompt/external/pure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/prompt/external/pure b/modules/prompt/external/pure
index 5b458ba5..2f13dea4 160000
--- a/modules/prompt/external/pure
+++ b/modules/prompt/external/pure
@@ -1 +1 @@
-Subproject commit 5b458ba5b75f49a8071d53c343f1a23631f7bced
+Subproject commit 2f13dea466466dde1ba844ba5211e7556f4ae2db

From e7f75d20bc11093da934fce7e7a722155e1dc018 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Wed, 26 Apr 2023 19:40:59 -0500
Subject: [PATCH 08/46] prompt: Remove 'powerlevel9k' deprecation warning

'powerlevel9k' is unsupported and deprecated for 2 years now. It's time
to cleanu the deprecation warning message.
---
 modules/prompt/init.zsh | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/modules/prompt/init.zsh b/modules/prompt/init.zsh
index 31808837..37bff328 100644
--- a/modules/prompt/init.zsh
+++ b/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

From 8d895a70a57e166370063954e9a0455f46ccaad3 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Wed, 26 Apr 2023 19:55:33 -0500
Subject: [PATCH 09/46] history: Remove 'HISTFILE' path relocation warning

'HISTFILE' path relocation was done 2 years ago. It's time to cleanup
the warning message.
---
 modules/history/init.zsh | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/modules/history/init.zsh b/modules/history/init.zsh
index 3ef52ea4..084a7ed5 100644
--- a/modules/history/init.zsh
+++ b/modules/history/init.zsh
@@ -42,28 +42,3 @@ 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
-
-  # 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

From 52bf42f887e437d69add0fe532857af9c04b09f7 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Wed, 26 Apr 2023 21:11:09 -0500
Subject: [PATCH 10/46] python: Expand Python command pattern per convention

Use `(i)python[0-9.]#` as subscript for commands associative array,
following the convention [1] of detection python more exhaustively.

[1] https://github.com/zsh-users/zsh/blob/858b8de3d70fe76a3637c281bc2c8e3a6d961a2c/Completion/Unix/Command/_python#L1
---
 modules/python/init.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/python/init.zsh b/modules/python/init.zsh
index 02eb52d7..ce2fc693 100644
--- a/modules/python/init.zsh
+++ b/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
-      VIRTUALENVWRAPPER_PYTHON=$commands[(i)python[23]#]
+    if (( ! $+VIRTUALENVWRAPPER_PYTHON )) && (( $+commands[(i)python[0-9.]#] )); then
+      VIRTUALENVWRAPPER_PYTHON=$commands[(i)python[0-9.]#]
     fi
 
     virtualenvwrapper_sources=(

From f7cb1fee1b5d45df07d141c1f10d9286f98fb8de Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Thu, 27 Apr 2023 13:21:16 -0500
Subject: [PATCH 11/46] gnu-utility: Remove now obsolete egrep and fgrep

These were marked deprecated for a while and has now been marked
obsolete since gnu-grep 3.8 [1]. They have been removed from POSIX as
well [2].

[1] https://lists.gnu.org/archive/html/info-gnu/2022-09/msg00001.html
[2] https://pubs.opengroup.org/onlinepubs/9699919799/utilities/grep.html#tag_20_55_18
---
 modules/gnu-utility/init.zsh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/gnu-utility/init.zsh b/modules/gnu-utility/init.zsh
index a8521f0c..2cfbf2fa 100644
--- a/modules/gnu-utility/init.zsh
+++ b/modules/gnu-utility/init.zsh
@@ -44,8 +44,7 @@ _gnu_utility_cmds=(
   'libtool' 'libtoolize'
 
   # Miscellaneous
-  'awk' 'egrep' 'fgrep' 'getopt' 'grep' 'indent' 'make' 'sed' 'tar' 'time'
-  'units' 'which'
+  'awk' 'getopt' 'grep' 'indent' 'make' 'sed' 'tar' 'time' 'units' 'which'
 )
 
 # Wrap GNU utilities in functions.

From 3c002f772ef4ba8bd247d695b0429e5c9df6f331 Mon Sep 17 00:00:00 2001
From: Roman Perepelitsa <roman.perepelitsa@gmail.com>
Date: Thu, 4 May 2023 12:08:42 +0200
Subject: [PATCH 12/46] prompt: update powerlevel10k submodule to v1.18.0

Release notes:

  - https://github.com/romkatv/powerlevel10k/releases/tag/v1.18.0
---
 modules/prompt/external/powerlevel10k | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/prompt/external/powerlevel10k b/modules/prompt/external/powerlevel10k
index a066b55f..0af598cb 160000
--- a/modules/prompt/external/powerlevel10k
+++ b/modules/prompt/external/powerlevel10k
@@ -1 +1 @@
-Subproject commit a066b55f855c8e488d3ea9e26e861bdd5ecd4fe8
+Subproject commit 0af598cbed78660066f8a8f4465844501ba5695b

From e14fdff4cbce3fb70dd641d2234465a5dae44561 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Thu, 4 May 2023 20:48:55 -0500
Subject: [PATCH 13/46] history: Remove interim zstyle variables

---
 modules/history/init.zsh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/history/init.zsh b/modules/history/init.zsh
index 084a7ed5..3912c19e 100644
--- a/modules/history/init.zsh
+++ b/modules/history/init.zsh
@@ -26,13 +26,12 @@ 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' histsize '_pmh_histsize' || _pmh_histsize=10000
-zstyle -s ':prezto:module:history' savehist '_pmh_savehist' || _pmh_savehist=${_pmh_histsize}
-HISTFILE="${_pmh_histfile}"  # The path to the history file.
-HISTSIZE="${_pmh_histsize}"  # The maximum number of events to save in the internal history.
-SAVEHIST="${_pmh_savehist}"  # The maximum number of events to save in the history file.
-unset _pmh_{hist{file,size},savehist}
+zstyle -s ':prezto:module:history' histfile 'HISTFILE' \
+    || HISTFILE="${HISTFILE:-${ZDOTDIR:-$HOME}/.zsh_history}" # The path to the history file.
+zstyle -s ':prezto:module:history' histsize 'HISTSIZE' \
+    || HISTSIZE=10000                                         # The maximum number of events to save in the internal history.
+zstyle -s ':prezto:module:history' savehist 'SAVEHIST' \
+    || SAVEHIST=$HISTSIZE                                     # The maximum number of events to save in the history file.
 
 #
 # Aliases

From 5ca892d6af50bedb1dd930e03bbe6b3511e976d3 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Thu, 4 May 2023 22:02:29 -0500
Subject: [PATCH 14/46] history: Reformat inline comments

---
 modules/history/init.zsh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/history/init.zsh b/modules/history/init.zsh
index 3912c19e..069dc2f1 100644
--- a/modules/history/init.zsh
+++ b/modules/history/init.zsh
@@ -10,17 +10,17 @@
 # Options
 #
 
-setopt BANG_HIST                 # Treat the '!' character specially during expansion.
-setopt EXTENDED_HISTORY          # Write the history file in the ':start:elapsed;command' format.
-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.
-setopt HIST_IGNORE_ALL_DUPS      # Delete an old recorded event if a new event is a duplicate.
-setopt HIST_FIND_NO_DUPS         # Do not display a previously found event.
-setopt HIST_IGNORE_SPACE         # Do not record an event starting with a space.
-setopt HIST_SAVE_NO_DUPS         # Do not write a duplicate event to the history file.
-setopt HIST_VERIFY               # Do not execute immediately upon history expansion.
-setopt HIST_BEEP                 # Beep when accessing non-existent history.
+setopt BANG_HIST              # Treat the '!' character specially during expansion.
+setopt EXTENDED_HISTORY       # Write the history file in the ':start:elapsed;command' format.
+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.
+setopt HIST_IGNORE_ALL_DUPS   # Delete an old recorded event if a new event is a duplicate.
+setopt HIST_FIND_NO_DUPS      # Do not display a previously found event.
+setopt HIST_IGNORE_SPACE      # Do not record an event starting with a space.
+setopt HIST_SAVE_NO_DUPS      # Do not write a duplicate event to the history file.
+setopt HIST_VERIFY            # Do not execute immediately upon history expansion.
+setopt HIST_BEEP              # Beep when accessing non-existent history.
 
 #
 # Variables

From 8ee9d1bbfe3b82d73a611fd01d7a3a53b1a97bb6 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Thu, 4 May 2023 22:21:48 -0500
Subject: [PATCH 15/46] general: Documentation update for zstyle based alias
 skipping support

Add documentation to surface the `zstyle` based alias skipping.
---
 modules/directory/README.md | 7 +++++++
 modules/emacs/README.md     | 7 +++++++
 modules/fasd/README.md      | 7 +++++++
 modules/history/README.md   | 7 +++++++
 modules/homebrew/README.md  | 7 +++++++
 modules/macports/README.md  | 7 +++++++
 modules/node/README.md      | 7 +++++++
 modules/perl/README.md      | 7 +++++++
 modules/python/README.md    | 7 +++++++
 modules/rails/README.md     | 7 +++++++
 modules/ruby/README.md      | 7 +++++++
 modules/screen/README.md    | 7 +++++++
 modules/tmux/README.md      | 7 +++++++
 13 files changed, 91 insertions(+)

diff --git a/modules/directory/README.md b/modules/directory/README.md
index 86953a47..8603d9f6 100644
--- a/modules/directory/README.md
+++ b/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.
 
diff --git a/modules/emacs/README.md b/modules/emacs/README.md
index f93304aa..8cf7bfc8 100644
--- a/modules/emacs/README.md
+++ b/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.
diff --git a/modules/fasd/README.md b/modules/fasd/README.md
index 1958a739..04f9693a 100644
--- a/modules/fasd/README.md
+++ b/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
diff --git a/modules/history/README.md b/modules/history/README.md
index 11c6d947..51e6e8ca 100644
--- a/modules/history/README.md
+++ b/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
diff --git a/modules/homebrew/README.md b/modules/homebrew/README.md
index 1875e08d..77d8f377 100644
--- a/modules/homebrew/README.md
+++ b/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.
diff --git a/modules/macports/README.md b/modules/macports/README.md
index ba6143b5..15963b33 100644
--- a/modules/macports/README.md
+++ b/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.
diff --git a/modules/node/README.md b/modules/node/README.md
index 6ec0b75c..bc262151 100644
--- a/modules/node/README.md
+++ b/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.
diff --git a/modules/perl/README.md b/modules/perl/README.md
index 772d0680..dd594491 100644
--- a/modules/perl/README.md
+++ b/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`.
diff --git a/modules/python/README.md b/modules/python/README.md
index 1695fa05..2e3b2eec 100644
--- a/modules/python/README.md
+++ b/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`.
diff --git a/modules/rails/README.md b/modules/rails/README.md
index 129627a0..5e230e0e 100644
--- a/modules/rails/README.md
+++ b/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.
diff --git a/modules/ruby/README.md b/modules/ruby/README.md
index 97a09f07..fa3d1064 100644
--- a/modules/ruby/README.md
+++ b/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`.
diff --git a/modules/screen/README.md b/modules/screen/README.md
index a1775f7e..b5549510 100644
--- a/modules/screen/README.md
+++ b/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.
diff --git a/modules/tmux/README.md b/modules/tmux/README.md
index e7ae929d..f6d375b0 100644
--- a/modules/tmux/README.md
+++ b/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.
 

From 8d00c51900dfce3b2bc1e5bd99bd58f238c5668a Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Thu, 4 May 2023 21:36:08 -0500
Subject: [PATCH 16/46] python: Remove pip completion from prezto local

pip completion is bundled with Zsh 5.9. Remove it from prezto local to
avoid shadowing the bundled completion.
---
 modules/python/functions/_pip | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 modules/python/functions/_pip

diff --git a/modules/python/functions/_pip b/modules/python/functions/_pip
deleted file mode 100644
index 4e0ffb80..00000000
--- a/modules/python/functions/_pip
+++ /dev/null
@@ -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

From c9c716e9c11938a1aff2f30230d4dc1da38dc564 Mon Sep 17 00:00:00 2001
From: Roman Perepelitsa <roman.perepelitsa@gmail.com>
Date: Fri, 23 Jun 2023 07:49:15 +0200
Subject: [PATCH 17/46] prompt: update powerlevel10k submodule to v1.19.0

Release notes:

  - https://github.com/romkatv/powerlevel10k/releases/tag/v1.19.0
---
 modules/prompt/external/powerlevel10k | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/prompt/external/powerlevel10k b/modules/prompt/external/powerlevel10k
index 0af598cb..017395a2 160000
--- a/modules/prompt/external/powerlevel10k
+++ b/modules/prompt/external/powerlevel10k
@@ -1 +1 @@
-Subproject commit 0af598cbed78660066f8a8f4465844501ba5695b
+Subproject commit 017395a266aa15011c09e64e44a1c98ed91c478c

From d80e4aa86c83290e91172745cb046846df5d274b Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Mon, 11 Sep 2023 21:28:26 -0500
Subject: [PATCH 18/46] prompt: Update pure submodule to 1.22.0

---
 modules/prompt/external/pure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/prompt/external/pure b/modules/prompt/external/pure
index 2f13dea4..87e6f5dd 160000
--- a/modules/prompt/external/pure
+++ b/modules/prompt/external/pure
@@ -1 +1 @@
-Subproject commit 2f13dea466466dde1ba844ba5211e7556f4ae2db
+Subproject commit 87e6f5dd4c793f6d980532205aaefe196780606f

From 5ac0777191b3c72a8af4f5af1631365a9ad81e9a Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Mon, 11 Sep 2023 21:30:42 -0500
Subject: [PATCH 19/46] history-substring-search: Update
 history-substring-search submodule to 1.1.0

---
 modules/history-substring-search/external | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/history-substring-search/external b/modules/history-substring-search/external
index 0f80b8eb..400e58a8 160000
--- a/modules/history-substring-search/external
+++ b/modules/history-substring-search/external
@@ -1 +1 @@
-Subproject commit 0f80b8eb3368b46e5e573c1d91ae69eb095db3fb
+Subproject commit 400e58a87f72ecec14f783fbd29bc6be4ff1641c

From 64d46c407a57ead7e2c0e442b9e1815c6d54d9b5 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Mon, 11 Sep 2023 21:34:28 -0500
Subject: [PATCH 20/46] completion: Update completion submodule to 0.35.0

---
 modules/completion/external | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/completion/external b/modules/completion/external
index 0331b290..67921bc1 160000
--- a/modules/completion/external
+++ b/modules/completion/external
@@ -1 +1 @@
-Subproject commit 0331b2908f93556453e45fa5a899aa21e0a7f64d
+Subproject commit 67921bc12502c1e7b0f156533fbac2cb51f6943d

From 1b0cc0a219875eb16b75221167e9916820a2956a Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Mon, 11 Sep 2023 21:51:45 -0500
Subject: [PATCH 21/46] utility: Detect lsd and honor its GNU ls compatibility

lsd (LSDeluxe) is a modern GNU compatibile alternative to ls. Detect if
it is aliased to ls and honor its GNU ls compatibility.
---
 modules/utility/init.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh
index c9015915..7e2e14ed 100644
--- a/modules/utility/init.zsh
+++ b/modules/utility/init.zsh
@@ -76,7 +76,7 @@ if zstyle -T ':prezto:module:utility' safe-ops; then
 fi
 
 # ls
-if [[ ${(@M)${(f)"$(ls --version 2>&1)"}:#*GNU *} ]]; then
+if [[ ${(@M)${(f)"$(ls --version 2>&1)"}:#*(GNU|lsd) *} ]]; then
   # GNU Core Utilities
 
   if zstyle -T ':prezto:module:utility:ls' dirs-first; then

From bd180eec72c3ef28de3e794ebf08a05c640b4eda Mon Sep 17 00:00:00 2001
From: dllud <dllud@riseup.net>
Date: Fri, 19 May 2023 16:41:29 +0100
Subject: [PATCH 22/46] history-substring-search: add fuzzy and unique

---
 modules/history-substring-search/README.md | 18 ++++++++++++++++++
 modules/history-substring-search/init.zsh  |  8 ++++++++
 runcoms/zpreztorc                          |  6 ++++++
 3 files changed, 32 insertions(+)

diff --git a/modules/history-substring-search/README.md b/modules/history-substring-search/README.md
index 3a109c55..42919e0c 100644
--- a/modules/history-substring-search/README.md
+++ b/modules/history-substring-search/README.md
@@ -65,6 +65,24 @@ _`${ZDOTDIR:-$HOME}/.zpreztorc`_:
 zstyle ':prezto:module:history-substring-search' globbing-flags ''
 ```
 
+### Fuzzy search
+
+To enable fuzzy search add the following line to
+`${ZDOTDIR:-$HOME}/.zpreztorc`_:
+
+```sh
+zstyle ':prezto:module:history-substring-search' fuzzy 'yes'
+```
+
+### Unique results
+
+To retrieve only unique results (remove duplicates) add the following line to
+`${ZDOTDIR:-$HOME}/.zpreztorc`_:
+
+```sh
+zstyle ':prezto:module:history-substring-search' ensure-unique 'yes'
+```
+
 ## Authors
 
 _The authors of this module should be contacted via the [issue tracker][5]._
diff --git a/modules/history-substring-search/init.zsh b/modules/history-substring-search/init.zsh
index 0de78918..d287ae4d 100644
--- a/modules/history-substring-search/init.zsh
+++ b/modules/history-substring-search/init.zsh
@@ -38,6 +38,14 @@ if ! zstyle -t ':prezto:module:history-substring-search' color; then
   unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_{FOUND,NOT_FOUND}
 fi
 
+if zstyle -t ':prezto:module:history-substring-search' fuzzy; then
+  HISTORY_SUBSTRING_SEARCH_FUZZY=1
+fi
+
+if zstyle -t ':prezto:module:history-substring-search' ensure-unique; then
+  HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE=1
+fi
+
 #
 # Key Bindings
 #
diff --git a/runcoms/zpreztorc b/runcoms/zpreztorc
index ae68a893..2d863c98 100644
--- a/runcoms/zpreztorc
+++ b/runcoms/zpreztorc
@@ -109,6 +109,12 @@ zstyle ':prezto:module:editor' key-bindings 'emacs'
 # Set the search globbing flags.
 # zstyle ':prezto:module:history-substring-search' globbing-flags ''
 
+# Enable fuzzy search
+# zstyle ':prezto:module:history-substring-search' fuzzy 'yes'
+
+# Retrieve only unique results (removes duplicates)
+# zstyle ':prezto:module:history-substring-search' ensure-unique 'yes'
+
 #
 # macOS
 #

From 9bf1ae66bc94d246daf9537f8f1ade6b36619775 Mon Sep 17 00:00:00 2001
From: mritd <mritd@linux.com>
Date: Sun, 19 Sep 2021 18:59:54 +0800
Subject: [PATCH 23/46] feat(history-substring-search): add `prefixed` setting

support zsh-history-substring-search `HISTORY_SUBSTRING_SEARCH_PREFIXED` env

Signed-off-by: mritd <mritd@linux.com>
---
 modules/history-substring-search/README.md | 6 ++++++
 modules/history-substring-search/init.zsh  | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/modules/history-substring-search/README.md b/modules/history-substring-search/README.md
index 42919e0c..32841106 100644
--- a/modules/history-substring-search/README.md
+++ b/modules/history-substring-search/README.md
@@ -63,6 +63,12 @@ _`${ZDOTDIR:-$HOME}/.zpreztorc`_:
 
 ```sh
 zstyle ':prezto:module:history-substring-search' globbing-flags ''
+
+To set the search matched against the start of each history entry, add the following line to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_:
+
+```sh
+zstyle ':prezto:module:history-substring-search' prefixed 'yes'
 ```
 
 ### Fuzzy search
diff --git a/modules/history-substring-search/init.zsh b/modules/history-substring-search/init.zsh
index d287ae4d..37483255 100644
--- a/modules/history-substring-search/init.zsh
+++ b/modules/history-substring-search/init.zsh
@@ -34,6 +34,10 @@ if zstyle -t ':prezto:module:history-substring-search' case-sensitive; then
   HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS="${HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS//i}"
 fi
 
+if zstyle -t ':prezto:module:history-substring-search' prefixed; then
+  HISTORY_SUBSTRING_SEARCH_PREFIXED='true'
+fi
+
 if ! zstyle -t ':prezto:module:history-substring-search' color; then
   unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_{FOUND,NOT_FOUND}
 fi

From 74a19fb665a41093f6e587ab80f6849a840acb90 Mon Sep 17 00:00:00 2001
From: mritd <mritd@linux.com>
Date: Mon, 20 Sep 2021 11:14:46 +0800
Subject: [PATCH 24/46] docs(history-substring-search): add `prefixed` setting
 example comment

add `prefixed` setting example comment

Signed-off-by: mritd <mritd@linux.com>
---
 runcoms/zpreztorc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runcoms/zpreztorc b/runcoms/zpreztorc
index 2d863c98..2df7c73e 100644
--- a/runcoms/zpreztorc
+++ b/runcoms/zpreztorc
@@ -115,6 +115,9 @@ zstyle ':prezto:module:editor' key-bindings 'emacs'
 # Retrieve only unique results (removes duplicates)
 # zstyle ':prezto:module:history-substring-search' ensure-unique 'yes'
 
+# Set the search prefixed.
+# zstyle ':prezto:module:history-substring-search' prefixed 'yes'
+
 #
 # macOS
 #

From 5ac930d96be3a51730f7d9d7330f28d9c9c36e0a Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Mon, 11 Sep 2023 23:28:38 -0500
Subject: [PATCH 25/46] history-substring-search: Tweak documentation and
 cleanup

---
 modules/history-substring-search/README.md | 26 ++++++++++++++++------
 modules/history-substring-search/init.zsh  | 10 ++++-----
 runcoms/zpreztorc                          | 11 +++++----
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/modules/history-substring-search/README.md b/modules/history-substring-search/README.md
index 32841106..e7c55c53 100644
--- a/modules/history-substring-search/README.md
+++ b/modules/history-substring-search/README.md
@@ -63,18 +63,21 @@ _`${ZDOTDIR:-$HOME}/.zpreztorc`_:
 
 ```sh
 zstyle ':prezto:module:history-substring-search' globbing-flags ''
+```
 
-To set the search matched against the start of each history entry, add the following line to
+### Case sensitive search
+
+To set the search case-sensitivity, add the following line to
 _`${ZDOTDIR:-$HOME}/.zpreztorc`_:
 
 ```sh
-zstyle ':prezto:module:history-substring-search' prefixed 'yes'
+zstyle ':prezto:module:history-substring-search' case-sensitive 'yes'
 ```
 
 ### Fuzzy search
 
-To enable fuzzy search add the following line to
-`${ZDOTDIR:-$HOME}/.zpreztorc`_:
+To enable search for fuzzy matches, add the following line to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_:
 
 ```sh
 zstyle ':prezto:module:history-substring-search' fuzzy 'yes'
@@ -82,11 +85,20 @@ zstyle ':prezto:module:history-substring-search' fuzzy 'yes'
 
 ### Unique results
 
-To retrieve only unique results (remove duplicates) add the following line to
-`${ZDOTDIR:-$HOME}/.zpreztorc`_:
+To enable unique results, add the following line to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_:
 
 ```sh
-zstyle ':prezto:module:history-substring-search' ensure-unique 'yes'
+zstyle ':prezto:module:history-substring-search' unique 'yes'
+```
+
+### Prefixed search
+
+To enable prefixed search matches, add the following line to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_:
+
+```sh
+zstyle ':prezto:module:history-substring-search' prefixed 'yes'
 ```
 
 ## Authors
diff --git a/modules/history-substring-search/init.zsh b/modules/history-substring-search/init.zsh
index 37483255..54e8b00e 100644
--- a/modules/history-substring-search/init.zsh
+++ b/modules/history-substring-search/init.zsh
@@ -34,10 +34,6 @@ if zstyle -t ':prezto:module:history-substring-search' case-sensitive; then
   HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS="${HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS//i}"
 fi
 
-if zstyle -t ':prezto:module:history-substring-search' prefixed; then
-  HISTORY_SUBSTRING_SEARCH_PREFIXED='true'
-fi
-
 if ! zstyle -t ':prezto:module:history-substring-search' color; then
   unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_{FOUND,NOT_FOUND}
 fi
@@ -46,10 +42,14 @@ if zstyle -t ':prezto:module:history-substring-search' fuzzy; then
   HISTORY_SUBSTRING_SEARCH_FUZZY=1
 fi
 
-if zstyle -t ':prezto:module:history-substring-search' ensure-unique; then
+if zstyle -t ':prezto:module:history-substring-search' unique; then
   HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE=1
 fi
 
+if zstyle -t ':prezto:module:history-substring-search' prefixed; then
+  HISTORY_SUBSTRING_SEARCH_PREFIXED=1
+fi
+
 #
 # Key Bindings
 #
diff --git a/runcoms/zpreztorc b/runcoms/zpreztorc
index 2df7c73e..b37c4313 100644
--- a/runcoms/zpreztorc
+++ b/runcoms/zpreztorc
@@ -109,13 +109,16 @@ zstyle ':prezto:module:editor' key-bindings 'emacs'
 # Set the search globbing flags.
 # zstyle ':prezto:module:history-substring-search' globbing-flags ''
 
-# Enable fuzzy search
+# Enable search case-sensitivity.
+# zstyle ':prezto:module:history-substring-search' case-sensitive 'yes'
+
+# Enable search for fuzzy matches.
 # zstyle ':prezto:module:history-substring-search' fuzzy 'yes'
 
-# Retrieve only unique results (removes duplicates)
-# zstyle ':prezto:module:history-substring-search' ensure-unique 'yes'
+# Enable search uniqueness.
+# zstyle ':prezto:module:history-substring-search' unique 'yes'
 
-# Set the search prefixed.
+# Enable prefixed search.
 # zstyle ':prezto:module:history-substring-search' prefixed 'yes'
 
 #

From 457ade4f014285d47fec229c5210af752f5be7e4 Mon Sep 17 00:00:00 2001
From: John Britton <public@johndbritton.com>
Date: Thu, 5 Oct 2023 14:45:56 -0400
Subject: [PATCH 26/46] python: Remove pyenv init woraround for pyenv >= 2.3.0

The startup logic and instructions have been updated for simplicity in
pyenv 2.3.0. The workaround for pyenv init is no longer necessary.

Signed-off-by: Indrajit Raychaudhuri <irc@indrajit.com>
---
 modules/python/init.zsh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/python/init.zsh b/modules/python/init.zsh
index ce2fc693..c303cad1 100644
--- a/modules/python/init.zsh
+++ b/modules/python/init.zsh
@@ -25,12 +25,7 @@ if [[ -s "${local_pyenv::=${PYENV_ROOT:-$HOME/.pyenv}/bin/pyenv}" ]] \
   # Ensure manually installed pyenv is added to path when present.
   [[ -s $local_pyenv ]] && path=($local_pyenv:h $path)
 
-  # pyenv 2+ requires shims to be added to path before being initialized.
-  autoload -Uz is-at-least
-  if is-at-least 2 ${"$(pyenv --version 2>&1)"[(w)2]}; then
-    eval "$(pyenv init --path zsh)"
-  fi
-
+  # Load pyenv into the shell session.
   eval "$(pyenv init - zsh)"
 
 # Prepend PEP 370 per user site packages directory, which defaults to

From 347441abdf9ea16cf4ea9306ea78f38af41e6667 Mon Sep 17 00:00:00 2001
From: Abizer Lokhandwala <abizer@abizer.me>
Date: Mon, 6 Nov 2023 12:35:24 -0800
Subject: [PATCH 27/46] remove alias sl='ls'

---
 modules/utility/README.md | 1 -
 modules/utility/init.zsh  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/modules/utility/README.md b/modules/utility/README.md
index 142b1eae..78a75556 100644
--- a/modules/utility/README.md
+++ b/modules/utility/README.md
@@ -140,7 +140,6 @@ zstyle ':prezto:module:utility' correct 'no'
 - `lt` lists sorted by date, most recent last.
 - `lc` lists sorted by date, most recent last, shows change time.
 - `lu` lists sorted by date, most recent last, shows access time.
-- `sl` lists directory contents (correction for `ls`).
 
 ### macOS Everywhere
 
diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh
index 7e2e14ed..e10c4fea 100644
--- a/modules/utility/init.zsh
+++ b/modules/utility/init.zsh
@@ -122,7 +122,6 @@ alias lk='ll -Sr'        # Lists sorted by size, largest last.
 alias lt='ll -tr'        # Lists sorted by date, most recent last.
 alias lc='lt -c'         # Lists sorted by date, most recent last, shows change time.
 alias lu='lt -u'         # Lists sorted by date, most recent last, shows access time.
-alias sl='ls'            # Correction for common spelling error.
 
 if [[ ${(@M)${(f)"$(ls --version 2>&1)"}:#*GNU *} ]]; then
   alias lx='ll -XB'      # Lists sorted by extension (GNU only).

From f04191aa8ae475cf71f491830d424226d84501c9 Mon Sep 17 00:00:00 2001
From: Nobuhiro Takaichi <nobuhiro.takaichi@gmail.com>
Date: Sat, 23 Sep 2023 22:48:41 +0900
Subject: [PATCH 28/46] feat: Update submodules to avoid error with using zsh
 5.9

---
 modules/autosuggestions/external      | 2 +-
 modules/completion/external           | 2 +-
 modules/fasd/external                 | 2 +-
 modules/prompt/external/async         | 2 +-
 modules/prompt/external/powerlevel10k | 2 +-
 modules/syntax-highlighting/external  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/autosuggestions/external b/modules/autosuggestions/external
index a411ef3e..c3d4e576 160000
--- a/modules/autosuggestions/external
+++ b/modules/autosuggestions/external
@@ -1 +1 @@
-Subproject commit a411ef3e0992d4839f0732ebeb9823024afaaaa8
+Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5
diff --git a/modules/completion/external b/modules/completion/external
index 67921bc1..c0fe16fd 160000
--- a/modules/completion/external
+++ b/modules/completion/external
@@ -1 +1 @@
-Subproject commit 67921bc12502c1e7b0f156533fbac2cb51f6943d
+Subproject commit c0fe16fdadfc8fa8e26247e467bf09aeb7f3b4ca
diff --git a/modules/fasd/external b/modules/fasd/external
index 48220241..90b531a5 160000
--- a/modules/fasd/external
+++ b/modules/fasd/external
@@ -1 +1 @@
-Subproject commit 48220241e764fdf46b075cd7fe723468aaadde58
+Subproject commit 90b531a5daaa545c74c7d98974b54cbdb92659fc
diff --git a/modules/prompt/external/async b/modules/prompt/external/async
index a66d76f8..ee1d11b6 160000
--- a/modules/prompt/external/async
+++ b/modules/prompt/external/async
@@ -1 +1 @@
-Subproject commit a66d76f8404bd9e7a26037640e6c892cf5871ff4
+Subproject commit ee1d11b68c38dec24c22b1c51a45e8a815a79756
diff --git a/modules/prompt/external/powerlevel10k b/modules/prompt/external/powerlevel10k
index 017395a2..873c4ff0 160000
--- a/modules/prompt/external/powerlevel10k
+++ b/modules/prompt/external/powerlevel10k
@@ -1 +1 @@
-Subproject commit 017395a266aa15011c09e64e44a1c98ed91c478c
+Subproject commit 873c4ff09c559a507d33e528df7e27a8a48705d7
diff --git a/modules/syntax-highlighting/external b/modules/syntax-highlighting/external
index 932e29a0..143b25eb 160000
--- a/modules/syntax-highlighting/external
+++ b/modules/syntax-highlighting/external
@@ -1 +1 @@
-Subproject commit 932e29a0c75411cb618f02995b66c0a4a25699bc
+Subproject commit 143b25eb98aa3227af63bd7f04413e1b3e7888ec

From 380b96a218ef33d1ff4a641850822f583e11131a Mon Sep 17 00:00:00 2001
From: Kuruyia <8174691+Kuruyia@users.noreply.github.com>
Date: Sun, 26 Nov 2023 20:34:16 +0100
Subject: [PATCH 29/46] feat(editor): add zstyle configuration for WORDCHARS

---
 modules/editor/README.md | 11 +++++++++++
 modules/editor/init.zsh  |  3 ++-
 runcoms/zpreztorc        |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/modules/editor/README.md b/modules/editor/README.md
index 9aef6ef1..9c6b410a 100644
--- a/modules/editor/README.md
+++ b/modules/editor/README.md
@@ -12,6 +12,17 @@ Sets editor specific key bindings options and variables.
 
 ## Settings
 
+## Wordchars
+
+To change what characters are considered part of a word, add the following to
+_`${ZDOTDIR:-$HOME}/.zpreztorc`_.
+
+```sh
+zstyle ':prezto:module:editor' wordchars <chars>
+```
+
+Defaults to `*?_-.[]~&;!#$%^(){}<>`.
+
 ### Key bindings
 
 To enable key bindings, add the following to _`${ZDOTDIR:-$HOME}/.zpreztorc`_,
diff --git a/modules/editor/init.zsh b/modules/editor/init.zsh
index 5b411f58..5798bc80 100644
--- a/modules/editor/init.zsh
+++ b/modules/editor/init.zsh
@@ -21,7 +21,8 @@ setopt BEEP                     # Beep on error in line editor.
 #
 
 # Treat these characters as part of a word.
-WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
+zstyle -s ':prezto:module:editor' wordchars 'WORDCHARS' \
+  || WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
 
 # Use human-friendly identifiers.
 zmodload zsh/terminfo
diff --git a/runcoms/zpreztorc b/runcoms/zpreztorc
index b37c4313..f0046377 100644
--- a/runcoms/zpreztorc
+++ b/runcoms/zpreztorc
@@ -60,6 +60,9 @@ zstyle ':prezto:load' pmodule \
 # Editor
 #
 
+# Set the characters that are considered to be part of a word.
+# zstyle ':prezto:module:editor' wordchars '*?_-.[]~&;!#$%^(){}<>'
+
 # Set the key mapping style to 'emacs' or 'vi'.
 zstyle ':prezto:module:editor' key-bindings 'emacs'
 

From c0cdc12708803c4503cb1b3d7d42e5c1b8ba6e86 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Thu, 30 Nov 2023 14:12:57 -0600
Subject: [PATCH 30/46] editor: Adjust subheading level in documentation

---
 modules/editor/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/editor/README.md b/modules/editor/README.md
index 9c6b410a..a1c18520 100644
--- a/modules/editor/README.md
+++ b/modules/editor/README.md
@@ -12,7 +12,7 @@ Sets editor specific key bindings options and variables.
 
 ## Settings
 
-## Wordchars
+### Wordchars
 
 To change what characters are considered part of a word, add the following to
 _`${ZDOTDIR:-$HOME}/.zpreztorc`_.

From ac356c8cf6af51f276483ae8bb8c9c4954183eb9 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Thu, 18 Jan 2024 19:13:22 -0600
Subject: [PATCH 31/46] Adjust instruction for setting custom $ZDOTDIR

Adjust instruction for setting custom `$ZDOTDIR`.

This addresses 2 potential issues:
- Check for the presence of `$XDG_CONFIG_HOME/zsh` before assigning it to `$ZDOTDIR` instead of blindly assigning
- Avoid recursion in zsh variable assignment stack that might occasionally result in messages like:
```
zsh: job table full or recursion limit exceeded
```
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7b2efb1d..ead6af6b 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ version is **4.3.11**.
 
         ```sh
         export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:=$HOME/.config}"
-        export ZDOTDIR="${ZDOTDIR:=$XDG_CONFIG_HOME/zsh}"
+        [[ -d $XDG_CONFIG_HOME/zsh ]] && export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
         source "$ZDOTDIR/.zshenv"
         ```
 

From d03bc03fddbd80ead45986b68880001ccbbb98c1 Mon Sep 17 00:00:00 2001
From: Roman Perepelitsa <roman.perepelitsa@gmail.com>
Date: Fri, 26 Jan 2024 09:10:40 +0100
Subject: [PATCH 32/46] prompt: update powerlevel10k submodule to v1.20.0

Release notes:

  - https://github.com/romkatv/powerlevel10k/releases/tag/v1.20.0
---
 modules/prompt/external/powerlevel10k | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/prompt/external/powerlevel10k b/modules/prompt/external/powerlevel10k
index 873c4ff0..35833ea1 160000
--- a/modules/prompt/external/powerlevel10k
+++ b/modules/prompt/external/powerlevel10k
@@ -1 +1 @@
-Subproject commit 873c4ff09c559a507d33e528df7e27a8a48705d7
+Subproject commit 35833ea15f14b71dbcebc7e54c104d8d56ca5268

From c667dd3ea62b62b111102f0da58d33b5b20847a6 Mon Sep 17 00:00:00 2001
From: Cameron Wong <cam@camdar.io>
Date: Tue, 12 Mar 2024 19:38:59 -0400
Subject: [PATCH 33/46] fix zstyle case-insensitive completion

Signed-off-by: Cameron Wong <cam@camdar.io>
---
 modules/completion/init.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/completion/init.zsh b/modules/completion/init.zsh
index 9ba95634..12cb3336 100644
--- a/modules/completion/init.zsh
+++ b/modules/completion/init.zsh
@@ -84,7 +84,7 @@ if zstyle -t ':prezto:module:completion:*' case-sensitive; then
   zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
   setopt CASE_GLOB
 else
-  zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+  zstyle ':completion:*' matcher-list 'm:{[:lower:]}={[:upper:]}' 'm:{[:upper:]}={[:lower:]}'  'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
   unsetopt CASE_GLOB
 fi
 

From cc3b6e092ec78c3da21e89b3885eec73a526e765 Mon Sep 17 00:00:00 2001
From: Yutian Li <hotpxless@gmail.com>
Date: Mon, 1 Apr 2024 23:33:48 -0400
Subject: [PATCH 34/46] Allow .dir_colors to be a symlink

---
 modules/utility/init.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh
index e10c4fea..5b4bf80e 100644
--- a/modules/utility/init.zsh
+++ b/modules/utility/init.zsh
@@ -88,7 +88,7 @@ if [[ ${(@M)${(f)"$(ls --version 2>&1)"}:#*(GNU|lsd) *} ]]; then
     if (( ! $+LS_COLORS )); then
       # Try dircolors when available
       if is-callable 'dircolors'; then
-        eval "$(dircolors --sh $HOME/.dir_colors(.N))"
+        eval "$(dircolors --sh $HOME/.dir_colors(N))"
       else
         export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=36;01:cd=33;01:su=31;40;07:sg=36;40;07:tw=32;40;07:ow=33;40;07:'
       fi

From 5ff938dff57a8f44a896a12260a73955fbec75e0 Mon Sep 17 00:00:00 2001
From: Yutian Li <hotpxless@gmail.com>
Date: Sun, 31 Mar 2024 15:38:21 -0400
Subject: [PATCH 35/46] Update Python virtualenvwrapper documentation

---
 modules/python/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/python/README.md b/modules/python/README.md
index 2e3b2eec..821209af 100644
--- a/modules/python/README.md
+++ b/modules/python/README.md
@@ -13,7 +13,7 @@ disable _virtualenvwrapper_, add the following to
 _`${ZDOTDIR:-$HOME}/.zpreztorc`_.
 
 ```sh
-zstyle ':prezto:module:python' skip-virtualenvwrapper-init 'on'
+zstyle ':prezto:module:python:virtualenv' initialize 'no'
 ```
 
 Conda support can be enabled by adding the following to

From 185733aa63cae2ce0f2ff4bb914c2c16f7ed3502 Mon Sep 17 00:00:00 2001
From: Yutian Li <hotpxless@gmail.com>
Date: Sun, 31 Mar 2024 15:32:56 -0400
Subject: [PATCH 36/46] Update history-substring-search

---
 modules/history-substring-search/external | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/history-substring-search/external b/modules/history-substring-search/external
index 400e58a8..8dd05bfc 160000
--- a/modules/history-substring-search/external
+++ b/modules/history-substring-search/external
@@ -1 +1 @@
-Subproject commit 400e58a87f72ecec14f783fbd29bc6be4ff1641c
+Subproject commit 8dd05bfcc12b0cd1ee9ea64be725b3d9f713cf64

From 6bf4505b334d0d19a574789f279e91e4eacc285c Mon Sep 17 00:00:00 2001
From: Yutian Li <hotpxless@gmail.com>
Date: Thu, 4 Apr 2024 00:42:17 -0400
Subject: [PATCH 37/46] Allow overriding _ssh_agent_sock for symmetry to
 _ssh_agent_env

---
 modules/ssh/init.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/ssh/init.zsh b/modules/ssh/init.zsh
index f8709979..6bf237c5 100644
--- a/modules/ssh/init.zsh
+++ b/modules/ssh/init.zsh
@@ -16,8 +16,8 @@ _ssh_dir="$HOME/.ssh"
 # Set the path to the environment file if not set by another module.
 _ssh_agent_env="${_ssh_agent_env:-${XDG_CACHE_HOME:-$HOME/.cache}/prezto/ssh-agent.env}"
 
-# Set the path to the persistent authentication socket.
-_ssh_agent_sock="${XDG_CACHE_HOME:-$HOME/.cache}/prezto/ssh-agent.sock"
+# Set the path to the persistent authentication socket if not set by another module.
+_ssh_agent_sock="${_ssh_agent_sock:-${XDG_CACHE_HOME:-$HOME/.cache}/prezto/ssh-agent.sock}"
 
 # Start ssh-agent if not started.
 if [[ ! -S "$SSH_AUTH_SOCK" ]]; then

From 085ab11646f375b312fe10fbcfddca9b14985d8d Mon Sep 17 00:00:00 2001
From: mattmc3 <mattmc3@gmail.com>
Date: Tue, 12 Dec 2023 11:59:16 -0500
Subject: [PATCH 38/46] osx: Add trash function

---
 modules/osx/functions/trash | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 modules/osx/functions/trash

diff --git a/modules/osx/functions/trash b/modules/osx/functions/trash
new file mode 100644
index 00000000..0efa2154
--- /dev/null
+++ b/modules/osx/functions/trash
@@ -0,0 +1,31 @@
+#
+# Moves files to the macOS trash.
+#
+
+# function trash {
+
+emulate -L zsh
+setopt LOCAL_OPTIONS EXTENDED_GLOB
+
+local file
+local -a files=()
+for file in $@; do
+  if [[ -e $file ]]; then
+    # ':a' gets the full path (do not use ':A', which would resolve symlinks)
+    files+=("the POSIX file \"${file:a}\"")
+  else
+    print "trash: No such file or directory '$file'." >&2
+    return 1
+  fi
+done
+
+if (( $#files == 0 )); then
+  print 'usage: trash <files...>' >&2
+  return 64  # Match rm's return code.
+fi
+
+# Join file list with commas, and tell Finder to trash that list.
+local file_list="${(pj., .)files}"
+osascript 2>&1 > /dev/null -e "tell app \"Finder\" to move { "${file_list}" } to trash"
+
+# }

From f055c5070c3cb7521d0660f578e595f9ea087e1d Mon Sep 17 00:00:00 2001
From: Preston Hunt <me@prestonhunt.com>
Date: Wed, 6 Dec 2023 16:40:24 -0800
Subject: [PATCH 39/46] screen module: don't try to attach to dead screens

Removes dead screens from the list of candidate screens. Fixes issue
1253, "screen:auto-start problem with dead screens".
---
 modules/screen/init.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/screen/init.zsh b/modules/screen/init.zsh
index 4dea5661..1a3908d8 100644
--- a/modules/screen/init.zsh
+++ b/modules/screen/init.zsh
@@ -22,7 +22,7 @@ if [[ -z "$STY" && -z "$EMACS" && -z "$VIM" ]] && ( \
   session="$(
     screen -list 2> /dev/null \
       | sed '1d;$d' \
-      | awk '{print $1}' \
+      | awk '!/Dead/ {print $1}' \
       | head -1)"
 
   if [[ -n "$session" ]]; then

From a79c3b4943469393f76347dda5dc414b42e84588 Mon Sep 17 00:00:00 2001
From: Yutian Li <hotpxless@gmail.com>
Date: Fri, 5 Apr 2024 19:19:21 -0400
Subject: [PATCH 40/46] Remove Python module comment about completion

Local completion definition has been removed
---
 modules/python/README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/python/README.md b/modules/python/README.md
index 821209af..b7a32303 100644
--- a/modules/python/README.md
+++ b/modules/python/README.md
@@ -2,9 +2,6 @@
 
 Enables local Python and local Python package installation.
 
-This module must be loaded _before_ the _`completion`_ module so that the
-provided completion definitions are loaded.
-
 ## Settings
 
 This module supports virtual environments from conda and

From 005709d1201a6ad2f8b01b0185623e6d192d6c44 Mon Sep 17 00:00:00 2001
From: Yutian Li <hotpxless@gmail.com>
Date: Fri, 5 Apr 2024 19:21:15 -0400
Subject: [PATCH 41/46] Cache brew shellenv results

This could sometimes be slow (as with any external command execution)
but the result should almost never change.
---
 modules/homebrew/init.zsh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/homebrew/init.zsh b/modules/homebrew/init.zsh
index 78992587..a6fca815 100644
--- a/modules/homebrew/init.zsh
+++ b/modules/homebrew/init.zsh
@@ -21,7 +21,20 @@ fi
 # Load 'HOMEBREW_' prefixed variables only. Avoid loading 'PATH' related
 # variables as they are already handled in standard zsh configuration.
 if (( $+commands[brew] )); then
-  eval "${(@M)${(f)"$(brew shellenv 2> /dev/null)"}:#export HOMEBREW*}"
+  cache_file="${XDG_CACHE_HOME:-$HOME/.cache}/prezto/brew-shellenv-cache.zsh"
+  if [[ "${commands[brew]}" -nt "$cache_file" \
+      || "${ZDOTDIR:-$HOME}/.zpreztorc" -nt "$cache_file" \
+      || ( ! -n ${cache_file}(#qNmw-1) ) ]]; then
+    # Rebuild cache if either
+    # 1. brew is newer than the cache file
+    # 2. .zpreztorc is newer than the cache file
+    # 3. cache file doesn't exist
+    # 4. cache file is older than a week
+    mkdir -p "${cache_file:h}"
+    echo "${(@M)${(f)"$(brew shellenv 2> /dev/null)"}:#export HOMEBREW*}" >! "${cache_file}"
+  fi
+  source "${cache_file}"
+  unset cache_file
 fi
 
 #

From 775f14d0c383ddc06c086e1632a9b377a5d0950c Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Mon, 8 Apr 2024 20:37:23 -0500
Subject: [PATCH 42/46] homebrew: Simplify caching `brew shellenv`

Avoid checking age of cache file and just test for its existence.
While this is simpler, this also avoids depending on having
`EXTENDED_GLOB` enabled.
---
 modules/homebrew/init.zsh | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/modules/homebrew/init.zsh b/modules/homebrew/init.zsh
index a6fca815..dd2b5658 100644
--- a/modules/homebrew/init.zsh
+++ b/modules/homebrew/init.zsh
@@ -22,18 +22,15 @@ fi
 # variables as they are already handled in standard zsh configuration.
 if (( $+commands[brew] )); then
   cache_file="${XDG_CACHE_HOME:-$HOME/.cache}/prezto/brew-shellenv-cache.zsh"
-  if [[ "${commands[brew]}" -nt "$cache_file" \
+  if [[ "$commands[brew]" -nt "$cache_file" \
       || "${ZDOTDIR:-$HOME}/.zpreztorc" -nt "$cache_file" \
-      || ( ! -n ${cache_file}(#qNmw-1) ) ]]; then
-    # Rebuild cache if either
-    # 1. brew is newer than the cache file
-    # 2. .zpreztorc is newer than the cache file
-    # 3. cache file doesn't exist
-    # 4. cache file is older than a week
-    mkdir -p "${cache_file:h}"
-    echo "${(@M)${(f)"$(brew shellenv 2> /dev/null)"}:#export HOMEBREW*}" >! "${cache_file}"
+      || ! -s "$cache_file" ]]; then
+    mkdir -p "$cache_file:h"
+    # Cache the result.
+    echo "${(@M)${(f)"$(brew shellenv 2> /dev/null)"}:#export HOMEBREW*}" >! "$cache_file" 2> /dev/null
   fi
-  source "${cache_file}"
+
+  source "$cache_file"
   unset cache_file
 fi
 

From f5a8cb456b74d4d71caf46037a356d2deee27b50 Mon Sep 17 00:00:00 2001
From: Jim <jim@neverandforever.com>
Date: Mon, 15 Apr 2024 16:28:00 +0100
Subject: [PATCH 43/46] Removing fig from README.md

Fig is sunsetting as per https://fig.io/blog/post/fig-is-sunsetting
---
 README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/README.md b/README.md
index ead6af6b..40163fa8 100644
--- a/README.md
+++ b/README.md
@@ -73,14 +73,6 @@ version is **4.3.11**.
 
 05. Open a new Zsh terminal window or tab.
 
-### [Fig](https://fig.io)
-
-Fig adds apps, shortcuts, and autocomplete to your existing terminal.
-
-Install `prezto` in just one click.
-
-<a href="https://fig.io/plugins/other/prezto" target="_blank"><img src="https://fig.io/badges/install-with-fig.svg" /></a>
-
 ### Troubleshooting
 
 If you are not able to find certain commands after switching to Prezto, modify

From 9e28cb48617d0ccc0c4f46945a77d610decd8d23 Mon Sep 17 00:00:00 2001
From: Diego Rabatone Oliveira <diraol@diraol.eng.br>
Date: Mon, 3 Jun 2024 12:16:13 -0300
Subject: [PATCH 44/46] [Bump] Completion module

Although it has tags, the release flow it is not well estabilished,
so it fall behind quite recurrently, thus why I'm updating it aginst the
master branch (it was already out of the latest tag anyway).

Ref:
https://github.com/zsh-users/zsh-completions/issues/1083
---
 modules/completion/external | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/completion/external b/modules/completion/external
index c0fe16fd..978e79e1 160000
--- a/modules/completion/external
+++ b/modules/completion/external
@@ -1 +1 @@
-Subproject commit c0fe16fdadfc8fa8e26247e467bf09aeb7f3b4ca
+Subproject commit 978e79e12c44b5b1d3e1e2920c537002087b82c2

From a217f1cac0a750226d3b4f483ee6d7a07d2a57b6 Mon Sep 17 00:00:00 2001
From: Diego Rabatone Oliveira <diraol@diraol.eng.br>
Date: Mon, 3 Jun 2024 12:19:44 -0300
Subject: [PATCH 45/46] [Bump] Syntax Highlighting to 0.8.0

---
 modules/syntax-highlighting/external | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/syntax-highlighting/external b/modules/syntax-highlighting/external
index 143b25eb..db085e46 160000
--- a/modules/syntax-highlighting/external
+++ b/modules/syntax-highlighting/external
@@ -1 +1 @@
-Subproject commit 143b25eb98aa3227af63bd7f04413e1b3e7888ec
+Subproject commit db085e4661f6aafd24e5acb5b2e17e4dd5dddf3e

From 9195b66161b196238cbd52a8a4abd027bdaf5f73 Mon Sep 17 00:00:00 2001
From: Diego Rabatone Oliveira <diraol@diraol.eng.br>
Date: Mon, 3 Jun 2024 12:26:21 -0300
Subject: [PATCH 46/46] [Bump] Pure prompt to 1.23.0

---
 modules/prompt/external/pure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/prompt/external/pure b/modules/prompt/external/pure
index 87e6f5dd..a02209d3 160000
--- a/modules/prompt/external/pure
+++ b/modules/prompt/external/pure
@@ -1 +1 @@
-Subproject commit 87e6f5dd4c793f6d980532205aaefe196780606f
+Subproject commit a02209d36c8509c0e62f44324127632999c9c0cf