diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-04-24 15:12:32 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-04-24 15:12:32 +0200 |
| commit | ec38d6932c674b506484792e28b88ba43edad9ee (patch) | |
| tree | e13f53ec733a359096097ab8f68a9789fed953ce /src | |
| parent | 230bb3f09d1661cb8da3ef64406270bd3e61aae3 (diff) | |
| download | vim-git-ec38d6932c674b506484792e28b88ba43edad9ee.tar.gz | |
updated for version 7.3.912v7.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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/message.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
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, |