summaryrefslogtreecommitdiff
path: root/src/buffer_utils.cc
diff options
context:
space:
mode:
authorMaxime Coste <frrrwww@gmail.com>2016-11-14 13:59:33 +0000
committerMaxime Coste <frrrwww@gmail.com>2016-11-14 19:39:35 +0000
commitb3ba769220aad0a3ac2a969d43c58396b3753aa7 (patch)
treefb01b5f5e8cd5260ea23aff309bcdcf9ba017f94 /src/buffer_utils.cc
parentcb074793a0af099754a7fba9c2a5755bd2130d31 (diff)
Propagate the hooks disabled state through prompt, menu, and command execution
Maintain it as well during buffer creation even if the hooks are not executed in client context. Fixes #818
Diffstat (limited to 'src/buffer_utils.cc')
-rw-r--r--src/buffer_utils.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/buffer_utils.cc b/src/buffer_utils.cc
index d26249c9..3f0ec837 100644
--- a/src/buffer_utils.cc
+++ b/src/buffer_utils.cc
@@ -57,20 +57,20 @@ ByteCount get_byte_to_column(const Buffer& buffer, ColumnCount tabstop, DisplayC
return (int)(it - line.begin());
}
-Buffer* open_file_buffer(StringView filename)
+Buffer* open_file_buffer(StringView filename, Buffer::Flags flags)
{
MappedFile file_data{filename};
return BufferManager::instance().create_buffer(
- filename.str(), Buffer::Flags::File, file_data, file_data.st.st_mtim);
+ filename.str(), Buffer::Flags::File | flags, file_data, file_data.st.st_mtim);
}
-Buffer* open_or_create_file_buffer(StringView filename)
+Buffer* open_or_create_file_buffer(StringView filename, Buffer::Flags flags)
{
auto& buffer_manager = BufferManager::instance();
if (file_exists(filename))
{
MappedFile file_data{filename};
- return buffer_manager.create_buffer(filename.str(), Buffer::Flags::File,
+ return buffer_manager.create_buffer(filename.str(), Buffer::Flags::File | flags,
file_data, file_data.st.st_mtim);
}
return buffer_manager.create_buffer(