vim-patch:8.2.0791: a second popup window with terminal causes trouble

Problem:    A second popup window with terminal causes trouble.
Solution:   Disallow opening a second terminal-popup window. (closes vim/vim#6101,
            closes vim/vim#6103) Avoid defaulting to an invalid line number.
b5383b174b

This is the only applicable hunk.
This commit is contained in:
zeertzjq 2022-04-17 09:44:47 +08:00
parent 813ecdac79
commit 2116ff47ea

View File

@ -2373,8 +2373,13 @@ int parse_cmd_address(exarg_T *eap, char **errormsg, bool silent)
switch (eap->addr_type) { switch (eap->addr_type) {
case ADDR_LINES: case ADDR_LINES:
case ADDR_OTHER: case ADDR_OTHER:
// default is current line number // Default is the cursor line number. Avoid using an invalid
eap->line2 = curwin->w_cursor.lnum; // line number though.
if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) {
eap->line2 = curbuf->b_ml.ml_line_count;
} else {
eap->line2 = curwin->w_cursor.lnum;
}
break; break;
case ADDR_WINDOWS: case ADDR_WINDOWS:
eap->line2 = CURRENT_WIN_NR; eap->line2 = CURRENT_WIN_NR;