mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 22:48:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(ex_cd): add an early return to fix clint warning

Browse Source 
The popupmenu.c change is unrelated.
This commit is contained in:
zeertzjq
2022-09-05 22:10:14 +08:00
parent fc7a64291a
commit f6a8d395a7
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/nvim/ex_docmd.c
View File

@@ -5544,27 +5544,26 @@ void ex_cd(exarg_T *eap)
// for non-UNIX ":cd" means: print current directory unless 'cdhome' is set // for non-UNIX ":cd" means: print current directory unless 'cdhome' is set
if (*new_dir == NUL && !p_cdh) { if (*new_dir == NUL && !p_cdh) {
ex_pwd(NULL); ex_pwd(NULL);
} else return;
}
#endif #endif
{ CdScope scope = kCdScopeGlobal;
CdScope scope = kCdScopeGlobal; switch (eap->cmdidx) {
switch (eap->cmdidx) { case CMD_tcd:
case CMD_tcd: case CMD_tchdir:
case CMD_tchdir: scope = kCdScopeTabpage;
scope = kCdScopeTabpage; break;
break; case CMD_lcd:
case CMD_lcd: case CMD_lchdir:
case CMD_lchdir: scope = kCdScopeWindow;
scope = kCdScopeWindow; break;
break; default:
default: break;
break; }
} if (changedir_func(new_dir, scope)) {
if (changedir_func(new_dir, scope)) { // Echo the new current directory if the command was typed.
// Echo the new current directory if the command was typed. if (KeyTyped || p_verbose >= 5) {
if (KeyTyped || p_verbose >= 5) { ex_pwd(eap);
ex_pwd(eap);
}
} }
} }
} }

6
src/nvim/popupmenu.c
View File

@@ -1042,14 +1042,14 @@ void pum_show_popupmenu(vimmenu_T *menu)
pum_scrollbar = 0; pum_scrollbar = 0;
pum_height = pum_size; pum_height = pum_size;
pum_position_at_mouse(20); pum_position_at_mouse(20);
pum_selected = -1;
pum_first = 0;
if (!p_mousemev) { if (!p_mousemev) {
// Pretend 'mousemoveevent' is set. // Pretend 'mousemoveevent' is set.
ui_call_option_set(STATIC_CSTR_AS_STRING("mousemoveevent"), BOOLEAN_OBJ(true)); ui_call_option_set(STATIC_CSTR_AS_STRING("mousemoveevent"), BOOLEAN_OBJ(true));
} }
pum_selected = -1;
pum_first = 0;
for (;;) { for (;;) {
pum_is_visible = true; pum_is_visible = true;
pum_is_drawn = true; pum_is_drawn = true;