Merge branch 'master' into android

This commit is contained in:
Reece H. Dunn
2013-01-30 16:39:52 +00:00
18 changed files with 1422 additions and 422 deletions
+10
View File
@@ -2978,6 +2978,16 @@ if((c == '/') && (tr->langopts.testing & 2) && IsDigit09(next_in) && IsAlpha(pre
single_quoted = 0;
}
else
if((tr->langopts.param[LOPT_APOSTROPHE] & 1) && IsAlpha(next_in))
{
single_quoted = 0; // apostrophe at start of word is part of the word
}
else
if((tr->langopts.param[LOPT_APOSTROPHE] & 2) && IsAlpha(prev_in))
{
single_quoted = 0; // apostrophe at end of word is part of the word
}
else
if((wcschr(tr->char_plus_apostrophe,prev_in) != 0) && (prev_out2 == ' '))
{
// consider single character plus apostrophe as a word