From 2c6553498e790604f50016d8435403523a2576d6 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 23 Feb 2021 19:32:03 +0100 Subject: [PATCH] patch 8.2.2547: "%" command not accurate for big files MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Problem: "%" command not accurate for big files. Solution: Make it more accurate for files up to 21M lines. (Dominique Pellé, closes #7889) --- src/normal.c | 8 +++++--- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/normal.c b/src/normal.c index 9fbfadfbc..d2f41593a 100644 --- a/src/normal.c +++ b/src/normal.c @@ -4769,9 +4769,11 @@ nv_percent(cmdarg_T *cap) { cap->oap->motion_type = MLINE; setpcmark(); - // Round up, so CTRL-G will give same value. Watch out for a - // large line count, the line number must not go negative! - if (curbuf->b_ml.ml_line_count > 1000000) + // Round up, so 'normal 100%' always jumps at the line line. + // Beyond 21474836 lines, (ml_line_count * 100 + 99) would + // overflow on 32-bits, so use a formula with less accuracy + // to avoid overflows. + if (curbuf->b_ml.ml_line_count >= 21474836) curwin->w_cursor.lnum = (curbuf->b_ml.ml_line_count + 99L) / 100L * cap->count0; else diff --git a/src/version.c b/src/version.c index c63e60c3d..7eb0d057a 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2547, /**/ 2546, /**/ -- 2.40.0