From 2bddc4ca54e31a14b7e9799beda134217ae867e7 Mon Sep 17 00:00:00 2001 From: ZviRackover Date: Wed, 15 Aug 2018 22:02:33 +0300 Subject: Remove occurences of mb_head_off --- src/nvim/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/window.c') diff --git a/src/nvim/window.c b/src/nvim/window.c index 8239061a0c..fa963d790d 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -5130,7 +5130,7 @@ file_name_in_line ( * Go one char back to ":" before "//" even when ':' is not in 'isfname'. */ while (ptr > line) { - if (has_mbyte && (len = (size_t)((*mb_head_off)(line, ptr - 1))) > 0) + if (has_mbyte && (len = (size_t)(utf_head_off(line, ptr - 1))) > 0) ptr -= len + 1; else if (vim_isfilec(ptr[-1]) || ((options & FNAME_HYP) && path_is_url((char *)ptr - 1))) -- cgit From 30392b635689a5f25421c17ead79e521863c8b57 Mon Sep 17 00:00:00 2001 From: ZviRackover Date: Wed, 15 Aug 2018 22:46:48 +0300 Subject: Remove has_mbyte from lines near changes in parent commit --- src/nvim/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/window.c') diff --git a/src/nvim/window.c b/src/nvim/window.c index fa963d790d..07953212c5 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -5130,7 +5130,7 @@ file_name_in_line ( * Go one char back to ":" before "//" even when ':' is not in 'isfname'. */ while (ptr > line) { - if (has_mbyte && (len = (size_t)(utf_head_off(line, ptr - 1))) > 0) + if ((len = (size_t)(utf_head_off(line, ptr - 1))) > 0) ptr -= len + 1; else if (vim_isfilec(ptr[-1]) || ((options & FNAME_HYP) && path_is_url((char *)ptr - 1))) -- cgit From d110c6d7907d6f27f32b1d2bd91ffee7ef6097f4 Mon Sep 17 00:00:00 2001 From: ZviRackover Date: Thu, 16 Aug 2018 05:09:21 +0300 Subject: lint: cleanup after parent commits --- src/nvim/window.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/nvim/window.c') diff --git a/src/nvim/window.c b/src/nvim/window.c index 07953212c5..9515b88248 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -5130,13 +5130,14 @@ file_name_in_line ( * Go one char back to ":" before "//" even when ':' is not in 'isfname'. */ while (ptr > line) { - if ((len = (size_t)(utf_head_off(line, ptr - 1))) > 0) + if ((len = (size_t)(utf_head_off(line, ptr - 1))) > 0) { ptr -= len + 1; - else if (vim_isfilec(ptr[-1]) - || ((options & FNAME_HYP) && path_is_url((char *)ptr - 1))) - --ptr; - else + } else if (vim_isfilec(ptr[-1]) + || ((options & FNAME_HYP) && path_is_url((char *)ptr - 1))) { + ptr--; + } else { break; + } } /* -- cgit