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

Fix buffer deletion logic

Browse Source 
'eval -buffer * db' was failing in certain cases
This commit is contained in:
Maxime Coste 2016-02-11 23:07:42 +00:00
parent a7a2e51d52
commit dfe3098b18
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/client_manager.cc
View File

@ -134,6 +134,7 @@ void ClientManager::ensure_no_client_uses_buffer(Buffer& buffer)
if (buf.get() != &buffer) if (buf.get() != &buffer)
{ {
client->context().change_buffer(*buf); client->context().change_buffer(*buf);
client->set_last_buffer(nullptr);
break; break;
} }
} }

8
src/commands.cc
View File

@ -1288,8 +1288,14 @@ void context_wrap(const ParametersParser& parser, Context& context, Func func)
func(parser, c); func(parser, c);
}; };
if (*bufnames == "*") if (*bufnames == "*")
for (auto buffer : BufferManager::instance()) {
// copy buffer list as we might be mutating the buffer list
// in the loop.
Vector<SafePtr<Buffer>> buffers{BufferManager::instance().begin(),
BufferManager::instance().end()};
for (auto buffer : buffers)
context_wrap_for_buffer(*buffer); context_wrap_for_buffer(*buffer);
}
else else
for (auto& name : split(*bufnames, ',')) for (auto& name : split(*bufnames, ','))
context_wrap_for_buffer(BufferManager::instance().get_buffer(name)); context_wrap_for_buffer(BufferManager::instance().get_buffer(name));