Merge remote-tracking branch 'upstream/master'

modules/autosuggestions/external

@@ -1 +1 @@
-Subproject commit a411ef3e0992d4839f0732ebeb9823024afaaaa8
+Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5

modules/completion/external

@@ -1 +1 @@
-Subproject commit 67921bc12502c1e7b0f156533fbac2cb51f6943d
+Subproject commit c0fe16fdadfc8fa8e26247e467bf09aeb7f3b4ca

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`_,

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

modules/fasd/external

@@ -1 +1 @@
-Subproject commit 48220241e764fdf46b075cd7fe723468aaadde58
+Subproject commit 90b531a5daaa545c74c7d98974b54cbdb92659fc

modules/prompt/external/async

@@ -1 +1 @@
-Subproject commit a66d76f8404bd9e7a26037640e6c892cf5871ff4
+Subproject commit ee1d11b68c38dec24c22b1c51a45e8a815a79756

modules/prompt/external/powerlevel10k

@@ -1 +1 @@
-Subproject commit 017395a266aa15011c09e64e44a1c98ed91c478c
+Subproject commit 873c4ff09c559a507d33e528df7e27a8a48705d7

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

modules/syntax-highlighting/external

@@ -1 +1 @@
-Subproject commit 932e29a0c75411cb618f02995b66c0a4a25699bc
+Subproject commit 143b25eb98aa3227af63bd7f04413e1b3e7888ec

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
 

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).

runcoms/zpreztorc

@@ -67,6 +67,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'