Mercurial > vim
changeset 18681:a13370d92f9d v8.1.2332
patch 8.1.2332: missing file in refactoring
Commit: https://github.com/vim/vim/commit/556ae8ea28b4e3e9fc47ad130795009a3080146e
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Nov 21 22:27:22 2019 +0100
patch 8.1.2332: missing file in refactoring
Problem: Missing file in refactoring.
Solution: Update missing file.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 21 Nov 2019 22:30:03 +0100 |
parents | 939a704c2e92 |
children | 2317cf0b268f |
files | src/search.c src/version.c |
diffstat | 2 files changed, 98 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/search.c +++ b/src/search.c @@ -1918,6 +1918,102 @@ find_rawstring_end(char_u *linep, pos_T } /* + * Check matchpairs option for "*initc". + * If there is a match set "*initc" to the matching character and "*findc" to + * the opposite character. Set "*backwards" to the direction. + * When "switchit" is TRUE swap the direction. + */ + static void +find_mps_values( + int *initc, + int *findc, + int *backwards, + int switchit) +{ + char_u *ptr; + + ptr = curbuf->b_p_mps; + while (*ptr != NUL) + { + if (has_mbyte) + { + char_u *prev; + + if (mb_ptr2char(ptr) == *initc) + { + if (switchit) + { + *findc = *initc; + *initc = mb_ptr2char(ptr + mb_ptr2len(ptr) + 1); + *backwards = TRUE; + } + else + { + *findc = mb_ptr2char(ptr + mb_ptr2len(ptr) + 1); + *backwards = FALSE; + } + return; + } + prev = ptr; + ptr += mb_ptr2len(ptr) + 1; + if (mb_ptr2char(ptr) == *initc) + { + if (switchit) + { + *findc = *initc; + *initc = mb_ptr2char(prev); + *backwards = FALSE; + } + else + { + *findc = mb_ptr2char(prev); + *backwards = TRUE; + } + return; + } + ptr += mb_ptr2len(ptr); + } + else + { + if (*ptr == *initc) + { + if (switchit) + { + *backwards = TRUE; + *findc = *initc; + *initc = ptr[2]; + } + else + { + *backwards = FALSE; + *findc = ptr[2]; + } + return; + } + ptr += 2; + if (*ptr == *initc) + { + if (switchit) + { + *backwards = FALSE; + *findc = *initc; + *initc = ptr[-2]; + } + else + { + *backwards = TRUE; + *findc = ptr[-2]; + } + return; + } + ++ptr; + } + if (*ptr == ',') + ++ptr; + } +} + +/* * findmatchlimit -- find the matching paren or brace, if it exists within * maxtravel lines of the cursor. A maxtravel of 0 means search until falling * off the edge of the file.