Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
327686c1ce
1 changed files with 2 additions and 2 deletions
|
@ -187,8 +187,8 @@ static inline bool isUrlTag(const ucstring &s, ucstring::size_type index, ucstri
|
||||||
if (isUrl && i > 0 && !markdown)
|
if (isUrl && i > 0 && !markdown)
|
||||||
{
|
{
|
||||||
// '}' is in the list because of color tags, ie "@{FFFF}http://..."
|
// '}' is in the list because of color tags, ie "@{FFFF}http://..."
|
||||||
const ucchar chars[] = {' ', '"', '\'', '(', '[', '}'};
|
const vector<ucchar> chars {' ', '"', '\'', '(', '[', '}'};
|
||||||
isUrl = std::find(std::begin(chars), std::end(chars), s[i - 1]) != std::end(chars);
|
isUrl = std::find(chars.begin(), chars.end(), s[i - 1]) != chars.end();
|
||||||
}
|
}
|
||||||
return isUrl;
|
return isUrl;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue