summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-09-14 14:33:51 +0200
committerBram Moolenaar <Bram@vim.org>2011-09-14 14:33:51 +0200
commit52af96527c914599334e3c2543ebb5ba1e37bbbe (patch)
tree36939145f36b2d6a7f0f7954b09108927fb64d3a
parent612af43cb64d06a57211200296068f3f10126ce0 (diff)
updated for version 7.3.305v7.3.305
Problem: Auto-loading a function while editing the command line causes scrolling up the display. Solution: Don't set msg_scroll when defining a function and the user is not typing. (Yasuhiro Matsumoto)
-rw-r--r--src/eval.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index e9ab0359a8..f66fb1b57e 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -20786,7 +20786,8 @@ ex_function(eap)
nesting = 0;
for (;;)
{
- msg_scroll = TRUE;
+ if (KeyTyped)
+ msg_scroll = TRUE;
need_wait_return = FALSE;
sourcing_lnum_off = sourcing_lnum;
diff --git a/src/version.c b/src/version.c
index 77a1e2a36e..f21e332774 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 305,
+/**/
304,
/**/
303,