patch 9.0.0896: test for home key fails when 'term' is "tmux"

Problem:    Test for home key fails when 'term' is "tmux".
Solution:   Only save termcap entries that exist.  Adjust code for xHome to
            what xterm uses. (closes #11566)

diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index 6d1d39682f82983be29db1ec2dba8ba753858380..a122e5bdff4b24a2ab95a51154848634f0426251 100644 (file)
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -2534,15 +2534,17 @@ endfunc
 func Test_home_key_works()
   " The '@' character in K_HOME must only match "1" when followed by ";",
   " otherwise this code for Home is not recognized: "<Esc>[1~"
-  " Set termcap values like "xterm" uses them.
-  let save_kh = &t_kh
-  let save_K1 = &t_K1
-  let save_k2 = &t_k2
-  let save_k3 = &t_k3
-  let save_end = &t_@7
+  " Set termcap values like "xterm" uses them.  Except using F2 for xHome,
+  " because that termcap entry can't be set here.
+  let save_K1 = exists('&t_K1') ? &t_K1 : ''
+  let save_kh = exists('&t_kh') ? &t_kh : ''
+  let save_k2 = exists('&t_k2') ? &t_k2 : ''
+  let save_k3 = exists('&t_k3') ? &t_k3 : ''
+  let save_end = exists('&t_@7') ? &t_@7 : ''
+
   let &t_K1 = "\<Esc>[1;*~"      " <kHome>
   let &t_kh = "\<Esc>[@;*H"      " <Home>
-  let &t_k2 = "\<Esc>O*H[1;*~"   " use <F2> for <xHome>
+  let &t_k2 = "\<Esc>O*H"        " use <F2> for <xHome>
   let &t_k3 = "\<Esc>[7;*~"      " use <F3> for <zHome>
   let &t_@7 = "\<Esc>[@;*F"      " <End>
 
@@ -2550,13 +2552,13 @@ func Test_home_key_works()
   call feedkeys("i\<C-K>\<Esc>OH\n\<Esc>", 'tx')
   call feedkeys("i\<C-K>\<Esc>[1~\n\<Esc>", 'tx')
   call assert_equal([
-        \ '<Home>',
+        \ '<F2>',
         \ '<kHome>',
         \ ''], getline(1, '$'))
 
   bwipe!
-  let &t_kh = save_kh
   let &t_K1 = save_K1
+  let &t_kh = save_kh
   let &t_k2 = save_k2
   let &t_k3 = save_k3
   let &t_@7 = save_end

diff --git a/src/version.c b/src/version.c
index fdccde945453fd8c9d38c528a29c3959f18e3ae4..e3af0954712e10ff4850900dd8f8553954bfb1ca 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    896,
 /**/
     895,
 /**/