xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Delapouite/combine-selections'

Browse Source
This commit is contained in:
Maxime Coste 2019-10-10 20:11:26 +11:00
commit f2fa260929
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/normal.cc
View File

@ -1849,7 +1849,7 @@ void combine_selection(const Buffer& buffer, Selection& sel, const Selection& ot
} }
template<typename Func> template<typename Func>
void combine_selections(Context& context, SelectionList list, Func func) void combine_selections(Context& context, SelectionList list, Func func, StringView title)
{ {
if (&context.buffer() != &list.buffer()) if (&context.buffer() != &list.buffer())
throw runtime_error{"cannot combine selections from different buffers"}; throw runtime_error{"cannot combine selections from different buffers"};
@ -1880,7 +1880,7 @@ void combine_selections(Context& context, SelectionList list, Func func)
list.set_main_index(sels.main_index()); list.set_main_index(sels.main_index());
} }
func(context, std::move(list)); func(context, std::move(list));
}, "enter combining operator", }, title,
"'a': append lists\n" "'a': append lists\n"
"'u': union\n" "'u': union\n"
"'i': intersection\n" "'i': intersection\n"
@ -1912,7 +1912,7 @@ void save_selections(Context& context, NormalParams params)
}; };
if (combine and not empty) if (combine and not empty)
combine_selections(context, read_selections_from_register(reg, context), save_to_reg); combine_selections(context, read_selections_from_register(reg, context), save_to_reg, "combine selections to register");
else else
save_to_reg(context, context.selections()); save_to_reg(context, context.selections());
} }
@ -1938,7 +1938,7 @@ void restore_selections(Context& context, NormalParams params)
set_selections(context, std::move(selections)); set_selections(context, std::move(selections));
} }
else else
combine_selections(context, std::move(selections), set_selections); combine_selections(context, std::move(selections), set_selections, "combine selections from register");
} }
void undo(Context& context, NormalParams params) void undo(Context& context, NormalParams params)