thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0570: 'commentstring' not used when adding fold marker

Browse Source 
Problem:    'commentstring' not used when adding fold marker. (Maxim Kim)
Solution:   Only use empty 'comments' middle when leader is empty. (Christian
            Brabandt, closes #3670)
This commit is contained in:
Bram Moolenaar
2018-12-07 21:08:49 +01:00
parent 10ccaa17ec
commit 539328197c
3 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/misc1.c
View File

@@ -1993,6 +1993,7 @@ get_last_leader_offset(char_u *line, char_u **flags)
for (list = curbuf->b_p_com; *list; )
{
char_u *flags_save = list;
int is_only_whitespace = FALSE;
/*
* Get one option part into part_buf[]. Advance list to next one.
@@ -2018,8 +2019,10 @@ get_last_leader_offset(char_u *line, char_u **flags)
{
if (i == 0 || !VIM_ISWHITE(line[i - 1]))
continue;
while (VIM_ISWHITE(string[0]))
while (VIM_ISWHITE(*string))
++string;
if (*string == NUL)
is_only_whitespace = TRUE;
}
for (j = 0; string[j] != NUL && string[j] == line[i + j]; ++j)
/* do nothing */;
@@ -2032,8 +2035,17 @@ get_last_leader_offset(char_u *line, char_u **flags)
*/
if (vim_strchr(part_buf, COM_BLANK) != NULL
&& !VIM_ISWHITE(line[i + j]) && line[i + j] != NUL)
{
continue;
// For a middlepart comment that is only white space, only consider
// it to match if everything before the current position in the
// line is also whitespace.
if (is_only_whitespace && vim_strchr(part_buf, COM_MIDDLE) != NULL)
{
for (j = 0; VIM_ISWHITE(line[j]) && j <= i; j++)
;
if (j < i)
continue;
}
/*