summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/message.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/message.c b/src/message.c
index 8909f081f..b574df63d 100644
--- a/src/message.c
+++ b/src/message.c
@@ -939,6 +939,12 @@ wait_return(redraw)
#ifdef USE_ON_FLY_SCROLL
dont_scroll = TRUE; /* disallow scrolling here */
#endif
+ /* Avoid the sequence that the user types ":" at the hit-return prompt
+ * to start an Ex command, but the file-changed dialog gets in the
+ * way. */
+ if (need_check_timestamps)
+ check_timestamps(FALSE);
+
hit_return_msg();
do
diff --git a/src/version.c b/src/version.c
index b2f5540e2..be992bf21 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 912,
+/**/
911,
/**/
910,