thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 9.1.0372: Calling CLEAR_FIELD() on the same struct twice

Browse Source 
Problem:  Calling CLEAR_FIELD() on the same struct twice.
Solution: Remove the second CLEAR_FIELD().  Move the assignment of
          cookie.sourceing_lnum (zeertzjq).

closes: #14627

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-04-25 21:34:10 +02:00 committed by Christian Brabandt
parent f6c1fb20e3
commit f68517c167
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/scriptfile.c
View File

@ -1273,7 +1273,7 @@ cmd_source(char_u *fname, exarg_T *eap)
emsg(_(e_argument_required));
else
// source ex commands from the current buffer
do_source_ext(NULL, FALSE, FALSE, NULL, eap, clearvars);
do_source_ext(NULL, FALSE, DOSO_NONE, NULL, eap, clearvars);
}
else if (eap != NULL && eap->forceit)
// ":source!": read Normal mode commands
@ -1424,8 +1424,6 @@ do_source_buffer_init(source_cookie_T *sp, exarg_T *eap)
char_u *line = NULL;
char_u *fname;
CLEAR_FIELD(*sp);
if (curbuf == NULL)
return NULL;
@ -1453,6 +1451,8 @@ do_source_buffer_init(source_cookie_T *sp, exarg_T *eap)
}
sp->buf_lnum = 0;
sp->source_from_buf = TRUE;
// When sourcing a range of lines from a buffer, use buffer line number.
sp->sourcing_lnum = eap->line1 - 1;
return fname;
@ -1641,13 +1641,6 @@ do_source_ext(
cookie.fileformat = EOL_UNKNOWN;
#endif
if (fname == NULL)
// When sourcing a range of lines from a buffer, use the buffer line
// number.
cookie.sourcing_lnum = eap->line1 - 1;
else
cookie.sourcing_lnum = 0;
#ifdef FEAT_EVAL
// Check if this script has a breakpoint.
cookie.breakpoint = dbg_find_breakpoint(TRUE, fname_exp, (linenr_T)0);

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
372,
/**/
371,
/**/