[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 878b9a3e99de30e768378858e817a725c45122b3

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 878b9a3e99de30e768378858e817a725c45122b3
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Dec 25 12:14:10 2009 +0200

    Define _tightvncviewer also when (only) vncviewer is available.

diff --git a/CHANGES b/CHANGES
index f5224d1..75b8ca8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,8 +25,8 @@ bash-completion (2.x)
   * Apply pine completion to alpine too.
   * Remove many unnecessary short option completions where long ones exist.
   * Improve configure, cvs, gkrellm, lftp, mdadm, modprobe, mplayer,
-    mysqladmin, rsync, screen, service, scp, ssh, update-alternatives, and
-    general hostname completions.
+    mysqladmin, rsync, screen, service, scp, ssh, update-alternatives,
+    vncviewer, and general hostname completions.
   * Add abook and wtf completion, based on work by Raphaël Droz.
   * Add jarsigner, k3b, lftpget, pm-utils, pack200 and unpack200 completions.
   * Don't overwrite other host completions when completing from multiple
diff --git a/contrib/vncviewer b/contrib/vncviewer
index fb9d833..3eefc19 100644
--- a/contrib/vncviewer
+++ b/contrib/vncviewer
@@ -16,7 +16,9 @@ _vncviewer_bootstrap()
 } &&
 complete -F _vncviewer_bootstrap vncviewer
 
-have tightvncviewer &&
+# _tightvncviewer is our default in bootstrap above, so always define it
+# even if only vncviewer is available.
+have vncviewer || have tightvncviewer &&
 _tightvncviewer()
 {
     local cur prev
@@ -51,8 +53,8 @@ _tightvncviewer()
     else
         _known_hosts_real "$cur"
     fi
-} &&
-complete -F _tightvncviewer tightvncviewer
+}
+have tightvncviewer && complete -F _tightvncviewer tightvncviewer
 
 
 # NOTE: - VNC Viewer options are case insensitive.

-- 
bash-completion