aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/regexp.c
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-04-16 21:36:53 +0300
committerZyX <kp-pav@yandex.ru>2017-04-16 21:43:26 +0300
commitb7118a008af1f0a15f7cfbe070a1f590310cc7b5 (patch)
tree239f3cdcae9832a32d72c9c91da5d409680292a0 /src/nvim/regexp.c
parent69ebfb8d8ea26061a4fbfe9ee07d7bfff49e6a2b (diff)
downloadrneovim-b7118a008af1f0a15f7cfbe070a1f590310cc7b5.tar.gz
rneovim-b7118a008af1f0a15f7cfbe070a1f590310cc7b5.tar.bz2
rneovim-b7118a008af1f0a15f7cfbe070a1f590310cc7b5.zip
regexp: Remove another has_mbyte/…-checking stuff
Diffstat (limited to 'src/nvim/regexp.c')
-rw-r--r--src/nvim/regexp.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index e15a2eebe5..284cb27c40 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -2923,13 +2923,8 @@ static void skipchr(void)
else
prevchr_len = 0;
if (regparse[prevchr_len] != NUL) {
- if (enc_utf8)
- /* exclude composing chars that mb_ptr2len does include */
- prevchr_len += utf_ptr2len(regparse + prevchr_len);
- else if (has_mbyte)
- prevchr_len += (*mb_ptr2len)(regparse + prevchr_len);
- else
- ++prevchr_len;
+ // Exclude composing chars that utfc_ptr2len does include.
+ prevchr_len += utf_ptr2len(regparse + prevchr_len);
}
regparse += prevchr_len;
prev_at_start = at_start;