Makecompletion functions work with completion descriptions regardless of if they contain a separator character or not

darcs-hash:20060109171359-ac50b-d3fc75cb3263d1f20296e5e81a9f48caf345cd01.gz

1 files changed, 9 insertions, 1 deletions

diff --git a/wildcard.c b/wildcard.c
index 651dd370..c008d3ab 100644
--- a/wildcard.c
+++ b/wildcard.c
@@ -163,7 +163,15 @@ static int wildcard_complete_internal( const wchar_t *orig,
 			  Append generic description to item, if the description exists
 			*/
 			if( desc && wcslen(desc) )
-				new = wcsdupcat2( str, desc, (void *)0 );
+			{
+				/*
+				  Check if the description already contains a separator character, if not, prepend it
+				*/
+				if( wcschr( desc, COMPLETE_SEP ) )
+					new = wcsdupcat2( str, desc, (void *)0 );
+				else
+					new = wcsdupcat2( str, COMPLETE_SEP_STR, desc, (void *)0 );
+			}
 			else
 				new = wcsdup( str );
 		}