kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 13:15:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1479: small source file problems; outdated list of distrib. files (#23272)

Browse Source 
Problem:    Small source file problems; outdated list of distributed files.
Solution:   Small updates to source files and list of distributed files.

f39d9e9dca

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2023-04-23 08:12:44 +08:00 committed by GitHub
parent 540d6c595b
commit 431b152726
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/cmdexpand.c
View File

@ -1328,8 +1328,8 @@ char *addstar(char *fname, size_t len, int context)
/// EXPAND_FILES After command with EX_XFILE set, or after setting /// EXPAND_FILES After command with EX_XFILE set, or after setting
/// with P_EXPAND set. eg :e ^I, :w>>^I /// with P_EXPAND set. eg :e ^I, :w>>^I
/// EXPAND_DIRECTORIES In some cases this is used instead of the latter /// EXPAND_DIRECTORIES In some cases this is used instead of the latter
/// when we know only directories are of interest. eg /// when we know only directories are of interest.
/// :set dir=^I /// E.g. :set dir=^I and :cd ^I
/// EXPAND_SHELLCMD After ":!cmd", ":r !cmd" or ":w !cmd". /// EXPAND_SHELLCMD After ":!cmd", ":r !cmd" or ":w !cmd".
/// EXPAND_SETTINGS Complete variable names. eg :set d^I /// EXPAND_SETTINGS Complete variable names. eg :set d^I
/// EXPAND_BOOL_SETTINGS Complete boolean variables only, eg :set no^I /// EXPAND_BOOL_SETTINGS Complete boolean variables only, eg :set no^I

2
src/nvim/getchar.c
View File

@ -161,7 +161,7 @@ static char *get_buffcont(buffheader_T *buffer, int dozero)
count += strlen(bp->b_str); count += strlen(bp->b_str);
} }
if (count || dozero) { if (count > 0 || dozero) {
p = xmalloc(count + 1); p = xmalloc(count + 1);
char *p2 = p; char *p2 = p;
for (const buffblock_T *bp = buffer->bh_first.b_next; for (const buffblock_T *bp = buffer->bh_first.b_next;

7
src/nvim/insexpand.c
View File

@ -2651,7 +2651,7 @@ static void ins_compl_update_sequence_numbers(void)
compl_T *match; compl_T *match;
if (compl_dir_forward()) { if (compl_dir_forward()) {
// search backwards for the first valid (!= -1) number. // Search backwards for the first valid (!= -1) number.
// This should normally succeed already at the first loop // This should normally succeed already at the first loop
// cycle, so it's fast! // cycle, so it's fast!
for (match = compl_curr_match->cp_prev; for (match = compl_curr_match->cp_prev;
@ -2671,7 +2671,7 @@ static void ins_compl_update_sequence_numbers(void)
} }
} else { // BACKWARD } else { // BACKWARD
assert(compl_direction == BACKWARD); assert(compl_direction == BACKWARD);
// search forwards (upwards) for the first valid (!= -1) // Search forwards (upwards) for the first valid (!= -1)
// number. This should normally succeed already at the // number. This should normally succeed already at the
// first loop cycle, so it's fast! // first loop cycle, so it's fast!
for (match = compl_curr_match->cp_next; for (match = compl_curr_match->cp_next;
@ -2682,8 +2682,7 @@ static void ins_compl_update_sequence_numbers(void)
} }
} }
if (match != NULL) { if (match != NULL) {
// go down and assign all numbers which are not // go down and assign all numbers which are not assigned yet
// assigned yet
for (match = match->cp_prev; for (match = match->cp_prev;
match && match->cp_number == -1; match && match->cp_number == -1;
match = match->cp_prev) { match = match->cp_prev) {

7
src/nvim/menu.c
View File

@ -1450,7 +1450,8 @@ void show_popupmenu(void)
/// Execute "menu". Use by ":emenu" and the window toolbar. /// Execute "menu". Use by ":emenu" and the window toolbar.
/// @param eap NULL for the window toolbar. /// @param eap NULL for the window toolbar.
/// @param mode_idx specify a MENU_INDEX_ value, use -1 to depend on the current state /// @param mode_idx specify a MENU_INDEX_ value,
/// use MENU_INDEX_INVALID to depend on the current state
void execute_menu(const exarg_T *eap, vimmenu_T *menu, int mode_idx) void execute_menu(const exarg_T *eap, vimmenu_T *menu, int mode_idx)
FUNC_ATTR_NONNULL_ARG(2) FUNC_ATTR_NONNULL_ARG(2)
{ {
@ -1458,7 +1459,7 @@ void execute_menu(const exarg_T *eap, vimmenu_T *menu, int mode_idx)
if (idx < 0) { if (idx < 0) {
// Use the Insert mode entry when returning to Insert mode. // Use the Insert mode entry when returning to Insert mode.
if (((State & MODE_INSERT) || restart_edit) && !current_sctx.sc_sid) { if (((State & MODE_INSERT) || restart_edit) && current_sctx.sc_sid == 0) {
idx = MENU_INDEX_INSERT; idx = MENU_INDEX_INSERT;
} else if (State & MODE_CMDLINE) { } else if (State & MODE_CMDLINE) {
idx = MENU_INDEX_CMDLINE; idx = MENU_INDEX_CMDLINE;
@ -1612,7 +1613,7 @@ static vimmenu_T *menu_getbyname(char *name_arg)
void ex_emenu(exarg_T *eap) void ex_emenu(exarg_T *eap)
{ {
char *arg = eap->arg; char *arg = eap->arg;
int mode_idx = -1; int mode_idx = MENU_INDEX_INVALID;
if (arg[0] && ascii_iswhite(arg[1])) { if (arg[0] && ascii_iswhite(arg[1])) {
switch (arg[0]) { switch (arg[0]) {