From 689e0daa95fc870e49f3eb2f23cd6a76c392ff7d Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 2 Mar 2017 00:09:12 +0100
Subject: vim-patch:8.0.0136

Problem:    When using indent folding and changing indent the wrong fold is
            opened. (Jonathan Fudger)
Solution:   Open the fold under the cursor a bit later. (Christian Brabandt)

https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
---
 src/nvim/ops.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 8bfda3c193..530193bd41 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -210,8 +210,6 @@ void op_shift(oparg_T *oap, int curs_top, int amount)
   }
 
   changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L);
-  /* The cursor line is not in a closed fold */
-  foldOpenCursor();
 
   if (oap->motion_type == kMTBlockWise) {
     curwin->w_cursor.lnum = oap->start.lnum;
@@ -222,6 +220,9 @@ void op_shift(oparg_T *oap, int curs_top, int amount)
   } else
     --curwin->w_cursor.lnum;            /* put cursor on last line, for ":>" */
 
+  // The cursor line is not in a closed fold
+  foldOpenCursor();
+
   if (oap->line_count > p_report) {
     if (oap->op_type == OP_RSHIFT)
       s = (char_u *)">";
-- 
cgit