summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-01-15 21:17:30 +0000
committerBram Moolenaar <Bram@vim.org>2008-01-15 21:17:30 +0000
commitf33943efe7d82e61b970a45e2ca6716eebdbb659 (patch)
treef80b324d84b0c3a1454f1a8abde3b7611a05b12f
parentce3be4756a6e5228808b81fe694b518a12ce1e51 (diff)
updated for version 7.1-230v7.1.230
-rw-r--r--src/ex_cmds2.c7
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 2eeb7527d3..051c716e46 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -2889,11 +2889,14 @@ do_source(fname, check_other, is_vimrc)
if (has_autocmd(EVENT_SOURCECMD, fname_exp, NULL)
&& apply_autocmds(EVENT_SOURCECMD, fname_exp, fname_exp,
FALSE, curbuf))
+ {
# ifdef FEAT_EVAL
- return aborting() ? FAIL : OK;
+ retval = aborting() ? FAIL : OK;
# else
- return OK;
+ retval = OK;
# endif
+ goto theend;
+ }
/* Apply SourcePre autocommands, they may get the file. */
apply_autocmds(EVENT_SOURCEPRE, fname_exp, fname_exp, FALSE, curbuf);
diff --git a/src/version.c b/src/version.c
index aea902577e..27daf07fb8 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 */
/**/
+ 230,
+/**/
229,
/**/
228,