aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/charset.c
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2017-07-10 08:10:15 +0800
committerckelsel <ckelsel@hotmail.com>2017-07-10 08:10:15 +0800
commit465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77 (patch)
treeedae38568202ba41dee4a49f78884da313fd114b /src/nvim/charset.c
parent1514cdc7d8863eeee6b04883b1c50aac40048b49 (diff)
parent6725667d31591e8025589c4c1df34469f3bfdb52 (diff)
downloadrneovim-465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77.tar.gz
rneovim-465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77.tar.bz2
rneovim-465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/charset.c')
-rw-r--r--src/nvim/charset.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/charset.c b/src/nvim/charset.c
index 48db1030a6..403ef65c4f 100644
--- a/src/nvim/charset.c
+++ b/src/nvim/charset.c
@@ -981,10 +981,8 @@ int win_lbr_chartabsize(win_T *wp, char_u *line, char_u *s, colnr_T col, int *he
mb_ptr_adv(s);
c = *s;
- if (!((c != NUL)
- && (vim_isbreak(c)
- || (!vim_isbreak(c)
- && ((col2 == col) || !vim_isbreak(*ps)))))) {
+ if (!(c != NUL
+ && (vim_isbreak(c) || col2 == col || !vim_isbreak(*ps)))) {
break;
}