summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-04-29 20:18:45 +0200
committerBram Moolenaar <Bram@vim.org>2021-04-29 20:18:45 +0200
commitaeed2a6359e9ca692e1397884c3678685132d360 (patch)
tree670df20bf9e7a3f5715c77b6faa7f568667e8dff
parent227c58a486d2459e7bf6ed2c917ede7e324e3570 (diff)
patch 8.2.2818: no jump added when opening terminal in current windowv8.2.2818
Problem: No jump added to jumplist when opening terminal in current window. Solution: Call setpcmark(). (closes #8158)
-rw-r--r--src/terminal.c1
-rw-r--r--src/testdir/test_terminal.vim7
-rw-r--r--src/version.c2
3 files changed, 10 insertions, 0 deletions
diff --git a/src/terminal.c b/src/terminal.c
index 6f07055ebc..ce9f64be19 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -473,6 +473,7 @@ term_start(
ga_init2(&term->tl_scrollback_postponed, sizeof(sb_line_T), 300);
ga_init2(&term->tl_osc_buf, sizeof(char), 300);
+ setpcmark();
CLEAR_FIELD(split_ea);
if (opt->jo_curwin)
{
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 6ea90b2410..3944294e3c 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -2029,5 +2029,12 @@ func Test_terminal_nested_autocmd()
augroup END
endfunc
+func Test_terminal_adds_jump()
+ clearjumps
+ call term_start("ls", #{curwin: 1})
+ call assert_equal(1, getjumplist()[0]->len())
+ bwipe!
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 0158d89470..f1d55324d5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2818,
+/**/
2817,
/**/
2816,