diff options
| -rw-r--r-- | .ci/api-python.sh | 2 | ||||
| -rw-r--r-- | .ci/clang-asan.sh | 2 | ||||
| -rw-r--r-- | .ci/common.sh | 2 | ||||
| -rw-r--r-- | .ci/gcc-unittest.sh | 2 | ||||
| -rw-r--r-- | src/nvim/indent_c.c | 10 | ||||
| -rw-r--r-- | src/nvim/screen.c | 5 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 | ||||
| -rw-r--r-- | src/nvim/window.c | 6 |
8 files changed, 19 insertions, 14 deletions
diff --git a/.ci/api-python.sh b/.ci/api-python.sh index 556361cb96..a3e9b652a6 100644 --- a/.ci/api-python.sh +++ b/.ci/api-python.sh @@ -1,6 +1,6 @@ . "$CI_SCRIPTS/common.sh" -set_environment /opt/neovim-deps +set_environment /opt/neovim-deps/64 sudo apt-get install expect valgrind diff --git a/.ci/clang-asan.sh b/.ci/clang-asan.sh index 3217f754d6..4b5ff26d0d 100644 --- a/.ci/clang-asan.sh +++ b/.ci/clang-asan.sh @@ -2,7 +2,7 @@ install_vroom -set_environment /opt/neovim-deps +set_environment /opt/neovim-deps/64 sudo pip install cpp-coveralls diff --git a/.ci/common.sh b/.ci/common.sh index a31b3063e9..09a6e24b9d 100644 --- a/.ci/common.sh +++ b/.ci/common.sh @@ -48,7 +48,7 @@ asan_check() { } set_environment() { - local prefix="$1" + local prefix="$1/usr" eval $($prefix/bin/luarocks path) export PATH="$prefix/bin:$PATH" export PKG_CONFIG_PATH="$prefix/lib/pkgconfig" diff --git a/.ci/gcc-unittest.sh b/.ci/gcc-unittest.sh index bd54d52253..95925ddbc9 100644 --- a/.ci/gcc-unittest.sh +++ b/.ci/gcc-unittest.sh @@ -1,6 +1,6 @@ . "$CI_SCRIPTS/common.sh" -set_environment /opt/neovim-deps +set_environment /opt/neovim-deps/64 sudo pip install cpp-coveralls diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c index 6e12194b63..509f94dbf2 100644 --- a/src/nvim/indent_c.c +++ b/src/nvim/indent_c.c @@ -2009,12 +2009,14 @@ int get_c_indent(void) * ldfd) { * } */ - if (curbuf->b_ind_js || (curbuf->b_ind_keep_case_label - && cin_iscase(skipwhite(get_cursor_line_ptr()), - FALSE))) + if ((curbuf->b_ind_js || curbuf->b_ind_keep_case_label) + && cin_iscase(skipwhite(get_cursor_line_ptr()), FALSE)) { amount = get_indent(); - else + } else if (curbuf->b_ind_js) { + amount = get_indent_lnum(lnum); + } else { amount = skip_label(lnum, &l); + } start_brace = BRACE_AT_END; } diff --git a/src/nvim/screen.c b/src/nvim/screen.c index a84d3490f0..29e5af5cee 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -1356,8 +1356,9 @@ static void win_update(win_T *wp) (foldmethodIsSyntax(wp) && hasAnyFolding(wp)) || syntax_check_changed(lnum))) - /* match in fixed position might need redraw */ - || wp->w_match_head != NULL + // match in fixed position might need redraw + // if lines were inserted or deleted + || (wp->w_match_head != NULL && buf->b_mod_xlines != 0) ))))) { if (lnum == mod_top) top_to_mod = FALSE; diff --git a/src/nvim/version.c b/src/nvim/version.c index 7143be48c7..dfcf086e87 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -246,8 +246,8 @@ static int included_patches[] = { 352, //351, //350, - //349, - //348, + 349, + 348, //347, 346, 345, diff --git a/src/nvim/window.c b/src/nvim/window.c index 0693e50bda..b9714ce690 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -5323,12 +5323,13 @@ int match_add(win_T *wp, char_u *grp, char_u *pat, int prio, int id, list_T *pos wp->w_buffer->b_mod_bot = botlnum; } } else { + wp->w_buffer->b_mod_set = TRUE; wp->w_buffer->b_mod_top = toplnum; wp->w_buffer->b_mod_bot = botlnum; + wp->w_buffer->b_mod_xlines = 0; } m->pos.toplnum = toplnum; m->pos.botlnum = botlnum; - wp->w_buffer->b_mod_set = TRUE; rtype = VALID; } } @@ -5396,10 +5397,11 @@ int match_delete(win_T *wp, int id, int perr) wp->w_buffer->b_mod_bot = cur->pos.botlnum; } } else { + wp->w_buffer->b_mod_set = TRUE; wp->w_buffer->b_mod_top = cur->pos.toplnum; wp->w_buffer->b_mod_bot = cur->pos.botlnum; + wp->w_buffer->b_mod_xlines = 0; } - wp->w_buffer->b_mod_set = TRUE; rtype = VALID; } free(cur); |