From b3ba769220aad0a3ac2a969d43c58396b3753aa7 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Mon, 14 Nov 2016 13:59:33 +0000 Subject: 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 --- src/buffer_utils.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/buffer_utils.cc') 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( -- cgit v1.2.3