Mercurial > vim

changeset 4325:62eadd7de409 v7.3.912

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.912 Problem: Typing a ":" command at the hit-enter dialog does not work if the "file changed" dialog happens next. Solution: Check for changed files before giving the hit-enter dialog.
author Bram Moolenaar <bram@vim.org>
date Wed, 24 Apr 2013 15:12:32 +0200
parents 553d58c1524e
children e75073cc86f3
files src/message.c src/version.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,