aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/doc/syntax.txt2
-rw-r--r--test/old/testdir/test_diffmode.vim2
2 files changed, 3 insertions, 1 deletions
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index fa34bee975..2d7e21cd2f 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -2059,7 +2059,7 @@ can use the "PANDOC=VIM" syntax. For example: >
To use italics and strong in emphases. Default = 1 >
- :let *g:pandoc#syntax#style#emphases = 1
+ :let g:pandoc#syntax#style#emphases = 1
"0" will add "block" to g:pandoc#syntax#conceal#blacklist, because otherwise
you couldn't tell where the styles are applied.
diff --git a/test/old/testdir/test_diffmode.vim b/test/old/testdir/test_diffmode.vim
index 334bb3ee32..3cc8f97f2f 100644
--- a/test/old/testdir/test_diffmode.vim
+++ b/test/old/testdir/test_diffmode.vim
@@ -1777,10 +1777,12 @@ func Test_diff_eob_halfpage()
5new
call setline(1, ['']->repeat(10) + ['a'])
diffthis
+ call assert_true(5, winheight(5))
5new
call setline(1, ['']->repeat(3) + ['a', 'b'])
diffthis
wincmd j
+ resize 7
exe "norm! G\<C-D>"
call assert_equal(6, line('w0'))