From 8160a0e04244d054c4555a5a1af09963470964a1 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 3 Aug 2017 09:31:05 +0200
Subject: [PATCH] Revert "vim-patch:8.0.0133 (#7107)"

This reverts commit eb40b7ec404e8651137513ced43d503bc6656f17.

The change caused this error on QuickBuild:

    INFO  - # test/functional/core/job_spec.lua @ 668: pty process teardown does not prevent/delay exit. #4798 #4900
    INFO  - not ok 321 - pty process teardown does not prevent/delay exit. #4798 #4900
    INFO  - # test/functional/core/job_spec.lua @ 668
    INFO  - # Failure message: ./test/functional/ui/screen.lua:302: Row 1 did not match.
    INFO  - # Expected:
    INFO  - # |* |
    INFO  - # |[Process exited 0] |
    INFO  - # | |
    INFO  - # | |
    INFO  - # | |
    INFO  - # |-- TERMINAL -- |
    INFO  - # Actual:
    INFO  - # |*E575: Error while reading ShaD|
    INFO  - # |a file: mark entry at position|
    INFO  - # | 92 has invalid line number |
    INFO  - # |Press ENTER or type command to|
    INFO  - # | continue |
    INFO  - # |-- TERMINAL -- |
    INFO  - #
    INFO  - # To print the expect() call that would assert the current screen state, use
    INFO  - # screen:snaphot_util(). In case of non-deterministic failures, use
    INFO  - # screen:redraw_debug() to show all intermediate screen states.
    INFO  - # stack traceback:
    INFO  - #     ./test/functional/ui/screen.lua:302: in function 'wait'
    INFO  - #     ./test/functional/ui/screen.lua:216: in function 'expect'
    INFO  - #     test/functional/core/job_spec.lua:677: in function <test/functional/core/job_spec.lua:668>
---
 src/nvim/ex_docmd.c               | 13 ++++++-------
 src/nvim/testdir/test_cmdline.vim |  7 -------
 src/nvim/version.c                |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 80c75f24c4..d7821fc636 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1665,15 +1665,11 @@ static char_u * do_one_cmd(char_u **cmdlinep,
     ea.addr_count++;
 
     if (*ea.cmd == ';') {
-      if (!ea.skip) {
+      if (!ea.skip)
         curwin->w_cursor.lnum = ea.line2;
-        // Don't leave the cursor on an illegal line (caused by ';')
-        check_cursor_lnum();
-      }
-    } else if (*ea.cmd != ',') {
+    } else if (*ea.cmd != ',')
       break;
-    }
-    ea.cmd++;
+    ++ea.cmd;
   }
 
   /* One address given: set start and end lines */
@@ -1684,6 +1680,9 @@ static char_u * do_one_cmd(char_u **cmdlinep,
       ea.addr_count = 0;
   }
 
+  /* Don't leave the cursor on an illegal line (caused by ';') */
+  check_cursor_lnum();
+
   /*
    * 5. Parse the command.
    */
diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim
index 09f4b942ad..c3bfae1b7b 100644
--- a/src/nvim/testdir/test_cmdline.vim
+++ b/src/nvim/testdir/test_cmdline.vim
@@ -232,10 +232,3 @@ func Test_paste_in_cmdline()
   call assert_equal('"aaa a;b-c*d bbb', @:)
   bwipe!
 endfunc
-
-func Test_illegal_address()
-  new
-  2;'(
-  2;')
-  quit
-endfunc
diff --git a/src/nvim/version.c b/src/nvim/version.c
index a018585976..1035963136 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -596,7 +596,7 @@ static const int included_patches[] = {
   136,
   135,
   // 134,
-  133,
+  // 133,
   // 132,
   // 131,
   // 130 NA