dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-22 18:38:00 +00:00
Code Issues Releases Wiki Activity

Merge upstream/master

Browse Source
This commit is contained in:
Daniel Carrillo 2020-01-19 18:54:16 +01:00
commit 7ec4aad48c
6 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init.zsh
View File

@ -98,18 +98,20 @@ function pmodload {
else else
locations=(${pmodule_dirs:+${^pmodule_dirs}/$pmodule(-/FN)}) locations=(${pmodule_dirs:+${^pmodule_dirs}/$pmodule(-/FN)})
if (( ${#locations} > 1 )); then if (( ${#locations} > 1 )); then
if ! zstyle -t ':prezto:load' pmodule-allow-overrides 'yes'; then
print "$0: conflicting module locations: $locations" print "$0: conflicting module locations: $locations"
continue continue
fi
elif (( ${#locations} < 1 )); then elif (( ${#locations} < 1 )); then
print "$0: no such module: $pmodule" print "$0: no such module: $pmodule"
continue continue
fi fi
# Grab the full path to this module # Grab the full path to this module
pmodule_location=${locations[1]} pmodule_location=${locations[-1]}
# Add functions to $fpath. # Add functions to $fpath.
fpath=(${pmodule_location}/functions(/FN) $fpath) fpath=(${pmodule_location}/functions(-/FN) $fpath)
function { function {
local pfunction local pfunction

2
modules/autosuggestions/external

@ -1 +1 @@
Subproject commit 733abd4af0f23f217caa2a303fbef66382d19d6f Subproject commit ae315ded4dba10685dbbafbfa2ff3c1aefeb490d

3
modules/environment/init.zsh
View File

@ -38,6 +38,9 @@ setopt INTERACTIVE_COMMENTS # Enable comments in interactive shell.
setopt RC_QUOTES # Allow 'Henry''s Garage' instead of 'Henry'\''s Garage'. setopt RC_QUOTES # Allow 'Henry''s Garage' instead of 'Henry'\''s Garage'.
unsetopt MAIL_WARNING # Don't print a warning message if a mail file has been accessed. unsetopt MAIL_WARNING # Don't print a warning message if a mail file has been accessed.
# Allow mapping Ctrl+S and Ctrl+Q shortcuts
[[ -n ${TTY:-} && $+commands[stty] == 1 ]] && stty -ixon <$TTY >$TTY
# #
# Jobs # Jobs
# #

2
modules/prompt/external/powerlevel10k vendored

@ -1 +1 @@
Subproject commit 345d0644a9c1a242ff131bde915bbe234c3dd745 Subproject commit c21961b53c137253020aeffca2b132fdd6bcb116

4
runcoms/zlogin
View File

@ -15,7 +15,7 @@
} &! } &!
# Execute code only if STDERR is bound to a TTY. # Execute code only if STDERR is bound to a TTY.
[[ -o INTERACTIVE && -t 2 ]] && { if [[ -o INTERACTIVE && -t 2 ]]; then
# Print a random, hopefully interesting, adage. # Print a random, hopefully interesting, adage.
if (( $+commands[fortune] )); then if (( $+commands[fortune] )); then
@ -23,4 +23,4 @@
print print
fi fi
} >&2 fi >&2

3
runcoms/zpreztorc
View File

@ -18,6 +18,9 @@ zstyle ':prezto:*:*' color 'yes'
# Add additional directories to load prezto modules from # Add additional directories to load prezto modules from
# zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto-contrib # zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto-contrib
# Allow module overrides when pmodule-dirs causes module name collisions
# zstyle ':prezto:load' pmodule-allow-overrides 'yes'
# Set the Zsh modules to load (man zshmodules). # Set the Zsh modules to load (man zshmodules).
# zstyle ':prezto:load' zmodule 'attr' 'stat' # zstyle ':prezto:load' zmodule 'attr' 'stat'