clamp coordinates find_buffer_coord

This commit is contained in:
Maxime Coste 2015-08-09 23:18:26 +01:00
parent 9d50dd3886
commit 2eced81753

View File

@ -247,9 +247,11 @@ ByteCoord find_buffer_coord(const DisplayLine& line, const Buffer& buffer,
if (atom.has_buffer_range() and column < len) if (atom.has_buffer_range() and column < len)
{ {
if (atom.type() == DisplayAtom::BufferRange) if (atom.type() == DisplayAtom::BufferRange)
return utf8::advance(buffer.iterator_at(atom.begin()), buffer.iterator_at(range.end), return buffer.clamp(
std::max(0_char, column)).coord(); utf8::advance(buffer.iterator_at(atom.begin()),
return atom.begin(); buffer.iterator_at(range.end),
std::max(0_char, column)).coord());
return buffer.clamp(atom.begin());
} }
column -= len; column -= len;
} }