aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.1844: using "q" at the more prompt doesn't stop a long message

Browse Source 
Problem:    Using "q" at the more prompt doesn't stop a long message.
Solution:   Check for "got_int". (closes #7122)
This commit is contained in:
Bram Moolenaar
2020-10-13 22:15:56 +02:00
parent b9616af23f
commit 3d30af8783
4 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/message.c
View File

@@ -1551,6 +1551,10 @@ msg_outtrans_len_attr(char_u *msgstr, int len, int attr)
char_u *s;
int mb_l;
int c;
int save_got_int = got_int;
// Only quit when got_int was set in here.
got_int = FALSE;
// if MSG_HIST flag set, add message to history
if (attr & MSG_HIST)
@@ -1568,7 +1572,7 @@ msg_outtrans_len_attr(char_u *msgstr, int len, int attr)
* Go over the string. Special characters are translated and printed.
* Normal characters are printed several at a time.
*/
while (--len >= 0)
while (--len >= 0 && !got_int)
{
if (enc_utf8)
// Don't include composing chars after the end.
@@ -1618,10 +1622,12 @@ msg_outtrans_len_attr(char_u *msgstr, int len, int attr)
}
}
if (str > plain_start)
if (str > plain_start && !got_int)
// print the printable chars at the end
msg_puts_attr_len((char *)plain_start, (int)(str - plain_start), attr);
got_int |= save_got_int;
return retval;
}