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

Change BufWritePre/BufWritePost logic

Browse Source 
Run them in client context if possible, and give them the target
filename instead of the buffer name.

Fixes #823
This commit is contained in:
Maxime Coste 2016-10-01 17:07:50 +01:00
parent 4b6d4ec8eb
commit d50087eabe
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/commands.cc
View File

@ -313,7 +313,10 @@ void write_buffer(const ParametersParser& parser, Context& context, const ShellC
auto filename = parser.positional_count() == 0 ? auto filename = parser.positional_count() == 0 ?
buffer.name() : parse_filename(parser[0]); buffer.name() : parse_filename(parser[0]);
context.hooks().run_hook("BufWritePre", filename, context);
write_buffer_to_file(buffer, filename); write_buffer_to_file(buffer, filename);
context.hooks().run_hook("BufWritePost", filename, context);
} }
const CommandDesc write_cmd = { const CommandDesc write_cmd = {
@ -334,7 +337,11 @@ void write_all_buffers()
{ {
if ((buffer->flags() & Buffer::Flags::File) and buffer->is_modified() if ((buffer->flags() & Buffer::Flags::File) and buffer->is_modified()
and !(buffer->flags() & Buffer::Flags::ReadOnly)) and !(buffer->flags() & Buffer::Flags::ReadOnly))
{
buffer->run_hook_in_own_context("BufWritePre", buffer->name());
write_buffer_to_file(*buffer, buffer->name()); write_buffer_to_file(*buffer, buffer->name());
buffer->run_hook_in_own_context("BufWritePost", buffer->name());
}
} }
} }

6
src/file.cc
View File

@ -255,9 +255,6 @@ void write_buffer_to_fd(Buffer& buffer, int fd)
} }
void write_buffer_to_file(Buffer& buffer, StringView filename) void write_buffer_to_file(Buffer& buffer, StringView filename)
{
buffer.run_hook_in_own_context("BufWritePre", buffer.name());
{ {
int fd = open(parse_filename(filename).c_str(), int fd = open(parse_filename(filename).c_str(),
O_CREAT | O_WRONLY | O_TRUNC, 0644); O_CREAT | O_WRONLY | O_TRUNC, 0644);
@ -266,13 +263,10 @@ void write_buffer_to_file(Buffer& buffer, StringView filename)
auto close_fd = on_scope_end([fd]{ close(fd); }); auto close_fd = on_scope_end([fd]{ close(fd); });
write_buffer_to_fd(buffer, fd); write_buffer_to_fd(buffer, fd);
}
if ((buffer.flags() & Buffer::Flags::File) and if ((buffer.flags() & Buffer::Flags::File) and
real_path(filename) == real_path(buffer.name())) real_path(filename) == real_path(buffer.name()))
buffer.notify_saved(); buffer.notify_saved();
buffer.run_hook_in_own_context("BufWritePost", buffer.name());
} }
void write_buffer_to_backup_file(Buffer& buffer) void write_buffer_to_backup_file(Buffer& buffer)