File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -4506,19 +4506,23 @@ findswapname(
45064506#endif
45074507 {
45084508#ifdef FEAT_GUI
4509- /* If we are supposed to start the GUI but it wasn't
4510- * completely started yet, start it now. This makes
4511- * the messages displayed in the Vim window when
4512- * loading a session from the .gvimrc file. */
4509+ // If we are supposed to start the GUI but it wasn't
4510+ // completely started yet, start it now. This makes
4511+ // the messages displayed in the Vim window when
4512+ // loading a session from the .gvimrc file.
45134513 if (gui .starting && !gui .in_use )
45144514 gui_start ();
45154515#endif
4516- /* Show info about the existing swap file. */
4516+ // Show info about the existing swap file.
45174517 attention_message (buf , fname );
45184518
4519- /* We don't want a 'q' typed at the more-prompt
4520- * interrupt loading a file. */
4519+ // We don't want a 'q' typed at the more-prompt
4520+ // interrupt loading a file.
45214521 got_int = FALSE;
4522+
4523+ // If vimrc has "simalt ~x" we don't want it to
4524+ // interfere with the prompt here.
4525+ flush_buffers (TRUE);
45224526 }
45234527
45244528#if defined(FEAT_GUI_DIALOG ) || defined(FEAT_CON_DIALOG )
Original file line number Diff line number Diff line change @@ -792,6 +792,8 @@ static char *(features[]) =
792792
793793static int included_patches [] =
794794{ /* Add new patch number below this line */
795+ /**/
796+ 463 ,
795797/**/
796798 462 ,
797799/**/
You can’t perform that action at this time.
0 commit comments