aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShougo <Shougo.Matsu@gmail.com>2016-12-10 21:39:28 +0900
committerJustin M. Keyes <justinkz@gmail.com>2016-12-10 13:39:28 +0100
commit26f8cdedc375cbd5d42f640725cbbbc31cb4bd4f (patch)
treeb28eb260b402253903281a2b82580ec137e0211e
parent7c513d646d87eb3e4ed4917d5a3a7b9163371fae (diff)
downloadrneovim-26f8cdedc375cbd5d42f640725cbbbc31cb4bd4f.tar.gz
rneovim-26f8cdedc375cbd5d42f640725cbbbc31cb4bd4f.tar.bz2
rneovim-26f8cdedc375cbd5d42f640725cbbbc31cb4bd4f.zip
vim-patch:7.4.1897 (#5747)
Problem: Various typos, long lines and style mistakes. Solution: Fix the typos, wrap lines, improve style. https://github.com/vim/vim/commit/fd89d7ea81b18d32363456b16258174dc9e095dc
-rw-r--r--src/nvim/ex_docmd.c3
-rw-r--r--src/nvim/getchar.c2
-rw-r--r--src/nvim/version.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 23b1a50fc8..651fb6dddc 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1542,7 +1542,8 @@ static char_u * do_one_cmd(char_u **cmdlinep,
break;
}
ea.cmd = skipwhite(ea.cmd);
- lnum = get_address(&ea, &ea.cmd, ea.addr_type, ea.skip, ea.addr_count == 0);
+ lnum = get_address(&ea, &ea.cmd, ea.addr_type, ea.skip,
+ ea.addr_count == 0);
if (ea.cmd == NULL) { // error detected
goto doend;
}
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index ab52ee0372..fccbd69dbf 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -113,7 +113,7 @@ static mapblock_T *first_abbr = NULL; /* first entry in abbrlist */
static int KeyNoremap = 0; /* remapping flags */
/*
- * variables used by vgetorpeek() and flush_buffers()
+ * Variables used by vgetorpeek() and flush_buffers()
*
* typebuf.tb_buf[] contains all characters that are not consumed yet.
* typebuf.tb_buf[typebuf.tb_off] is the first valid character.
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 10a25d5b8c..cbb0ae5112 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -543,7 +543,7 @@ static int included_patches[] = {
1900,
// 1899 NA
1898,
- // 1897,
+ 1897,
1896,
1895,
1894,