aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.1.0282: Several small issues in doc and tests

Browse Source 
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>
This commit is contained in:
Christian Brabandt 2024-04-09 08:06:52 +02:00
parent 34f00dd4ab
commit a040019be6
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/doc/filetype.txt
View File

@ -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 @@ variables can be used to overrule the filetype used for certain extensions:
*.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:

4
runtime/doc/syntax.txt
View File

@ -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 @@ 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.

2
src/highlight.c
View File

@ -2543,9 +2543,7 @@ gui_get_color_cmn(char_u *name)
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)
/*

2
src/testdir/test_diffmode.vim
View File

@ -2028,10 +2028,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'))

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
283,
/**/
282,
/**/