summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-03-11 08:05:50 +0100
committerBram Moolenaar <Bram@vim.org>2019-03-11 08:05:50 +0100
commit55d81cd2a15d93dba89b2ff1c988d82789919b6b (patch)
tree0722e538ea6be99add3fc6a17752e5962d2b92c4
parente165f63598b58bfdac0168583aa1ef75fbf7be6d (diff)
downloadvim-git-55d81cd2a15d93dba89b2ff1c988d82789919b6b.tar.gz
patch 8.1.1005: test fails because t_F2 is not setv8.1.1005
Problem: Test fails because t_F2 is not set. Solution: Add try-catch.
-rw-r--r--src/testdir/test_registers.vim9
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim
index b57555aed..ebcc8e1d0 100644
--- a/src/testdir/test_registers.vim
+++ b/src/testdir/test_registers.vim
@@ -151,12 +151,17 @@ endfunc
" characters as an escape sequence.
func Test_recording_esc_sequence()
new
- let save_F2 = &t_F2
+ try
+ let save_F2 = &t_F2
+ catch
+ endtry
let t_F2 = "\<Esc>OQ"
call feedkeys("qqiTest\<Esc>", "xt")
call feedkeys("OQuirk\<Esc>q", "xt")
call feedkeys("Go\<Esc>@q", "xt")
call assert_equal(['Quirk', 'Test', 'Quirk', 'Test'], getline(1, 4))
bwipe!
- let t_F2 = save_F2
+ if exists('save_F2')
+ let t_F2 = save_F2
+ endif
endfunc
diff --git a/src/version.c b/src/version.c
index 0b0ab0c74..38d528694 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1005,
+/**/
1004,
/**/
1003,