diff options
| author | Christian Brabandt <cb@256bit.org> | 2024-04-09 08:06:52 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-04-09 08:06:52 +0200 |
| commit | a040019be68859f0667ae475de8d67bb755596ed (patch) | |
| tree | 2dec2c9ce8cba38ba5193f778cba9cd59048aef6 | |
| parent | 34f00dd4abd011ce750e273b747915ae2f3b6e48 (diff) | |
patch 9.1.0282: Several small issues in doc and testsv9.1.0283
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>
| -rw-r--r-- | runtime/doc/filetype.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/syntax.txt | 4 | ||||
| -rw-r--r-- | src/highlight.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_diffmode.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index aa7c9ae0c5..f13cfc60d1 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 @@ 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: diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 5e290ecb1b..cc04c59c4c 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 @@ 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/src/highlight.c b/src/highlight.c index d874032fb2..54e348d330 100644 --- a/src/highlight.c +++ b/src/highlight.c @@ -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) /* diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index 9e973de213..f28e840ac5 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -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')) diff --git a/src/version.c b/src/version.c index 27ebd69f4b..dc9f775ff2 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 283, +/**/ 282, /**/ 281, |