mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-16 23:06:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #36126 vim-patch:8.2.{4851,4878},9.0.1427

Browse Source
This commit is contained in:
Justin M. Keyes
2025-10-11 15:54:36 -04:00
committed by GitHub
parent 28157738e3 69bed0431c
commit 8809c59ffd
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/eval/list.c
View File

@@ -235,7 +235,9 @@ static void filter_map_string(const char *str, filtermap_T filtermap, typval_T *
};
set_vim_var_nr(VV_KEY, idx);
typval_T newtv;
typval_T newtv = {
.v_type = VAR_UNKNOWN,
};
bool rem;
if (filter_map_one(&tv, expr, filtermap, &newtv, &rem) == FAIL
|| did_emsg) {

4
src/nvim/ex_session.c
View File

@@ -710,6 +710,7 @@ static int makeopens(FILE *fd, char *dirnow)
// Assume "tabpages" is in 'sessionoptions'. If not then we only do
// "curtab" and bail out of the loop.
bool restore_height_width = false;
FOR_ALL_TABS(tp) {
bool need_tabnext = false;
int cnr = 1;
@@ -810,6 +811,7 @@ static int makeopens(FILE *fd, char *dirnow)
"set winwidth=1\n") < 0) {
return FAIL;
}
restore_height_width = true;
}
if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL) {
return FAIL;
@@ -900,7 +902,7 @@ static int makeopens(FILE *fd, char *dirnow)
PUTLINE_FAIL("let &shortmess = s:shortmess_save");
}
if (tab_firstwin != NULL && tab_firstwin->w_next != NULL) {
if (restore_height_width) {
// Restore 'winminheight' and 'winminwidth'.
PUTLINE_FAIL("let &winminheight = s:save_winminheight");
PUTLINE_FAIL("let &winminwidth = s:save_winminwidth");

2
src/nvim/regexp.c
View File

@@ -15050,7 +15050,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm
int subidx;
int bytelen;
if (t->state->c <= NFA_BACKREF9) {
if (t->state->c >= NFA_BACKREF1 && t->state->c <= NFA_BACKREF9) {
subidx = t->state->c - NFA_BACKREF1 + 1;
result = match_backref(&t->subs.norm, subidx, &bytelen);
} else {