summaryrefslogtreecommitdiff
path: root/src/window.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-01-20 23:02:51 +0000
committerBram Moolenaar <Bram@vim.org>2006-01-20 23:02:51 +0000
commit2d3f489e09a1cc50f5b7601eff568a4eb87fbd51 (patch)
treea29e0aabb8e2ee8bba220b843d536dca3fdf2100 /src/window.c
parent8ada17c4d9d783b370d081c2a947ea1350cc8338 (diff)
downloadvim-git-2d3f489e09a1cc50f5b7601eff568a4eb87fbd51.tar.gz
updated for version 7.0183
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/window.c b/src/window.c
index 680c32017..a02180594 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2717,10 +2717,10 @@ win_alloc_first()
win_goto(wp)
win_T *wp;
{
- if (editing_cmdline())
+ if (text_locked())
{
beep_flush();
- editing_cmdline_msg();
+ text_locked_msg();
return;
}
@@ -4638,7 +4638,8 @@ eval_includeexpr(ptr, len)
char_u *res;
set_vim_var_string(VV_FNAME, ptr, len);
- res = eval_to_string_safe(curbuf->b_p_inex, NULL);
+ res = eval_to_string_safe(curbuf->b_p_inex, NULL,
+ was_set_insecurely((char_u *)"includeexpr"));
set_vim_var_string(VV_FNAME, NULL, 0);
return res;
}