diff options
Diffstat (limited to 'data/vim/patches/8.1.0574')
| -rw-r--r-- | data/vim/patches/8.1.0574 | 129 |
1 files changed, 0 insertions, 129 deletions
diff --git a/data/vim/patches/8.1.0574 b/data/vim/patches/8.1.0574 deleted file mode 100644 index 0a42608ec..000000000 --- a/data/vim/patches/8.1.0574 +++ /dev/null @@ -1,129 +0,0 @@ -To: vim_dev@googlegroups.com -Subject: Patch 8.1.0574 -Fcc: outbox -From: Bram Moolenaar <Bram@moolenaar.net> -Mime-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit ------------- - -Patch 8.1.0574 -Problem: 'commentstring' not used when adding fold marker in C. -Solution: Require white space before middle comment part. (mostly by - Hirohito Higashi) -Files: src/misc1.c, src/testdir/test_fold.vim - - -*** ../vim-8.1.0573/src/misc1.c 2018-12-07 21:08:44.775946983 +0100 ---- src/misc1.c 2018-12-09 14:50:25.241083939 +0100 -*************** -*** 1993,1999 **** - 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. ---- 1993,1998 ---- -*************** -*** 2021,2028 **** - continue; - 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 */; ---- 2020,2025 ---- -*************** -*** 2037,2047 **** - && !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) ---- 2034,2046 ---- - && !VIM_ISWHITE(line[i + j]) && line[i + j] != NUL) - continue; - -! if (vim_strchr(part_buf, COM_MIDDLE) != NULL) - { -+ // For a middlepart comment, only consider it to match if -+ // everything before the current position in the line is -+ // whitespace. Otherwise we would think we are inside a -+ // comment if the middle part appears somewhere in the middle -+ // of the line. E.g. for C the "*" appears often. - for (j = 0; VIM_ISWHITE(line[j]) && j <= i; j++) - ; - if (j < i) -*** ../vim-8.1.0573/src/testdir/test_fold.vim 2018-12-07 21:08:44.775946983 +0100 ---- src/testdir/test_fold.vim 2018-12-09 15:00:39.993843356 +0100 -*************** -*** 507,512 **** ---- 507,541 ---- - enew! - endfunc - -+ " test create fold markers with C filetype -+ func Test_fold_create_marker_in_C() -+ enew! -+ set fdm=marker fdl=9 -+ set filetype=c -+ -+ let content = [ -+ \ '/*', -+ \ ' * comment', -+ \ ' * ', -+ \ ' *', -+ \ ' */', -+ \ 'int f(int* p) {', -+ \ ' *p = 3;', -+ \ ' return 0;', -+ \ '}' -+ \] -+ for c in range(len(content) - 1) -+ bw! -+ call append(0, content) -+ call cursor(c + 1, 1) -+ norm! zfG -+ call assert_equal(content[c] . (c < 4 ? '{{{' : '/*{{{*/'), getline(c + 1)) -+ endfor -+ -+ set fdm& fdl& -+ enew! -+ endfunc -+ - " test folding with indent - func Test_fold_indent() - enew! -*** ../vim-8.1.0573/src/version.c 2018-12-08 16:03:18.656085902 +0100 ---- src/version.c 2018-12-09 14:59:36.034199905 +0100 -*************** -*** 794,795 **** ---- 794,797 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 574, - /**/ - --- -Scientists decoded the first message from an alien civilization: - SIMPLY SEND 6 TIMES 10 TO THE 50 ATOMS OF HYDROGEN TO THE STAR -SYSTEM AT THE TOP OF THE LIST, CROSS OFF THAT STAR SYSTEM, THEN PUT -YOUR STAR SYSTEM AT THE BOTTOM OF THE LIST AND SEND IT TO 100 OTHER -STAR SYSTEMS. WITHIN ONE TENTH GALACTIC ROTATION YOU WILL RECEIVE -ENOUGH HYDROGREN TO POWER YOUR CIVILIZATION UNTIL ENTROPY REACHES ITS -MAXIMUM! IT REALLY WORKS! - - /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ an exciting new programming language -- http://www.Zimbu.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |