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

Reactivate direct file change check on entering normal mode

Browse Source
This commit is contained in:
Maxime Coste 2015-03-04 20:46:26 +00:00
parent 4e02e822fd
commit c0e4268e17
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/client.cc
View File

@ -222,6 +222,9 @@ void Client::close_buffer_reload_dialog()
void Client::check_if_buffer_needs_reloading() void Client::check_if_buffer_needs_reloading()
{ {
if (m_buffer_reload_dialog_opened)
return;
Buffer& buffer = context().buffer(); Buffer& buffer = context().buffer();
auto reload = context().options()["autoreload"].get<YesNoAsk>(); auto reload = context().options()["autoreload"].get<YesNoAsk>();
if (not (buffer.flags() & Buffer::Flags::File) or reload == No) if (not (buffer.flags() & Buffer::Flags::File) or reload == No)

8
src/input_handler.cc
View File

@ -71,11 +71,11 @@ public:
void on_enabled() override void on_enabled() override
{ {
if (not context().has_client()) if (context().has_client())
return; {
// Do not check buffer timestamp, we might already be executing the context().client().check_if_buffer_needs_reloading();
// on next key of a buffer timestamp check.
m_fs_check_timer.set_next_date(Clock::now() + fs_check_timeout); m_fs_check_timer.set_next_date(Clock::now() + fs_check_timeout);
}
context().hooks().run_hook("NormalBegin", "", context()); context().hooks().run_hook("NormalBegin", "", context());
} }