diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-02-24 12:35:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-24 12:35:06 +0800 |
| commit | 47bc297d81cf7dab5a28608657ddab3c09f794d0 (patch) | |
| tree | 5cc4c9679b053696561dada037f95f9f7aa7c522 | |
| parent | 5e1308b7caa89b458cc97d2db956379aa54ed68a (diff) | |
| download | rneovim-47bc297d81cf7dab5a28608657ddab3c09f794d0.tar.gz rneovim-47bc297d81cf7dab5a28608657ddab3c09f794d0.tar.bz2 rneovim-47bc297d81cf7dab5a28608657ddab3c09f794d0.zip | |
vim-patch:8.2.4318: various comment and indent mistakes, returning wrong zero (#22385)
Problem: Various comment and indent mistakes, returning wrong zero.
Solution: Fix the mistakes. Return NULL instead of FAIL.
https://github.com/vim/vim/commit/54969f4ef5825205ecde09ea80f4087fc3b68e5d
N/A patches for version.c:
vim-patch:8.2.3781: the option window script is outdated
Problem: The option window script is outdated.
Solution: Add several changes.
https://github.com/vim/vim/commit/a416861c643b03fe5dec9f3bf8c1c9e054b5a9c7
Co-authored-by: Bram Moolenaar <Bram@vim.org>
| -rw-r--r-- | src/nvim/eval.c | 2 | ||||
| -rw-r--r-- | src/nvim/window.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index ccea4f4951..841588d4c3 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -2572,7 +2572,7 @@ static int eval4(char **arg, typval_T *rettv, int evaluate) } /// Handle fourth level expression: -/// + number addition +/// + number addition, concatenation of list or blob /// - number subtraction /// . string concatenation /// .. string concatenation diff --git a/src/nvim/window.c b/src/nvim/window.c index 36d422abd5..0a4d36acb2 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -1000,7 +1000,7 @@ void ui_ext_win_viewport(win_T *wp) } } -/// If "split_disallowed" is set given an error and return FAIL. +/// If "split_disallowed" is set give an error and return FAIL. /// Otherwise return OK. static int check_split_disallowed(void) { |