summary refs log tree commit diff
path: root/Completion/Unix/Command
diff options
context:
space:
mode:
authorJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2018-10-24 17:29:28 +0900
committerJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2018-10-24 17:29:28 +0900
commit916ed7426422c2f203b7352d8c0654f0b1e60cbb (patch)
tree83c425952666f4d095c8be083b0c673b65b68d86 /Completion/Unix/Command
parentda05d2cc2b9bf758eddee8d6613e79bb4f07e3f7 (diff)
downloadzsh-916ed7426422c2f203b7352d8c0654f0b1e60cbb.tar.gz
zsh-916ed7426422c2f203b7352d8c0654f0b1e60cbb.tar.xz
zsh-916ed7426422c2f203b7352d8c0654f0b1e60cbb.zip
43721: _diff3: detect GNU variant correctly
Diffstat (limited to 'Completion/Unix/Command')
-rw-r--r--Completion/Unix/Command/_diff36
1 files changed, 3 insertions, 3 deletions
diff --git a/Completion/Unix/Command/_diff3 b/Completion/Unix/Command/_diff3
index 524507ce0..8c59d701b 100644
--- a/Completion/Unix/Command/_diff3
+++ b/Completion/Unix/Command/_diff3
@@ -3,7 +3,7 @@
 local -a args ed
 local ign
 
-if _pick_variant gnu=GNU unix; then
+if _pick_variant gnu=GNU unix --version; then
   ed=(
     '(-m --merge -A --show-all)'{-e,--ed}'[output ed script for incorporating changes]'
     '(-m --merge -A --show-all)'{-E,--show-overlap}'[like -e, but bracket conflicts]'
@@ -21,8 +21,8 @@ if _pick_variant gnu=GNU unix; then
     '(-T --initial-tab)'{-T,--initial-tab}'[make tabs line up by prepending a tab]'
     '--diff-program=[specify program to compare files]: : _command_names -e'
     \*{-L+,--label=}'[use specified label instead of file name]:label'
-    "$ign(-)--help[display usage information]"
-    "$ign(-)"{-v,--version}'[display version information]'
+    "$ign(- :)--help[display usage information]"
+    "$ign(- :)"{-v,--version}'[display version information]'
   )
 else
   args=( -A "-*" )