From 9e7ec4e3e6554b142eb00007c14176701e18fb40 Mon Sep 17 00:00:00 2001 From: Mark O'Donovan Date: Mon, 26 Sep 2016 10:18:54 +0100 Subject: [PATCH 1/2] Reload extern-modified files if buffer is clean Automatically reload files which have been modified externally if there have been no unsaved changes. Otherwise show reload dialog as normal. --- src/document.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/document.c b/src/document.c index 9fad86fca4..2d1c10c245 100644 --- a/src/document.c +++ b/src/document.c @@ -3609,6 +3609,12 @@ static void enable_key_intercept(GeanyDocument *doc, GtkWidget *bar) static void monitor_reload_file(GeanyDocument *doc) { + if( ! doc->changed ) + { + document_reload_force(doc, doc->encoding); + return; + } + gchar *base_name = g_path_get_basename(doc->file_name); /* show this message only once */ From d5be48aff4e550c2d64d455fe95d24d3f27d7f08 Mon Sep 17 00:00:00 2001 From: Mark O'Donovan Date: Mon, 26 Sep 2016 11:09:13 +0100 Subject: [PATCH 2/2] Revert "Reload extern-modified files if buffer is clean" This reverts commit 9e7ec4e3e6554b142eb00007c14176701e18fb40. --- src/document.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/document.c b/src/document.c index 2d1c10c245..9fad86fca4 100644 --- a/src/document.c +++ b/src/document.c @@ -3609,12 +3609,6 @@ static void enable_key_intercept(GeanyDocument *doc, GtkWidget *bar) static void monitor_reload_file(GeanyDocument *doc) { - if( ! doc->changed ) - { - document_reload_force(doc, doc->encoding); - return; - } - gchar *base_name = g_path_get_basename(doc->file_name); /* show this message only once */