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

Slight refactor of jump collapsing code

Browse Source
This commit is contained in:
Maxime Coste 2018-01-12 07:50:52 +11:00
parent 827aab1386
commit 2366af29e2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/commands.cc
View File

@ -1655,15 +1655,16 @@ void context_wrap(const ParametersParser& parser, Context& context, Func func)
}
else
{
const bool collapse_jumps = not draft and (bool)parser.get_switch("collapse-jumps");
SelectionList jump = c.selections();
JumpList original_jump_list = collapse_jumps ? c.jump_list() : JumpList{};
Optional<JumpList> original_jump_list;
if (not draft and (bool)parser.get_switch("collapse-jumps"))
original_jump_list = c.jump_list();
SelectionList jump = c.selections();
func(parser, c);
if (collapse_jumps and c.jump_list() != original_jump_list)
if (original_jump_list and c.jump_list() != *original_jump_list)
{
c.jump_list() = std::move(original_jump_list);
c.jump_list() = std::move(*original_jump_list);
c.jump_list().push(std::move(jump));
}
}