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

Allow <ret> and <esc> to reload/keep an externally modified file

Browse Source 
Fixes #113
This commit is contained in:
Maxime Coste 2015-02-11 13:56:16 +00:00
parent 790e671f6c
commit 6658d15741
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client.cc
View File

@ -196,7 +196,7 @@ void Client::check_buffer_fs_timestamp()
m_ui->info_show( m_ui->info_show(
"reload '" + buffer.display_name() + "' ?", "reload '" + buffer.display_name() + "' ?",
"'" + buffer.display_name() + "' was modified externally\n" "'" + buffer.display_name() + "' was modified externally\n"
"press r or y to reload, k or n to keep", "press <ret>, r or y to reload, <esc>, k or n to keep",
CharCoord{}, get_face("Information"), InfoStyle::Prompt); CharCoord{}, get_face("Information"), InfoStyle::Prompt);
m_input_handler.on_next_key(KeymapMode::None, m_input_handler.on_next_key(KeymapMode::None,
@ -207,9 +207,9 @@ void Client::check_buffer_fs_timestamp()
// buffer got deleted while waiting for the key, do nothing // buffer got deleted while waiting for the key, do nothing
if (not buf) if (not buf)
return; return;
if (key == 'r' or key == 'y') if (key == 'r' or key == 'y' or key == ctrl('m'))
reload_buffer(context, filename); reload_buffer(context, filename);
else if (key == 'k' or key == 'n') else if (key == 'k' or key == 'n' or key == Key::Escape)
{ {
// reread timestamp in case the file was modified again // reread timestamp in case the file was modified again
buf->set_fs_timestamp(get_fs_timestamp(filename)); buf->set_fs_timestamp(get_fs_timestamp(filename));