diff -r 8df58d8c99e8 -r b3ffff030d5c core/src/line_completer.cpp
--- a/core/src/line_completer.cpp	Tue Oct 26 15:36:30 2010 +0100
+++ b/core/src/line_completer.cpp	Thu Oct 28 16:54:54 2010 +0100
@@ -49,15 +49,15 @@
 void CLineCompleter::LcCompleteLineL(TConsoleLine& aLine, const TChar& aEscapeChar)
 	{
 	iLexer->Set(aLine.ContentsToCursor(), aEscapeChar);
-	TToken token(iLexer->NextToken());
+	TToken token(iLexer->NextTokenL());
 	TToken firstToken = token;
 	TToken prevToken(TToken::EString, KNullDesC, aLine.ContentsToCursor().Length());
 	TInt lastTokenIdx = 0;
-	while (iLexer->More())
+	while (iLexer->MoreL())
 		{
 		// More than one token - skip to last.
 		prevToken = token;
-		token = iLexer->NextToken();
+		token = iLexer->NextTokenL();
 		lastTokenIdx++;
 		}