* [PATCH] Fix diff completion for non GNU / FreeBSD platforms
@ 2023-01-04 22:44 Nathan Houghton
0 siblings, 0 replies; only message in thread
From: Nathan Houghton @ 2023-01-04 22:44 UTC (permalink / raw)
To: zsh-workers; +Cc: Nathan Houghton
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).
In addition:
- Fully build up $of before utilizing it to avoid inconsistent
behavior in the treatment of mutually exclusive output formats.
- Remove the "-l" option for OpenBSD (this flag was removed in
2015).
- Mark the "-x" option as being repeatable on OpenBSD
---
Completion/Unix/Type/_diff_options | 41 +++++++++++++++++++-----------
1 file changed, 26 insertions(+), 15 deletions(-)
diff --git a/Completion/Unix/Type/_diff_options b/Completion/Unix/Type/_diff_options
index dfa9889f2..2646527df 100644
--- a/Completion/Unix/Type/_diff_options
+++ b/Completion/Unix/Type/_diff_options
@@ -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
--
2.37.3
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-01-04 22:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-04 22:44 [PATCH] Fix diff completion for non GNU / FreeBSD platforms Nathan Houghton
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).