mawww/kakoune
1
1
Fork 0
mirror of https://github.com/mawww/kakoune.git synced 2024-12-18 08:51:46 +03:00
Code Issues Projects Releases Wiki Activity

line joining will only join selected lines if selection span multiples ones

Browse Source 
Fixes #133
This commit is contained in:
Maxime Coste 2014-09-25 19:26:27 +01:00
parent ecf8047bcc
commit a404886fe2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/normal.cc
View File

@ -691,10 +691,12 @@ void join_select_spaces(Context& context, int)
std::vector<Selection> selections; std::vector<Selection> selections;
for (auto& sel : context.selections()) for (auto& sel : context.selections())
{ {
for (LineCount line = sel.min().line; line <= sel.max().line; ++line) const LineCount min_line = sel.min().line;
const LineCount max_line = sel.max().line;
auto end_line = std::min(buffer.line_count()-1,
max_line + (min_line == max_line ? 1 : 0));
for (LineCount line = min_line; line < end_line; ++line)
{ {
if (line == buffer.line_count() - 1)
continue;
auto begin = buffer.iterator_at({line, buffer[line].length()-1}); auto begin = buffer.iterator_at({line, buffer[line].length()-1});
auto end = begin+1; auto end = begin+1;
skip_while(end, buffer.end(), is_horizontal_blank); skip_while(end, buffer.end(), is_horizontal_blank);