]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
updated for version 7.3.912 v7.3.912
authorBram Moolenaar <Bram@vim.org>
Wed, 24 Apr 2013 13:12:32 +0000 (15:12 +0200)
committerBram Moolenaar <Bram@vim.org>
Wed, 24 Apr 2013 13:12:32 +0000 (15:12 +0200)
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.

src/message.c
src/version.c

index 8909f081f2eabb62ba839441103f566807f332d2..b574df63dea788a24ccbac834039a7c7561191c3 100644 (file)
@@ -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
index b2f5540e273250c0d3c7bc1ffb8f5c1ad21037d7..be992bf21743c3ce5a0285eabefada701c22bbad 100644 (file)
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    912,
 /**/
     911,
 /**/