[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1ce1e0d45226022ec19a9757ccfbf9d897b47a91

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 1ce1e0d45226022ec19a9757ccfbf9d897b47a91
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Oct 20 20:05:30 2009 +0300

    Don't overwrite other completions when completing from multiple SSH known hosts files.

diff --git a/CHANGES b/CHANGES
index fa4e7c6..53e7906 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,8 @@ bash-completion (1.x)
   * Improve cvs, gkrellm, lftp, mdadm, and mysqladmin completions.
   * Add wtf completion, based on work by Raphaël Droz.
   * Add lftpget completion.
+  * Don't overwrite other host completions when completing from multiple
+    SSH known hosts files.
 
  -- David Paleino <d.paleino at gmail.com>  Sun, 11 Oct 2009 11:11:57 +0200
 
diff --git a/bash_completion b/bash_completion
index bfc0f81..1fe7e7f 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1279,7 +1279,7 @@ _known_hosts_real()
 
         if [ ${#kh[@]} -gt 0 ]; then
             # FS needs to look for a comma separated list
-            COMPREPLY=( $( awk 'BEGIN {FS=","}
+            COMPREPLY=( "${COMPREPLY[@]}" $( awk 'BEGIN {FS=","}
             /^\s*[^|\#]/ {for (i=1; i<=2; ++i) { \
             gsub(" .*$", "", $i); \
             gsub("[\\[\\]]", "", $i); \

-- 
bash-completion