diff options
| author | Jack Bracewell <FriedSock@users.noreply.github.com> | 2017-03-21 10:11:32 +0000 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-03-21 11:11:32 +0100 |
| commit | 66259e4c498dd3b5278aeea16cc3a71ed83f1b76 (patch) | |
| tree | 8e1acff1359cbbab8f87a718e21f3307a44799d6 | |
| parent | df1e7b7edaf6c2ab9435d3734488c74a278f64a1 (diff) | |
| download | rneovim-66259e4c498dd3b5278aeea16cc3a71ed83f1b76.tar.gz rneovim-66259e4c498dd3b5278aeea16cc3a71ed83f1b76.tar.bz2 rneovim-66259e4c498dd3b5278aeea16cc3a71ed83f1b76.zip | |
vim-patch:7.4.2293 (#6307)
The original patch makes all the modeline comments consistent, but these
have been removed in the neovim source. However there as a correction of
a comment included in the patch that we can use.
https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
| -rw-r--r-- | src/nvim/eval.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index d4daffb469..7eb149476f 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -4196,7 +4196,7 @@ static int eval7( // string and free a string that isn't there. rettv->v_type = VAR_UNKNOWN; - // Skip '!' and '-' characters. They are handled later. + // Skip '!', '-' and '+' characters. They are handled later. start_leader = *arg; while (**arg == '!' || **arg == '-' || **arg == '+') { *arg = skipwhite(*arg + 1); diff --git a/src/nvim/version.c b/src/nvim/version.c index 8fd0fce329..bf13e52be4 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -148,7 +148,7 @@ static int included_patches[] = { // 2296, 2295, 2294, - // 2293, + 2293, 2292, // 2291, // 2290 NA |