patch 9.1.0282: Several small issues in doc and tests
Problem: Wrong doc style for pandoc syntax description,
Test_diff_eob_halfpage() may fail depending on
screen size, using braces in highlight.c when
not necessary
Solution: Fix pandoc documentation, make sure the window
for the test has 7 lines, remove the braces.
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index aa7c9ae..f13cfc6 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -1,4 +1,4 @@
-*filetype.txt* For Vim version 9.1. Last change: 2024 Apr 08
+*filetype.txt* For Vim version 9.1. Last change: 2024 Apr 09
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -174,7 +174,6 @@
*.typ g:filetype_typ
*.v g:filetype_v
*.w g:filetype_w |ft-cweb-syntax|
- *.md g:pandoc#filetypes#pandoc_markdown
For a few filetypes the global variable is used only when the filetype could
not be detected:
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 5e290ec..cc04c59 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 9.1. Last change: 2024 Apr 08
+*syntax.txt* For Vim version 9.1. Last change: 2024 Apr 09
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2532,7 +2532,7 @@
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/src/highlight.c b/src/highlight.c
index d874032..54e348d 100644
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -2543,9 +2543,7 @@
target.length = 0; // not used, see cmp_keyvalue_value_i()
entry = (keyvalue_T *)bsearch(&target, &rgb_tab, ARRAY_LENGTH(rgb_tab), sizeof(rgb_tab[0]), cmp_keyvalue_value_i);
if (entry != NULL)
- {
return gui_adjust_rgb((guicolor_T)entry->key);
- }
#if defined(FEAT_EVAL)
/*
diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim
index 9e973de..f28e840 100644
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
Binary files differ
diff --git a/src/version.c b/src/version.c
index 27ebd69..dc9f775 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 283,
+/**/
282,
/**/
281,