- Don't prefix double quotation marks during file completion
See issue #4491 for more details.

svn path=/trunk/; revision=46718
This commit is contained in:
Gregor Schneider 2010-04-04 14:04:24 +00:00
parent 08f73a5234
commit 4525984fb0

View file

@ -703,7 +703,7 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor)
LastSpace = i; LastSpace = i;
} }
/* insert the quoation and move things around */ /* insert the quotation and move things around */
if(szPrefix[LastSpace + 1] != _T('\"') && LastSpace != -1) if(szPrefix[LastSpace + 1] != _T('\"') && LastSpace != -1)
{ {
memmove ( &szPrefix[LastSpace+1], &szPrefix[LastSpace], (_tcslen(szPrefix)-LastSpace+1) * sizeof(TCHAR) ); memmove ( &szPrefix[LastSpace+1], &szPrefix[LastSpace], (_tcslen(szPrefix)-LastSpace+1) * sizeof(TCHAR) );
@ -712,14 +712,17 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor)
{ {
_tcscat(szPrefix,_T("\"")); _tcscat(szPrefix,_T("\""));
} }
szPrefix[LastSpace + 1] = _T('\"'); szPrefix[LastSpace + 1] = _T('\"');
} }
else if(LastSpace == -1) else if(LastSpace == -1)
{ {
_tcscpy(szBaseWord,_T("\"")); /* Add quotation only if none exists already */
_tcscat(szBaseWord,szPrefix); if (szPrefix[0] != _T('\"'))
_tcscpy(szPrefix,szBaseWord); {
_tcscpy(szBaseWord,_T("\""));
_tcscat(szBaseWord,szPrefix);
_tcscpy(szPrefix,szBaseWord);
}
} }
} }