IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #9827 from justinmk/fix-warnings

Browse Source
This commit is contained in:
Justin M. Keyes 2019-04-01 21:59:21 +02:00 committed by GitHub
commit a011f8a321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/edit.c
View File

@ -667,8 +667,9 @@ static int insert_execute(VimState *state, int key)
// there is nothing to add, CTRL-L works like CTRL-P then. // there is nothing to add, CTRL-L works like CTRL-P then.
if (s->c == Ctrl_L if (s->c == Ctrl_L
&& (!CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode) && (!CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode)
|| (int)STRLEN(compl_shown_match->cp_str) || (compl_shown_match->cp_str != NULL
> curwin->w_cursor.col - compl_col)) { && (int)STRLEN(compl_shown_match->cp_str)
> curwin->w_cursor.col - compl_col))) {
ins_compl_addfrommatch(); ins_compl_addfrommatch();
return 1; // continue return 1; // continue
} }
@ -3005,7 +3006,6 @@ bool ins_compl_active(void)
// Get complete information // Get complete information
void get_complete_info(list_T *what_list, dict_T *retdict) void get_complete_info(list_T *what_list, dict_T *retdict)
{ {
int ret = OK;
#define CI_WHAT_MODE 0x01 #define CI_WHAT_MODE 0x01
#define CI_WHAT_PUM_VISIBLE 0x02 #define CI_WHAT_PUM_VISIBLE 0x02
#define CI_WHAT_ITEMS 0x04 #define CI_WHAT_ITEMS 0x04
@ -3037,7 +3037,8 @@ void get_complete_info(list_T *what_list, dict_T *retdict)
} }
} }
if (ret == OK && (what_flag & CI_WHAT_MODE)) { int ret = OK;
if (what_flag & CI_WHAT_MODE) {
ret = tv_dict_add_str(retdict, S_LEN("mode"), ret = tv_dict_add_str(retdict, S_LEN("mode"),
(char *)ins_compl_mode()); (char *)ins_compl_mode());
} }

21
src/nvim/window.c
View File

@ -2575,15 +2575,12 @@ void win_close_othertab(win_T *win, int free_buf, tabpage_T *tp)
free_tabpage(tp); free_tabpage(tp);
} }
/* // Free the memory used for a window.
* Free the memory used for a window. // Returns a pointer to the window that got the freed up space.
* Returns a pointer to the window that got the freed up space. static win_T *win_free_mem(
*/
static win_T *
win_free_mem (
win_T *win, win_T *win,
int *dirp, /* set to 'v' or 'h' for direction if 'ea' */ int *dirp, // set to 'v' or 'h' for direction if 'ea'
tabpage_T *tp /* tab page "win" is in, NULL for current */ tabpage_T *tp // tab page "win" is in, NULL for current
) )
{ {
frame_T *frp; frame_T *frp;
@ -2595,6 +2592,7 @@ win_free_mem (
wp = winframe_remove(win, dirp, tp); wp = winframe_remove(win, dirp, tp);
xfree(frp); xfree(frp);
} else { } else {
*dirp = 'h'; // Dummy value.
if (win_valid(prevwin) && prevwin != win) { if (win_valid(prevwin) && prevwin != win) {
wp = prevwin; wp = prevwin;
} else { } else {
@ -2603,10 +2601,11 @@ win_free_mem (
} }
win_free(win, tp); win_free(win, tp);
/* When deleting the current window of another tab page select a new // When deleting the current window of another tab page select a new
* current window. */ // current window.
if (tp != NULL && win == tp->tp_curwin) if (tp != NULL && win == tp->tp_curwin) {
tp->tp_curwin = wp; tp->tp_curwin = wp;
}
return wp; return wp;
} }