Mercurial > vim

changeset 5132:a68629544891 v7.3.1309

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.1309 Problem: When a script defines a function the flag to wait for the user to hit enter is reset. Solution: Restore the flag. (Yasuhiro Matsumoto) Except when the user was typing the function.
author Bram Moolenaar <bram@vim.org>
date Fri, 05 Jul 2013 18:29:48 +0200
parents 99797d166c1f
children 3713f0f62c95
files src/eval.c src/os_unix.c src/version.c
diffstat 3 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -21108,6 +21108,7 @@ ex_function(eap)
     int		j;
     int		c;
     int		saved_did_emsg;
+    int		saved_wait_return = need_wait_return;
     char_u	*name = NULL;
     char_u	*p;
     char_u	*arg;
@@ -21439,7 +21440,10 @@ ex_function(eap)
     for (;;)
     {
 	if (KeyTyped)
+	{
 	    msg_scroll = TRUE;
+	    saved_wait_return = FALSE;
+	}
 	need_wait_return = FALSE;
 	sourcing_lnum_off = sourcing_lnum;
 
@@ -21750,6 +21754,7 @@ ret_free:
     vim_free(fudi.fd_newkey);
     vim_free(name);
     did_emsg |= saved_did_emsg;
+    need_wait_return |= saved_wait_return;
 }
 
 /*
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -6129,7 +6129,6 @@ save_patterns(num_pat, pat, num_file, fi
 }
 #endif
 
-
 /*
  * Return TRUE if the string "p" contains a wildcard that mch_expandpath() can
  * expand.
--- 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 */
 /**/
+    1309,
+/**/
     1308,
 /**/
     1307,