From 733e1a0e7397a25f96f7d27983c69b883280c35e Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 23 Jul 2019 07:01:12 +0200
Subject: vim-patch:8.1.1737: :args command that outputs one line gives more
 prompt

Problem:    :args command that outputs one line gives more prompt.
Solution:   Only output line break if needed. (Daniel Hahler, closes vim/vim#4715)
https://github.com/vim/vim/commit/949f1989cba8bf7653316c2b1444c26f1536bfab

Closes https://github.com/neovim/neovim/pull/10147.
---
 src/nvim/version.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/nvim/version.c')

diff --git a/src/nvim/version.c b/src/nvim/version.c
index ee5a12feb0..28bd22dcb3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -2076,9 +2076,10 @@ void list_in_columns(char_u **items, int size, int current)
   // Sacrifice it to fit in one more column if possible.
   int ncol = (int)(Columns + 1) / width;
   int nrow = item_count / ncol + (item_count % ncol ? 1 : 0);
+  int cur_row = 1;
 
-  // i counts columns then rows.  idx counts rows then columns.
-  for (i = 0; !got_int && i < nrow * ncol; ++i) {
+  // "i" counts columns then rows.  "idx" counts rows then columns.
+  for (i = 0; !got_int && i < nrow * ncol; i++) {
     int idx = (i / ncol) + (i % ncol) * nrow;
     if (idx < item_count) {
       int last_col = (i + 1) % ncol == 0;
@@ -2090,18 +2091,15 @@ void list_in_columns(char_u **items, int size, int current)
         msg_putchar(']');
       }
       if (last_col) {
-        if (msg_col > 0) {
+        if (msg_col > 0 && cur_row < nrow) {
           msg_putchar('\n');
         }
+        cur_row++;
       } else {
         while (msg_col % width) {
           msg_putchar(' ');
         }
       }
-    } else {
-      if (msg_col > 0) {
-        msg_putchar('\n');
-      }
     }
   }
 }
-- 
cgit