Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
patch 8.1.0224: hang in bracketed paste mode when t_PE not encountered
Problem: Hang in bracketed paste mode when t_PE not encountered.
Solution: Break out of the loop when got_int is set. (suggested by Christian
Brabandt, closes #3146 )
Loading branch information
Showing
2 changed files
with
18 additions
and
7 deletions .
+16
−7
src/edit.c
+2
−0
src/version.c
@@ -9685,22 +9685,31 @@ bracketed_paste(paste_mode_T mode, int drop, garray_T *gap)
int ret_char = -1 ;
int save_allow_keys = allow_keys;
int save_paste = p_paste;
int save_ai = curbuf->b_p_ai ;
/* If the end code is too long we can't detect it, read everything. */
if (STRLEN (end) >= NUMBUFLEN)
end = NULL ;
++no_mapping;
allow_keys = 0 ;
p_paste = TRUE ;
curbuf->b_p_ai = FALSE ;
if (!p_paste)
// Also have the side effects of setting 'paste' to make it work much
// faster.
set_option_value ((char_u *)" paste" , TRUE , NULL , 0 );
for (;;)
{
/* When the end is not defined read everything. */
// When the end is not defined read everything there is.
if (end == NULL && vpeekc () == NUL)
break ;
c = plain_vgetc ();
do
{
c = vgetc ();
} while (c == K_IGNORE || c == K_VER_SCROLLBAR || c == K_HOR_SCROLLBAR);
if (c == NUL || got_int)
// When CTRL-C was encountered the typeahead will be flushed and we
// won't get the end sequence.
break ;
#ifdef FEAT_MBYTE
if (has_mbyte)
idx += (*mb_char2bytes)(c, buf + idx);
@@ -9763,8 +9772,8 @@ bracketed_paste(paste_mode_T mode, int drop, garray_T *gap)
--no_mapping;
allow_keys = save_allow_keys;
p_paste = save_paste;
curbuf-> b_p_ai = save_ai ;
if (! save_paste)
set_option_value ((char_u *) " paste " , FALSE , NULL , 0 ) ;
return ret_char;
}
@@ -798,6 +798,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/* */
224 ,
/* */
223 ,
/* */
Toggle all file notes
Toggle all file annotations