summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-01-02 20:55:27 +0000
committerBram Moolenaar <Bram@vim.org>2008-01-02 20:55:27 +0000
commit30405d35ef2beba5ec9e44c9ad37b98a8e9352da (patch)
tree644e657431e5a21c9ec984871aeb6b664e57dc8f
parenta0174af16f576e17c3148eb3649b86f212258975 (diff)
downloadvim-git-7.1.187.tar.gz
updated for version 7.1-187v7.1.187
-rw-r--r--src/ex_getln.c12
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 2 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 48ee8312c..7d543f249 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -335,7 +335,14 @@ getcmdline(firstc, count, indent)
quit_more = FALSE; /* reset after CTRL-D which had a more-prompt */
cursorcmd(); /* set the cursor on the right spot */
- c = safe_vgetc();
+
+ /* Get a character. Ignore K_IGNORE, it should not do anything, such
+ * as stop completion. */
+ do
+ {
+ c = safe_vgetc();
+ } while (c == K_IGNORE);
+
if (KeyTyped)
{
some_key_typed = TRUE;
@@ -1209,7 +1216,8 @@ getcmdline(firstc, count, indent)
goto cmdline_not_changed;
case K_IGNORE:
- goto cmdline_not_changed; /* Ignore mouse */
+ /* Ignore mouse event or ex_window() result. */
+ goto cmdline_not_changed;
#ifdef FEAT_GUI_W32
/* On Win32 ignore <M-F4>, we get it when closing the window was
diff --git a/src/version.c b/src/version.c
index 587e05dd3..92cd49b7a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 187,
+/**/
186,
/**/
185,