mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-05-23 00:31:29 +02:00
Code Releases Activity

51276: Fix diff completion for non GNU / FreeBSD platforms

Browse source 
On OpenBSD, "diff -urpN dir1/ di<TAB>" would refuse to complete a second
filename/directory name. This was caused by the -u and -U options
getting dropped from args (overwriting args vs appending).
This commit is contained in:
Nathan Houghton 2023-01-04 14:44:18 -08:00 committed by Oliver Kiddle
parent 81684e334d
commit 996b515156
2 changed files with 31 additions and 15 deletions
ChangeLog
Completion/Unix/Type
_diff_options

5
ChangeLog
View file

@ -1,3 +1,8 @@
2023-01-10 Oliver Kiddle <opk@zsh.org>
* Nathan Houghton: 51276: Completion/Unix/Type/_diff_options:
Fix diff completion for non GNU / FreeBSD platforms
2023-01-08 Daniel Shahaf <d.s@daniel.shahaf.name>
* unposted: Src/Zle/zle_refresh.c: In a comment, replace a C

41
Completion/Unix/Type/_diff_options
View file

@ -133,33 +133,44 @@ else
case $OSTYPE in
openbsd*|solaris2.<9->)
of+=' -u -U'
;|
openbsd*|solaris*)
of+=' -n -C -D'
;|
solaris*)
of+=' -h'
;|
openbsd*)
of+=' -q'
;|
# modifications to "$of" should be done above this line so that it is
# uniformly defined while constructing $args
openbsd*|solaris2.<9->)
args+=(
"($of)-u[output a unified diff]"
"($of)-U+[output a unified diff]:lines of context"
"($of)-u[output a unified diff]"
"($of)-U+[output a unified diff]:lines of context"
)
;|
openbsd*|solaris*)
args+=(
"($of)-C+[output a context diff]:lines of context"
"($of)-D+[output merged file with preprocessor directives]:preprocessor symbol"
'-i[case insensitive]'
'-l[long output format (paginate with pr(1))]'
'-s[report on identical files]'
'-t[expand tabs in output lines]'
"($of)-C+[output a context diff]:lines of context"
"($of)-D+[output merged file with preprocessor directives]:preprocessor symbol"
'-i[case insensitive]'
'-s[report on identical files]'
'-t[expand tabs in output lines]'
)
;|
solaris*)
of+=' -h -n'
args+=(
'-w[ignore all white space]'
"($of)-h[do a fast, half-hearted job]"
"($of)-n[output a reversed ed script]"
'-w[ignore all white space]'
"($of)-h[do a fast, half-hearted job]"
"($of)-n[output a reversed ed script]"
'-S+[set first file in comparison]:start with file:_files'
'-l[long output format (paginate with pr(1))]'
)
;;
openbsd*)
of+=' -n -q -u -C -D -U'
args=(
args+=(
"($of)-n[output an rcsdiff(1)-compatible diff]"
"($of)-q[only print a line when the files differ; does not produce a list of changes]"
'-a[treat all files as ASCII text]'
@ -173,7 +184,7 @@ else
'-P[treat absent files in the second directory as if they were empty]'
'-S[start a directory diff from a file name]:file name:_files'
'*-X[exclude files and subdirectories whose basenames match lines in a file]:file name:_files'
'-x[exclude files and subdirectories whose basenames match a pattern]:pattern'
'*-x[exclude files and subdirectories whose basenames match a pattern]:pattern'
)
;;
esac