# HG changeset patch # User Christian Brabandt # Date 1537527606 -7200 # Node ID 3d0b6e2a3a01f4a5bdb039b9b7618fb37c1057ae # Parent e3a92ebfcba388e600336d3edfba324d48a9b743 patch 8.1.0416: sort doesn't report deleted lines commit https://github.com/vim/vim/commit/b0e982bf05feb27eddb5f809b052c1137f4d4add Author: Bram Moolenaar Date: Fri Sep 21 12:46:22 2018 +0200 patch 8.1.0416: sort doesn't report deleted lines Problem: Sort doesn't report deleted lines. Solution: Call msgmore(). (Christian Brabandt, closes https://github.com/vim/vim/issues/3454) diff --git a/src/ex_cmds.c b/src/ex_cmds.c --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -649,7 +649,10 @@ ex_sort(exarg_T *eap) /* Adjust marks for deleted (or added) lines and prepare for displaying. */ deleted = (long)(count - (lnum - eap->line2)); if (deleted > 0) + { mark_adjust(eap->line2 - deleted, eap->line2, (long)MAXLNUM, -deleted); + msgmore(-deleted); + } else if (deleted < 0) mark_adjust(eap->line2, MAXLNUM, -deleted, 0L); diff --git a/src/testdir/test_sort.vim b/src/testdir/test_sort.vim --- a/src/testdir/test_sort.vim +++ b/src/testdir/test_sort.vim @@ -1221,3 +1221,33 @@ func Test_sort_cmd() enew! endfunc + +func Test_sort_cmd_report() + enew! + call append(0, repeat([1], 3) + repeat([2], 3) + repeat([3], 3)) + $delete _ + setlocal nomodified + let res = execute('%sort u') + + call assert_equal([1,2,3], map(getline(1, '$'), 'v:val+0')) + call assert_match("6 fewer lines", res) + enew! + call append(0, repeat([1], 3) + repeat([2], 3) + repeat([3], 3)) + $delete _ + setlocal nomodified report=10 + let res = execute('%sort u') + + call assert_equal([1,2,3], map(getline(1, '$'), 'v:val+0')) + call assert_equal("", res) + enew! + call append(0, repeat([1], 3) + repeat([2], 3) + repeat([3], 3)) + $delete _ + setl report&vim + setlocal nomodified + let res = execute('1g/^/%sort u') + + call assert_equal([1,2,3], map(getline(1, '$'), 'v:val+0')) + " the output comes from the :g command, not from the :sort + call assert_match("6 fewer lines", res) + enew! + endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 416, +/**/ 415, /**/ 414,