File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -2527,7 +2527,7 @@ terminal_loop(int blocking)
25272527 while (blocking || vpeekc_nomap () != NUL )
25282528 {
25292529#ifdef FEAT_GUI
2530- if (!curbuf -> b_term -> tl_system )
2530+ if (curbuf -> b_term != NULL && !curbuf -> b_term -> tl_system )
25312531#endif
25322532 // TODO: skip screen update when handling a sequence of keys.
25332533 // Repeat redrawing in case a message is received while redrawing.
@@ -2542,8 +2542,6 @@ terminal_loop(int blocking)
25422542 restore_cursor = TRUE;
25432543
25442544 raw_c = term_vgetc ();
2545- if (raw_c > 0 )
2546- ch_log (NULL , "terminal_loop() got %d" , raw_c );
25472545 if (!term_use_loop_check (TRUE) || in_terminal_loop != curbuf -> b_term )
25482546 {
25492547 // Job finished while waiting for a character. Push back the
Original file line number Diff line number Diff line change @@ -1225,6 +1225,18 @@ func Test_open_term_from_cmd()
12251225 call delete (' Xopenterm' )
12261226endfunc
12271227
1228+ func Test_terminal_popup_with_cmd ()
1229+ " this was crashing
1230+ let buf = term_start (&shell , #{hidden : v: true })
1231+ let s: winid = popup_create (buf , {})
1232+ tnoremap <F3> <Cmd> call popup_close(s:winid)<CR>
1233+ call feedkeys (" \<F3> " , ' xt' )
1234+
1235+ tunmap <F3>
1236+ exe ' bwipe! ' .. buf
1237+ unlet s: winid
1238+ endfunc
1239+
12281240func Check_dump01 (off )
12291241 call assert_equal (' one two three four five' , trim (getline (a: off + 1 )))
12301242 call assert_equal (' ~ Select Word' , trim (getline (a: off + 7 )))
Original file line number Diff line number Diff line change @@ -750,6 +750,8 @@ static char *(features[]) =
750750
751751static int included_patches [] =
752752{ /* Add new patch number below this line */
753+ /**/
754+ 1985 ,
753755/**/
754756 1984 ,
755757/**/
You can’t perform that action at this time.
0 commit comments