Mercurial > vim

comparison src/ex_docmd.c @ 20474:3fe45aa3bbc5 v8.2.0791

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0791: a second popup window with terminal causes trouble Commit: https://github.com/vim/vim/commit/b5383b174b2436b556f76f14badb1c1f55d6d8f6 Author: Bram Moolenaar <Bram@vim.org> Date: Mon May 18 19:46:48 2020 +0200 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 https://github.com/vim/vim/issues/6101, closes #6103) Avoid defaulting to an invalid line number.
author Bram Moolenaar <Bram@vim.org>
date Mon, 18 May 2020 20:00:03 +0200
parents 2135b4641680
children 489cb75c76b6
comparison
equal deleted inserted replaced
20473:992024e2f885 20474:3fe45aa3bbc5
2916 eap->line1 = eap->line2; 2916 eap->line1 = eap->line2;
2917 switch (eap->addr_type) 2917 switch (eap->addr_type)
2918 { 2918 {
2919 case ADDR_LINES: 2919 case ADDR_LINES:
2920 case ADDR_OTHER: 2920 case ADDR_OTHER:
2921 // default is current line number 2921 // Default is the cursor line number. Avoid using an invalid
2922 eap->line2 = curwin->w_cursor.lnum; 2922 // line number though.
2923 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count)
2924 eap->line2 = curbuf->b_ml.ml_line_count;
2925 else
2926 eap->line2 = curwin->w_cursor.lnum;
2923 break; 2927 break;
2924 case ADDR_WINDOWS: 2928 case ADDR_WINDOWS:
2925 eap->line2 = CURRENT_WIN_NR; 2929 eap->line2 = CURRENT_WIN_NR;
2926 break; 2930 break;
2927 case ADDR_ARGUMENTS: 2931 case ADDR_ARGUMENTS: