aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ex_docmd.c
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2017-08-03 08:30:53 +0800
committerckelsel <ckelsel@hotmail.com>2017-08-03 08:30:53 +0800
commit9b3ed62b5a841c24f798f1fcc4adb3cfe7667b5b (patch)
tree380648ddb41939724a40eccd780312640203ca01 /src/nvim/ex_docmd.c
parentb16a4ad49a010a8a2f1019394396fee5facbbd16 (diff)
parenteb40b7ec404e8651137513ced43d503bc6656f17 (diff)
downloadrneovim-9b3ed62b5a841c24f798f1fcc4adb3cfe7667b5b.tar.gz
rneovim-9b3ed62b5a841c24f798f1fcc4adb3cfe7667b5b.tar.bz2
rneovim-9b3ed62b5a841c24f798f1fcc4adb3cfe7667b5b.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/ex_docmd.c')
-rw-r--r--src/nvim/ex_docmd.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index d7821fc636..80c75f24c4 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1665,11 +1665,15 @@ 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;
- } else if (*ea.cmd != ',')
+ // Don't leave the cursor on an illegal line (caused by ';')
+ check_cursor_lnum();
+ }
+ } else if (*ea.cmd != ',') {
break;
- ++ea.cmd;
+ }
+ ea.cmd++;
}
/* One address given: set start and end lines */
@@ -1680,9 +1684,6 @@ 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.
*/