mirror of
				https://github.com/vim/vim.git
				synced 2025-10-30 09:47:20 -04:00 
			
		
		
		
	patch 9.0.0352: using :echowindow in a timer clears part of message
Problem: using :echowindow in a timer clears part of message Solution: Do not use msg_clr_eos().
This commit is contained in:
		| @@ -1443,7 +1443,7 @@ msg_start(void) | |||||||
|     } |     } | ||||||
|  |  | ||||||
| #ifdef FEAT_EVAL | #ifdef FEAT_EVAL | ||||||
|     if (need_clr_eos || in_echowindow) |     if (need_clr_eos) | ||||||
|     { |     { | ||||||
| 	// Halfway an ":echo" command and getting an (error) message: clear | 	// Halfway an ":echo" command and getting an (error) message: clear | ||||||
| 	// any text from the command. | 	// any text from the command. | ||||||
| @@ -3646,6 +3646,10 @@ msg_clr_eos(void) | |||||||
|     void |     void | ||||||
| msg_clr_eos_force(void) | msg_clr_eos_force(void) | ||||||
| { | { | ||||||
|  | #ifdef HAS_MESSAGE_WINDOW | ||||||
|  |     if (in_echowindow) | ||||||
|  | 	return;  // messages go into a popup | ||||||
|  | #endif | ||||||
|     if (msg_use_printf()) |     if (msg_use_printf()) | ||||||
|     { |     { | ||||||
| 	if (full_screen)	// only when termcap codes are valid | 	if (full_screen)	// only when termcap codes are valid | ||||||
|   | |||||||
| @@ -5,4 +5,4 @@ | |||||||
| |═+0#e000002&@74 | |═+0#e000002&@74 | ||||||
| |f|i|r|s|t| |l|i|n|e| @64 | |f|i|r|s|t| |l|i|n|e| @64 | ||||||
| |s|e|c|o|n|d| |l|i|n|e| @63 | |s|e|c|o|n|d| |l|i|n|e| @63 | ||||||
| | +0#0000000&@56|1|,|1| @10|A|l@1|  | |:+0#0000000&|c|a|l@1| |S|h|o|w|M|e|s@1|a|g|e|(|'|s|e|c|o|n|d| |l|i|n|e|'|)| @24|1|,|1| @10|A|l@1|  | ||||||
|   | |||||||
| @@ -5,4 +5,4 @@ | |||||||
| |l|i|n|e| |1|7| @67 | |l|i|n|e| |1|7| @67 | ||||||
| |l|i|n|e| |1|8| @67 | |l|i|n|e| |1|8| @67 | ||||||
| |l|i|n|e| |1|9| @67 | |l|i|n|e| |1|9| @67 | ||||||
| | +0#0000000&@56|1|,|1| @10|A|l@1|  | |:+0#0000000&|c|a|l@1| |M|a|n|y|M|e|s@1|a|g|e|s|(|)| @36|1|,|1| @10|A|l@1|  | ||||||
|   | |||||||
| @@ -707,6 +707,8 @@ static char *(features[]) = | |||||||
|  |  | ||||||
| static int included_patches[] = | static int included_patches[] = | ||||||
| {   /* Add new patch number below this line */ | {   /* Add new patch number below this line */ | ||||||
|  | /**/ | ||||||
|  |     352, | ||||||
| /**/ | /**/ | ||||||
|     351, |     351, | ||||||
| /**/ | /**/ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user