Merge branch 'master' into CPlusPlus

Conflicts:
	builtin_commandline.cpp
	util.c
This commit is contained in:
ridiculousfish
2012-04-18 13:41:39 -07:00
35 changed files with 207 additions and 59 deletions

View File

@@ -183,24 +183,16 @@ static void write_part( const wchar_t *begin,
}
else
{
wchar_t *buff, *esc;
if( cut_at_cursor )
{
end = begin+pos;
}
buff = wcsndup( begin, end-begin );
esc = unescape( buff, UNESCAPE_INCOMPLETE );
// debug( 0, L"woot2 %ls -> %ls", buff, esc );
stdout_buffer.append(esc);
stdout_buffer.append(begin, end - begin);
stdout_buffer.append(L"\n");
free( esc );
free( buff );
}
}