summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-11-14 20:52:28 +0100
committerBram Moolenaar <Bram@vim.org>2012-11-14 20:52:28 +0100
commitb826ddb034564828487b0ef94f271262bb902f7c (patch)
treede2374c515984a83b25f2547a4dace0e540a927c
parent3ab72c5c72fb824da0e9c850479052d6f8c78e52 (diff)
downloadvim-git-b826ddb034564828487b0ef94f271262bb902f7c.tar.gz
updated for version 7.3.714v7.3.714
Problem: Inconsistency: :set can be used in the sandbox, but :setlocal and :setglobal cannot. (Michael Henry) Solution: Fix the flags for :setlocal and :setglobal. (Christian Brabandt)
-rw-r--r--src/ex_cmds.h4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index c81a1aa2b..b02b9f6c7 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -832,9 +832,9 @@ EX(CMD_set, "set", ex_set,
EX(CMD_setfiletype, "setfiletype", ex_setfiletype,
TRLBAR|EXTRA|NEEDARG|CMDWIN),
EX(CMD_setglobal, "setglobal", ex_set,
- TRLBAR|EXTRA|CMDWIN),
+ TRLBAR|EXTRA|CMDWIN|SBOXOK),
EX(CMD_setlocal, "setlocal", ex_set,
- TRLBAR|EXTRA|CMDWIN),
+ TRLBAR|EXTRA|CMDWIN|SBOXOK),
EX(CMD_sfind, "sfind", ex_splitview,
BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|TRLBAR),
EX(CMD_sfirst, "sfirst", ex_rewind,
diff --git a/src/version.c b/src/version.c
index 3c9bae780..ecbc7aaa5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 714,
+/**/
713,
/**/
712,