kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-21 03:35:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8793 from janlazo/vim-8.0.0837

Browse Source
This commit is contained in:
Justin M. Keyes 2018-07-29 01:32:39 +02:00 committed by GitHub
commit 8951304c10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/file_search.c
View File

@ -1221,18 +1221,19 @@ static ff_stack_T *ff_pop(ff_search_ctx_T *search_ctx)
/* /*
* free the given stack element * free the given stack element
*/ */
static void ff_free_stack_element(ff_stack_T *stack_ptr) static void ff_free_stack_element(ff_stack_T *const stack_ptr)
{ {
if (stack_ptr == NULL) { if (stack_ptr == NULL) {
return; return;
} }
/* free handles possible NULL pointers */ // free handles possible NULL pointers
xfree(stack_ptr->ffs_fix_path); xfree(stack_ptr->ffs_fix_path);
xfree(stack_ptr->ffs_wc_path); xfree(stack_ptr->ffs_wc_path);
if (stack_ptr->ffs_filearray != NULL) if (stack_ptr->ffs_filearray != NULL) {
FreeWild(stack_ptr->ffs_filearray_size, stack_ptr->ffs_filearray); FreeWild(stack_ptr->ffs_filearray_size, stack_ptr->ffs_filearray);
}
xfree(stack_ptr); xfree(stack_ptr);
} }

75
src/nvim/screen.c
View File

@ -543,52 +543,57 @@ static void update_finish(void)
updating_screen = FALSE; updating_screen = FALSE;
} }
void update_debug_sign(buf_T *buf, linenr_T lnum) void update_debug_sign(const buf_T *const buf, const linenr_T lnum)
{ {
int doit = FALSE; bool doit = false;
win_foldinfo.fi_level = 0; win_foldinfo.fi_level = 0;
/* update/delete a specific mark */ // update/delete a specific mark
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) { FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
if (buf != NULL && lnum > 0) { if (buf != NULL && lnum > 0) {
if (wp->w_buffer == buf && lnum >= wp->w_topline if (wp->w_buffer == buf && lnum >= wp->w_topline
&& lnum < wp->w_botline) { && lnum < wp->w_botline) {
if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) { if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) {
wp->w_redraw_top = lnum; wp->w_redraw_top = lnum;
} }
if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) { if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) {
wp->w_redraw_bot = lnum; wp->w_redraw_bot = lnum;
}
redraw_win_later(wp, VALID);
} }
} else {
redraw_win_later(wp, VALID); redraw_win_later(wp, VALID);
} }
if (wp->w_redr_type != 0) { } else {
doit = TRUE; redraw_win_later(wp, VALID);
}
} }
if (wp->w_redr_type != 0) {
/* Return when there is nothing to do, screen updating is already doit = true;
* happening (recursive call) or still starting up. */
if (!doit || updating_screen || starting) {
return;
} }
}
/* update all windows that need updating */ // Return when there is nothing to do, screen updating is already
update_prepare(); // happening (recursive call), messages on the screen or still starting up.
if (!doit
|| updating_screen
|| State == ASKMORE
|| State == HITRETURN
|| msg_scrolled
|| starting) {
return;
}
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) { // update all windows that need updating
if (wp->w_redr_type != 0) { update_prepare();
update_window_hl(wp, wp->w_redr_type >= NOT_VALID);
win_update(wp); FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
} if (wp->w_redr_type != 0) {
if (wp->w_redr_status) { update_window_hl(wp, wp->w_redr_type >= NOT_VALID);
win_redr_status(wp); win_update(wp);
}
} }
if (wp->w_redr_status) {
win_redr_status(wp);
}
}
update_finish(); update_finish();
} }
/* /*