mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-06-10 06:48:03 +02:00
Code Releases Activity

* 52544: _diff_options: support macOS Ventura or newer

Browse source
This commit is contained in:
Jun-ichi Takimoto 2024-02-19 08:50:27 +09:00
parent 4a86a54d2b
commit d2f63d0d92
2 changed files with 11 additions and 2 deletions
ChangeLog
Completion/Unix/Type
_diff_options

5
ChangeLog
View file

@ -1,3 +1,8 @@
2024-02-19 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
* 52544: Completion/Unix/Type/_diff_options: support macOS Ventura
or newer
2024-02-18 Bart Schaefer <schaefer@toltec-ubuntu> 2024-02-18 Bart Schaefer <schaefer@toltec-ubuntu>
* 52558: Etc/FAQ.yo: make note of word splitting differences * 52558: Etc/FAQ.yo: make note of word splitting differences

8
Completion/Unix/Type/_diff_options
View file

@ -25,7 +25,8 @@ _diff_palette() {
return ret return ret
} }
if _pick_variant -r variant -c $cmd gnu=GNU unix -v || [[ $OSTYPE = freebsd<12->.* ]]; then if _pick_variant -r variant -c $cmd gnu=GNU unix -v ||
[[ $OSTYPE = (freebsd<12->|darwin<22->).* ]]; then
(( $#words > 2 )) && ign='!' (( $#words > 2 )) && ign='!'
# output formats # output formats
@ -73,15 +74,18 @@ if _pick_variant -r variant -c $cmd gnu=GNU unix -v || [[ $OSTYPE = freebsd<12->
"($ofwl $ouc $oss)--unchanged-line-format=[set unchanged line format]:unchanged line format" "($ofwl $ouc $oss)--unchanged-line-format=[set unchanged line format]:unchanged line format"
'(--to-file)--from-file=[compare specified file to all operands]:from file:_files' '(--to-file)--from-file=[compare specified file to all operands]:from file:_files'
'(--from-file)--to-file=[compare all operands to specified file]:to file:_files' '(--from-file)--to-file=[compare all operands to specified file]:to file:_files'
'--color=-[use colors in output]::when [auto]:(never always auto)'
'--palette=[specify colors to use]:color:_diff_palette' '--palette=[specify colors to use]:color:_diff_palette'
"${ign}(1 2)-v[display version information]" "${ign}(1 2)-v[display version information]"
) )
else else
args+=( '!--speed-large-files' ) args+=( '!--speed-large-files' )
if [[ $OSTYPE = darwin<22->.* ]]; then
args+=( '(-A --algorithm)'{-A+,--algorithm=}'[specify the algorithm to use]:algorithm:(myers patience stone)' )
fi
fi fi
_arguments -s $args \ _arguments -s $args \
'--color=-[use colors in output]::when [auto]:(never always auto)' \
'(-i --ignore-case)'{-i,--ignore-case}'[case insensitive]' \ '(-i --ignore-case)'{-i,--ignore-case}'[case insensitive]' \
'--ignore-file-name-case[ignore case when comparing file names]' \ '--ignore-file-name-case[ignore case when comparing file names]' \
'!(--ignore-file-name-case)--no-ignore-file-name-case' \ '!(--ignore-file-name-case)--no-ignore-file-name-case' \