mawww/kakoune
1
1
Fork 0
mirror of https://github.com/mawww/kakoune.git synced 2024-12-25 20:41:49 +03:00
Code Issues Projects Releases Wiki Activity

Fix set_last_used_buffer

Browse Source
This commit is contained in:
Eike Plack 2015-04-15 02:36:47 +02:00
parent 3e6a37365e
commit 0f9b210e3f
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/commands.cc
View File

@ -134,6 +134,7 @@ void edit(const ParametersParser& parser, Context& context)
: context.buffer().name();
Buffer* buffer = nullptr;
Buffer* oldbuf = &context.buffer();
if (not force_reload)
buffer = BufferManager::instance().get_buffer_ifp(name);
if (not buffer)
@ -159,7 +160,7 @@ void edit(const ParametersParser& parser, Context& context)
}
}
BufferManager::instance().set_last_used_buffer(*buffer);
BufferManager::instance().set_last_used_buffer(*oldbuf);
const size_t param_count = parser.positional_count();
if (buffer != &context.buffer() or param_count > 1)
@ -364,11 +365,12 @@ const CommandDesc buffer_cmd = {
buffer_completer,
[](const ParametersParser& parser, Context& context)
{
Buffer* oldbuf = &context.buffer();
Buffer& buffer = BufferManager::instance().get_buffer(parser[0]);
BufferManager::instance().set_last_used_buffer(buffer);
if (&buffer != &context.buffer())
if (&buffer != oldbuf)
{
BufferManager::instance().set_last_used_buffer(*oldbuf);
context.push_jump();
context.change_buffer(buffer);
}
@ -385,7 +387,7 @@ const CommandDesc nextbuffer_cmd = {
CommandCompleter{},
[](const ParametersParser& parser, Context& context)
{
const Buffer* oldbuf = &context.buffer();
Buffer* oldbuf = &context.buffer();
auto it = find_if(BufferManager::instance(),
[oldbuf](const SafePtr<Buffer>& lhs)
{ return lhs.get() == oldbuf; });
@ -395,10 +397,10 @@ const CommandDesc nextbuffer_cmd = {
it = BufferManager::instance().begin();
Buffer* newbuf = it->get();
BufferManager::instance().set_last_used_buffer(*newbuf);
if (newbuf != oldbuf)
{
BufferManager::instance().set_last_used_buffer(*oldbuf);
context.push_jump();
context.change_buffer(*newbuf);
}

6
src/normal.cc
View File

@ -219,7 +219,8 @@ void goto_commands(Context& context, NormalParams params)
if (buffer != &context.buffer())
{
BufferManager::instance().set_last_used_buffer(*buffer);
Buffer* oldbuf = &context.buffer();
BufferManager::instance().set_last_used_buffer(*oldbuf);
context.push_jump();
context.change_buffer(*buffer);
}
@ -1096,9 +1097,10 @@ void jump(Context& context, NormalParams)
auto jump = (direction == Forward) ?
context.jump_forward() : context.jump_backward();
Buffer* oldbuf = &context.buffer();
Buffer& buffer = const_cast<Buffer&>(jump.buffer());
BufferManager::instance().set_last_used_buffer(buffer);
if (&buffer != &context.buffer())
if (&buffer != oldbuf)
context.change_buffer(buffer);
context.selections() = jump;
}