summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ex_cmds.h2
-rw-r--r--src/testdir/test_registers.vim5
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 3 deletions
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 325fee569b..af13510492 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -1286,7 +1286,7 @@ EXCMD(CMD_redrawtabline, "redrawtabline", ex_redrawtabline,
EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
ADDR_NONE),
EXCMD(CMD_registers, "registers", ex_display,
- EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
+ EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_SBOXOK|EX_CMDWIN|EX_LOCK_OK,
ADDR_NONE),
EXCMD(CMD_resize, "resize", ex_resize,
EX_RANGE|EX_TRLBAR|EX_WORD1|EX_CMDWIN|EX_LOCK_OK,
diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim
index 33ea0f4bd3..46142d681b 100644
--- a/src/testdir/test_registers.vim
+++ b/src/testdir/test_registers.vim
@@ -51,8 +51,9 @@ func Test_display_registers()
call feedkeys("i\<C-R>=2*4\n\<esc>")
call feedkeys(":ls\n", 'xt')
- let a = execute('display')
- let b = execute('registers')
+ " these commands work in the sandbox
+ let a = execute('sandbox display')
+ let b = execute('sandbox registers')
call assert_equal(a, b)
call assert_match('^\nType Name Content\n'
diff --git a/src/version.c b/src/version.c
index 4b041937dc..132a0d96f9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1596,
+/**/
1595,
/**/
1594,