Skip to content

Commit 5b8a6b9

Browse files
psprintpsprint
committed
Merge commit '770ca1518cdc12e66f20b0875e4c0aff785d0dfd' into main
2 parents f431039 + 770ca15 commit 5b8a6b9

File tree

7 files changed

+163
-12
lines changed

7 files changed

+163
-12
lines changed

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,6 +1207,10 @@ press `Alt-Shift-C` to have it completed to `wait`. The same with
12071207
plugin IDs – `fzf` then `Alt-Shift-A` to have `junegunn/fzf` (if it's
12081208
installed).
12091209

1210+
## Changelog<a name="changelog"></a>
1211+
1212+
Link to the [CHANGELOG](doc/CHANGELOG.md).
1213+
12101214
## Support<a name="support"></a>
12111215

12121216
Zinit is a personal, free-time project with no funding and a huge

‎share/themes/blue.zsh‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
2+
# -*- mode: sh; sh-indentation: 4; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
3+
# Copyright (c) 2016-2020 Sebastian Gniazdowski and contributors.
4+
5+
ZINIT+=(
6+
col-pname $'\e[1;38;5;27m' col-uname $'\e[1;38;5;39m' col-keyword $'\e[27m'
7+
col-note $'\e[38;5;69m' col-error $'\e[1;38;5;9m' col-p $'\e[38;5;81m'
8+
col-info $'\e[38;5;39m' col-info2 $'\e[38;5;227m' col-profile $'\e[38;5;69m'
9+
col-uninst $'\e[38;5;118m' col-info3 $'\e[1m\e[38;5;227m' col-slight $'\e[38;5;230m'
10+
col-failure $'\e[38;5;75m' col-happy $'\e[1m\e[38;5;39m' col-annex $'\e[38;5;33m'
11+
col-id-as $'\e[1;4;38;5;75m' col-version $'\e[3;38;5;69m'
12+
# The more recent, fresh ones:
13+
col-pre $'\e[38;5;27m' col-msg $'\e[0m' col-msg2 $'\e[38;5;174m'
14+
col-obj $'\e[38;5;208m' col-obj2 $'\e[38;5;69m' col-file $'\e[3;38;5;41m'
15+
col-dir $'\e[3;38;5;75m' col-func $'\e[38;5;208m'
16+
col-url $'\e[38;5;75m' col-meta $'\e[38;5;69m' col-meta2 $'\e[38;5;39m'
17+
col-data $'\e[38;5;33m' col-data2 $'\e[38;5;117m' col-hi $'\e[1m\e[38;5;208m'
18+
col-var $'\e[38;5;81m' col-glob $'\e[1;38;5;118m' col-ehi $'\e[1m\e[38;5;208m'
19+
col-cmd $'\e[38;5;39m' col-ice $'\e[38;5;39m' col-nl $'\n'
20+
col-txt $'\e[38;5;254m' col-num $'\e[3;38;5;155m' col-term $'\e[38;5;185m'
21+
col-warn $'\e[38;5;208m' col-ok $'\e[38;5;220m' col-time $'\e[38;5;220m'
22+
col-apo $'\e[1;38;5;45m' col-aps $'\e[38;5;117m'
23+
col-quo $'\e[1;38;5;33m' col-quos $'\e[1;38;5;204m'
24+
col-bapo $'\e[1;38;5;208m' col-baps $'\e[1;38;5;39m'
25+
col-faint $'\e[38;5;238m' col-opt $'\e[1;38;5;75m' col-lhi $'\e[38;5;117m'
26+
col-flag $'\e[1;3;38;5;69m' col-pkg $'\e[1;3;38;5;27m'
27+
col-tab $' \t ' col-msg3 $'\e[38;5;238m' col-b-lhi $'\e[1m\e[38;5;75m'
28+
col-bar $'\e[38;5;39m' col-th-bar $'\e[38;5;39m'
29+
col-… "${${${(M)LANG:#*UTF-8*}:+…}:-...}" col-ndsh "${${${(M)LANG:#*UTF-8*}:+–}:-}"
30+
col-mdsh $'\e[1;38;5;220m'"${${${(M)LANG:#*UTF-8*}:+–}:--}"$'\e[0m'
31+
col-mmdsh $'\e[1;38;5;220m'"${${${(M)LANG:#*UTF-8*}:+――}:--}"$'\e[0m'
32+
col--… "${${${(M)LANG:#*UTF-8*}:+⋯⋯}:-···}" col-lr "${${${(M)LANG:#*UTF-8*}:+↔}:-"«-»"}"
33+
col-↔ ${${${(M)LANG:#*UTF-8*}:+$'\e[38;5;39m↔\e[0m'}:-$'\e[38;5;39m«-»\e[0m'}
34+
col-rst $'\e[0m' col-b $'\e[1m' col-nb $'\e[22m'
35+
col-u $'\e[4m' col-it $'\e[3m' col-st $'\e[9m'
36+
col-nu $'\e[24m' col-nit $'\e[23m' col-nst $'\e[29m'
37+
col-bspc $'\b' col-b-warn $'\e[1;38;5;214m' col-u-warn $'\e[4;38;5;214m'
38+
col-bcmd $'\e[38;5;220m'
39+
)
40+
41+
# vim: ft=zsh sw=4 ts=4 et foldmarker=[[[,]]] foldmethod=marker

‎share/themes/default.zsh‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# -*- mode: sh; sh-indentation: 4; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
2+
# Copyright (c) 2016-2020 Sebastian Gniazdowski and contributors.
3+
4+
ZINIT+=(
5+
# Old colors: 31m
6+
col-pname $'\e[1;4m\e[32m' col-uname $'\e[1;4m\e[35m' col-keyword $'\e[32m'
7+
col-note $'\e[38;5;148m' col-error $'\e[1;38;5;9m' col-p $'\e[38;5;81m'
8+
col-info $'\e[38;5;82m' col-info2 $'\e[38;5;227m' col-profile $'\e[38;5;148m'
9+
col-uninst $'\e[38;5;118m' col-info3 $'\e[1m\e[38;5;227m' col-slight $'\e[38;5;230m'
10+
col-failure $'\e[38;5;204m' col-happy $'\e[1m\e[38;5;82m' col-annex $'\e[38;5;153m'
11+
col-id-as $'\e[4;38;5;220m' col-version $'\e[3;38;5;87m'
12+
# The more recent, fresh ones:
13+
col-pre $'\e[38;5;135m' col-msg $'\e[0m' col-msg2 $'\e[38;5;172m'
14+
col-obj $'\e[38;5;218m' col-obj2 $'\e[38;5;118m' col-file $'\e[3;38;5;117m'
15+
col-dir $'\e[3;38;5;153m' col-func $'\e[38;5;219m'
16+
col-url $'\e[38;5;75m' col-meta $'\e[38;5;57m' col-meta2 $'\e[38;5;147m'
17+
col-data $'\e[38;5;82m' col-data2 $'\e[38;5;117m' col-hi $'\e[1m\e[38;5;183m'
18+
col-var $'\e[38;5;81m' col-glob $'\e[38;5;227m' col-ehi $'\e[1m\e[38;5;210m'
19+
col-cmd $'\e[38;5;82m' col-ice $'\e[38;5;39m' col-nl $'\n'
20+
col-txt $'\e[38;5;254m' col-num $'\e[3;38;5;155m' col-term $'\e[38;5;185m'
21+
col-warn $'\e[38;5;208m' col-ok $'\e[38;5;220m' col-time $'\e[38;5;220m'
22+
col-apo $'\e[1;38;5;45m' col-aps $'\e[38;5;117m'
23+
col-quo $'\e[1;38;5;33m' col-quos $'\e[1;38;5;160m'
24+
col-bapo $'\e[1;38;5;220m' col-baps $'\e[1;38;5;82m'
25+
col-faint $'\e[38;5;238m' col-opt $'\e[38;5;219m' col-lhi $'\e[38;5;81m'
26+
col-flag $'\e[1;3;38;5;79m' col-pkg $'\e[1;3;38;5;27m'
27+
col-tab $' \t ' col-msg3 $'\e[38;5;238m' col-b-lhi $'\e[1m\e[38;5;75m'
28+
col-bar $'\e[38;5;82m' col-th-bar $'\e[38;5;82m'
29+
col-… "${${${(M)LANG:#*UTF-8*}:+…}:-...}" col-ndsh "${${${(M)LANG:#*UTF-8*}:+–}:-}"
30+
col-mdsh $'\e[1;38;5;220m'"${${${(M)LANG:#*UTF-8*}:+–}:--}"$'\e[0m'
31+
col-mmdsh $'\e[1;38;5;220m'"${${${(M)LANG:#*UTF-8*}:+――}:--}"$'\e[0m'
32+
col--… "${${${(M)LANG:#*UTF-8*}:+⋯⋯}:-···}" col-lr "${${${(M)LANG:#*UTF-8*}:+↔}:-"«-»"}"
33+
col-↔ ${${${(M)LANG:#*UTF-8*}:+$'\e[38;5;82m↔\e[0m'}:-$'\e[38;5;82m«-»\e[0m'}
34+
col-rst $'\e[0m' col-b $'\e[1m' col-nb $'\e[22m'
35+
col-u $'\e[4m' col-it $'\e[3m' col-st $'\e[9m'
36+
col-nu $'\e[24m' col-nit $'\e[23m' col-nst $'\e[29m'
37+
col-bspc $'\b' col-b-warn $'\e[1;38;5;214m' col-u-warn $'\e[4;38;5;214m'
38+
col-bcmd $'\e[38;5;220m'
39+
)
40+
if [[ ( ${+terminfo} -eq 1 && ${terminfo[colors]} -ge 256 ) || \
41+
( ${+termcap} -eq 1 && ${termcap[Co]} -ge 256 )
42+
]] {
43+
ZINIT+=( col-pname $'\e[1;4m\e[38;5;39m' col-uname $'\e[1;4m\e[38;5;207m' )
44+
}
45+
46+
# vim: ft=zsh sw=4 ts=4 et foldmarker=[[[,]]] foldmethod=marker

‎share/themes/gold.zsh‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# -*- mode: sh; sh-indentation: 4; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
2+
# Copyright (c) 2016-2020 Sebastian Gniazdowski and contributors.
3+
4+
# Different shades of gold/yellow (220):
5+
ZINIT+=(
6+
col-pname $'\e[1;38;5;220m' col-uname $'\e[1;38;5;178m' col-keyword $'\e[137m'
7+
col-note $'\e[38;5;220m' col-error $'\e[1m\e[38;5;9m' col-p $'\e[38;5;81m'
8+
col-info $'\e[38;5;178m' col-info2 $'\e[38;5;227m' col-profile $'\e[38;5;220m'
9+
col-uninst $'\e[38;5;118m' col-info3 $'\e[1m\e[38;5;227m' col-slight $'\e[38;5;230m'
10+
col-failure $'\e[38;5;204m' col-happy $'\e[1m\e[38;5;178m' col-annex $'\e[38;5;33m'
11+
col-id-as $'\e[1;4;38;5;130m' col-version $'\e[3;38;5;220m'
12+
# The more recent, fresh ones:
13+
col-pre $'\e[38;5;41m' col-msg $'\e[0m' col-msg2 $'\e[38;5;174m'
14+
col-obj $'\e[38;5;178m' col-obj2 $'\e[38;5;220m' col-file $'\e[3;38;5;41m'
15+
col-dir $'\e[3;38;5;204m' col-func $'\e[38;5;208m'
16+
col-url $'\e[38;5;130m' col-meta $'\e[38;5;220m' col-meta2 $'\e[38;5;178m'
17+
col-data $'\e[38;5;33m' col-data2 $'\e[38;5;117m' col-hi $'\e[1m\e[38;5;208m'
18+
col-var $'\e[38;5;81m' col-glob $'\e[1;38;5;118m' col-ehi $'\e[1m\e[38;5;208m'
19+
col-cmd $'\e[38;5;178m' col-ice $'\e[38;5;178m' col-nl $'\n'
20+
col-txt $'\e[38;5;254m' col-num $'\e[3;38;5;155m' col-term $'\e[38;5;185m'
21+
col-warn $'\e[38;5;204m' col-ok $'\e[38;5;220m' col-time $'\e[38;5;220m'
22+
col-apo $'\e[1;38;5;130m' col-aps $'\e[38;5;117m'
23+
col-quo $'\e[1;38;5;33m' col-quos $'\e[1;38;5;204m'
24+
col-bapo $'\e[1;38;5;208m' col-baps $'\e[1;38;5;178m'
25+
col-faint $'\e[38;5;238m' col-opt $'\e[1;38;5;130m' col-lhi $'\e[38;5;117m'
26+
col-flag $'\e[1;3;38;5;220m' col-pkg $'\e[1;3;38;5;137m'
27+
col-tab $' \t ' col-msg3 $'\e[38;5;238m' col-b-lhi $'\e[1m\e[38;5;75m'
28+
col-bar $'\e[38;5;178m' col-th-bar $'\e[38;5;178m'
29+
col-… "${${${(M)LANG:#*UTF-8*}:+…}:-...}" col-ndsh "${${${(M)LANG:#*UTF-8*}:+–}:-}"
30+
col-mdsh $'\e[1;38;5;220m'"${${${(M)LANG:#*UTF-8*}:+–}:--}"$'\e[0m'
31+
col-mmdsh $'\e[1;38;5;220m'"${${${(M)LANG:#*UTF-8*}:+――}:--}"$'\e[0m'
32+
col--… "${${${(M)LANG:#*UTF-8*}:+⋯⋯}:-···}" col-lr "${${${(M)LANG:#*UTF-8*}:+↔}:-"«-»"}"
33+
col-↔ ${${${(M)LANG:#*UTF-8*}:+$'\e[38;5;178m↔\e[0m'}:-$'\e[38;5;178m«-»\e[0m'}
34+
col-rst $'\e[0m' col-b $'\e[1m' col-nb $'\e[22m'
35+
col-u $'\e[4m' col-it $'\e[3m' col-st $'\e[9m'
36+
col-nu $'\e[24m' col-nit $'\e[23m' col-nst $'\e[29m'
37+
col-bspc $'\b' col-b-warn $'\e[1;38;5;214m' col-u-warn $'\e[4;38;5;214m'
38+
col-bcmd $'\e[38;5;220m'
39+
)
40+
41+
# vim: ft=zsh sw=4 ts=4 et foldmarker=[[[,]]] foldmethod=marker

‎zi-browse-symbol‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ _tfind_main() {
134134
zstyle -s ":plugin:zinit:symbol-search" macro-color __tfind_macro_color || __tfind_macro_color="fg=208,bold"
135135
zstyle -s ":plugin:zinit:symbol-search" eqdol-color __tfind_eqdol_color || __tfind_eqdol_color="fg=69,bold"
136136

137-
# Find the index to operate on, git dir, etc.
138-
_tfind_find_index || { _tfind_error_msg && return;}
137+
# Find the index to operate on, git dir, etc.
138+
_tfind_find_index || { _tfind_error_msg; return;}
139139
fi
140140

141141
# '0' will get changed into $to_display limit
@@ -216,9 +216,7 @@ _tfind_main() {
216216
#
217217
local noun=${${${__tfind_spe_funct:#0}:+function}:-symbol}
218218
local preamble=$'\n'"View of ${noun}s for repo: «««${(U)TAG[git-or-project]}»»» located at: $TAG[repo-dir]:h"$'\n'"${(C)noun} no. #$__tfind_spe_index. Found $max_index ${noun}s in the index."$'\n' \
219-
key="Ctrl-f to toggle functions-ONLY view. Alt-s to toggle sort."$'\n'
220-
preamble+=$key
221-
219+
key="Ctrl-F to toggle functions-ONLY view. Alt-s to toggle sort."$'\n'
222220
local text="${(F)disp_list}"
223221
integer offset=${#preamble}+$buflen
224222

@@ -236,7 +234,7 @@ _tfind_main() {
236234
: "${preamble//(#b)no. ([^.]##)./$((coloratt(buflen,mbegin[1],mend[1],0)))}"
237235
: "${preamble//(#b)Found ([0-9]##)/$((coloratt(buflen,mbegin[1],mend[1],1)))}"
238236
: "${preamble//(#b)» located at: ([^$p]##)/$((coloratt(buflen,mbegin[1],mend[1],1)))}"
239-
: "${preamble//(#b)(Ctrl-f)/$((coloratt(buflen,mbegin[1],mend[1],0)))}"
237+
: "${preamble//(#b)(Ctrl-F)/$((coloratt(buflen,mbegin[1],mend[1],0)))}"
240238
: "${preamble//(#b)(Alt-s)/$((coloratt(buflen,mbegin[1],mend[1],0)))}"
241239
: "${text//((#s)|$p)(#b)(»)/$((coloratt(offset,mbegin[1],mend[1],3)))}"
242240
# Basic syntax highlighting - a few keywords like C/Java type names
@@ -387,8 +385,10 @@ if [[ $__tfind_spe_call_count -eq 1 ]]; then
387385
zle -A $pup_widget saved-$pup_widget
388386
zle -N $pdown_widget _tfind_simulate_widget
389387
zle -N $pup_widget _tfind_simulate_widget
390-
zle -A zle-line-pre-redraw saved-pre-redraw
391-
zle -D zle-line-pre-redraw
388+
if (( $+widgets[zle-line-pre-redraw] )); then
389+
zle -A zle-line-pre-redraw saved-pre-redraw
390+
zle -D zle-line-pre-redraw
391+
fi
392392
local selected_editor cd_at_edit tagtext tagline taglinebyte tagfile
393393
local -a comm
394394
comm=()
@@ -468,8 +468,11 @@ if [[ $__tfind_spe_call_count -eq 1 ]]; then
468468
zle -A saved-$pup_widget $pup_widget
469469
zle -D saved-$pdown_widget saved-$pup_widget
470470

471-
zle -A saved-pre-redraw zle-line-pre-redraw
472-
zle -D saved-pre-redraw
471+
if (( $+widgets[saved-pre-redraw] )); then
472+
zle -A saved-pre-redraw zle-line-pre-redraw
473+
zle -D saved-pre-redraw
474+
fi
475+
473476
# Full reinitialisation at next call
474477
__tfind_spe_call_count=0
475478

‎zinit-install.zsh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1731,7 +1731,7 @@ ziextract() {
17311731
.zinit-extract-wrapper() {
17321732
local file="$1" fun="$2" retval
17331733
(( !OPTS[opt_-q,--quiet] )) && \
1734-
+zinit-message "{info}[{pre}ziextract{info}]{rst} Unpacking the files from: \`{obj}$file{msg}'{…}{rst}"
1734+
+zinit-message "{info}[{pre}ziextract{info}]{rst} Unpacking the files from: \`{file}$file{msg}'{…}"
17351735
$fun; retval=$?
17361736
if (( retval == 0 )) {
17371737
local -a files

‎zinit.zsh‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ unset ZPLGM
2626
ZINIT[ZERO]="${ZERO:-${${0:#$ZSH_ARGZERO}:-${(%):-%N}}}"
2727
[[ ! -o functionargzero || ${options[posixargzero]} = on || ${ZINIT[ZERO]} != */* ]] && ZINIT[ZERO]="${(%):-%N}"
2828

29-
: ${ZINIT[BIN_DIR]:="${ZINIT[ZERO]:h}"}
29+
: ${ZINIT[BIN_DIR]:=${ZINIT[ZERO]:h}}
3030
[[ ${ZINIT[BIN_DIR]} = \~* ]] && ZINIT[BIN_DIR]=${~ZINIT[BIN_DIR]}
3131

3232
# Make ZINIT[BIN_DIR] path absolute.
@@ -136,6 +136,8 @@ typeset -g ZPFX
136136
: ${ZPFX:=${ZINIT[HOME_DIR]}/polaris}
137137
: ${ZINIT[ALIASES_OPT]::=${${options[aliases]:#off}:+1}}
138138
: ${ZINIT[MAN_DIR]:=${ZPFX}/man}
139+
: ${ZINIT[THEME_DIR]:=$ZINIT[BIN_DIR]/share/themes}
140+
: ${ZITHEME:=default}
139141

140142
ZINIT[PLUGINS_DIR]=${~ZINIT[PLUGINS_DIR]} ZINIT[COMPLETIONS_DIR]=${~ZINIT[COMPLETIONS_DIR]}
141143
ZINIT[SNIPPETS_DIR]=${~ZINIT[SNIPPETS_DIR]} ZINIT[SERVICES_DIR]=${~ZINIT[SERVICES_DIR]}
@@ -193,6 +195,7 @@ zmodload zsh/termcap 2>/dev/null
193195
if [[ -z $SOURCED && ( ${+terminfo} -eq 1 && -n ${terminfo[colors]} ) || \
194196
( ${+termcap} -eq 1 && -n ${termcap[Co]} )
195197
]] {
198+
<<<<<<< HEAD
196199
ZINIT+=(
197200
# Old colors: 31m
198201
col-pname $'\e[1;4m\e[32m' col-uname $'\e[1;4m\e[35m' col-keyword $'\e[32m'
@@ -234,6 +237,10 @@ if [[ -z $SOURCED && ( ${+terminfo} -eq 1 && -n ${terminfo[colors]} ) || \
234237
]] {
235238
ZINIT+=( col-pname $'\e[1;4m\e[38;5;39m' col-uname $'\e[1;4m\e[38;5;207m' )
236239
}
240+
=======
241+
[[ -f $ZINIT[THEME_DIR]/$ZITHEME.zsh ]] && \
242+
source $ZINIT[THEME_DIR]/$ZITHEME.zsh
243+
>>>>>>> 770ca1518cdc12e66f20b0875e4c0aff785d0dfd
237244
}
238245

239246
# Hooks
@@ -1324,11 +1331,14 @@ builtin setopt noaliases
13241331
command mkdir -p $ZINIT[MAN_DIR]/man1
13251332
command cp -f $ZINIT[BIN_DIR]/doc/zinit.1 $ZINIT[MAN_DIR]/man1
13261333
}
1334+
<<<<<<< HEAD
13271335
# Copy Autotools compilation options setting
13281336
[[ ! -f $ZPFX/share/config.site ]] && {
13291337
command mkdir -p $ZPFX/share
13301338
command cp $ZINIT[BIN_DIR]/share/config.site $ZPFX/share
13311339
}
1340+
=======
1341+
>>>>>>> 770ca1518cdc12e66f20b0875e4c0aff785d0dfd
13321342
} # ]]]
13331343
# FUNCTION: .zinit-load-object [[[
13341344
.zinit-load-object() {
@@ -1377,9 +1387,12 @@ builtin setopt noaliases
13771387
local -a opts
13781388
zparseopts -E -D -a opts f -command || { +zinit-message "{u-warn}Error{b-warn}:{rst} Incorrect options (accepted ones: {opt}-f{rst}, {opt}--command{rst})."; return 1; }
13791389
local url="$1" limit="$3"
1390+
<<<<<<< HEAD
13801391
# Ensure that configuration prepared for configure script
13811392
local -x CONFIG_SITE="$CONFIG_SITE:$ZPFX/share/config.site"
13821393

1394+
=======
1395+
>>>>>>> 770ca1518cdc12e66f20b0875e4c0aff785d0dfd
13831396
[[ -n ${ICE[teleid]} ]] && url="${ICE[teleid]}"
13841397
# Hide arguments from sourced scripts. Without this calls our "$@" are visible as "$@"
13851398
# within scripts that we `source`.
@@ -2001,6 +2014,7 @@ builtin setopt noaliases
20012014
builtin zle -F "$THEFD" +zinit-deploy-message
20022015
} # ]]]
20032016

2017+
<<<<<<< HEAD
20042018
# FUNCTION: .zinit-formatter-file [[[
20052019
.zinit-formatter-file() {
20062020
builtin emulate -L zsh -o extendedglob
@@ -2018,6 +2032,8 @@ $ZINIT[col-dot].$ZINIT[col-ext]$match[2]$ZINIT[col-rst]
20182032
fi
20192033
}
20202034

2035+
=======
2036+
>>>>>>> 770ca1518cdc12e66f20b0875e4c0aff785d0dfd
20212037
# FUNCTION: .zinit-formatter-dbg [[[
20222038
.zinit-formatter-dbg() {
20232039
builtin emulate -L zsh -o extendedglob

0 commit comments

Comments
 (0)