vim-patch:7.4.646 #2926

Problem:    ":bufdo" may start at a deleted buffer.
Solution:   Find the first not deleted buffer. (Shane Harper)

https://github.com/vim/vim/commit/v7-4-646

1 files changed, 17 insertions, 7 deletions

diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index d9a8dc2d69..d610aa6d19 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -1862,20 +1862,30 @@ void ex_listdo(exarg_T *eap)
       case CMD_argdo:
         i = eap->line1 - 1;
         break;
-      case CMD_bufdo:
-        i = eap->line1;
-        break;
       default:
         break;
     }
+    buf_T *buf = curbuf;
     /* set pcmark now */
-    if (eap->cmdidx == CMD_bufdo)
-      goto_buffer(eap, DOBUF_FIRST, FORWARD, i);
-    else
+    if (eap->cmdidx == CMD_bufdo) {
+      /* Advance to the first listed buffer after "eap->line1". */
+      for (buf = firstbuf;
+           buf != NULL && (buf->b_fnum < eap->line1 || !buf->b_p_bl);
+           buf = buf->b_next) {
+        if (buf->b_fnum > eap->line2) {
+          buf = NULL;
+          break;
+        }
+      }
+      if (buf != NULL) {
+        goto_buffer(eap, DOBUF_FIRST, FORWARD, buf->b_fnum);
+      }
+    } else {
       setpcmark();
+    }
     listcmd_busy = TRUE;            /* avoids setting pcmark below */
 
-    while (!got_int) {
+    while (!got_int && buf != NULL) {
       if (eap->cmdidx == CMD_argdo) {
         /* go to argument "i" */
         if (i == ARGCOUNT)