From 2148b842749d52311d9018ffedfdc66205c640ff Mon Sep 17 00:00:00 2001 From: Delapouite Date: Tue, 8 Oct 2019 22:28:09 +0200 Subject: [PATCH] Add unambiguous titles for infobox "enter combining operator" fix #3089 --- src/normal.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/normal.cc b/src/normal.cc index 5661d6cc..b4bb0334 100644 --- a/src/normal.cc +++ b/src/normal.cc @@ -1849,7 +1849,7 @@ void combine_selection(const Buffer& buffer, Selection& sel, const Selection& ot } template -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()) 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()); } func(context, std::move(list)); - }, "enter combining operator", + }, title, "'a': append lists\n" "'u': union\n" "'i': intersection\n" @@ -1912,7 +1912,7 @@ void save_selections(Context& context, NormalParams params) }; 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 save_to_reg(context, context.selections()); } @@ -1938,7 +1938,7 @@ void restore_selections(Context& context, NormalParams params) set_selections(context, std::move(selections)); } 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)