diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-01-17 16:53:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-17 16:53:37 +0800 |
| commit | b4d669e7acd819cd5723b387a5a79023994d438d (patch) | |
| tree | 959745753350fb89d5079e105364c4081b0eb42a | |
| parent | 58f2dcfc887134f5ebc33c13d7ef5ce540f8a247 (diff) | |
| download | rneovim-b4d669e7acd819cd5723b387a5a79023994d438d.tar.gz rneovim-b4d669e7acd819cd5723b387a5a79023994d438d.tar.bz2 rneovim-b4d669e7acd819cd5723b387a5a79023994d438d.zip | |
vim-patch:8.2.4928: various white space and cosmetic mistakes (#21854)
Problem: Various white space and cosmetic mistakes.
Solution: Change spaces to tabs, improve comments.
https://github.com/vim/vim/commit/6ed545e79735f23ff8e650bc2f0967e5a0baedc9
Co-authored-by: Bram Moolenaar <Bram@vim.org>
| -rw-r--r-- | src/nvim/edit.c | 3 | ||||
| -rw-r--r-- | src/nvim/eval/window.c | 2 | ||||
| -rw-r--r-- | src/nvim/input.c | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_cursorline.vim | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 36a8674730..6102f05abd 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -3661,8 +3661,7 @@ static bool ins_start_select(int c) static void ins_insert(int replaceState) { set_vim_var_string(VV_INSERTMODE, ((State & REPLACE_FLAG) ? "i" : - replaceState == MODE_VREPLACE ? "v" : - "r"), 1); + replaceState == MODE_VREPLACE ? "v" : "r"), 1); ins_apply_autocmds(EVENT_INSERTCHANGE); if (State & REPLACE_FLAG) { State = MODE_INSERT | (State & MODE_LANGMAP); diff --git a/src/nvim/eval/window.c b/src/nvim/eval/window.c index b1e1669826..f58a0c488a 100644 --- a/src/nvim/eval/window.c +++ b/src/nvim/eval/window.c @@ -140,6 +140,8 @@ void win_findbuf(typval_T *argvars, list_T *list) /// Find window specified by "vp" in tabpage "tp". /// /// @param tp NULL for current tab page +/// @return current window if "vp" is number zero. +/// NULL if not found. win_T *find_win_by_nr(typval_T *vp, tabpage_T *tp) { int nr = (int)tv_get_number_chk(vp, NULL); diff --git a/src/nvim/input.c b/src/nvim/input.c index 0f0af9d5f0..96214d45c2 100644 --- a/src/nvim/input.c +++ b/src/nvim/input.c @@ -29,7 +29,8 @@ # include "input.c.generated.h" // IWYU pragma: export #endif -/// Ask for a reply from the user, 'y' or 'n' +/// Ask for a reply from the user, a 'y' or a 'n', with prompt "str" (which +/// should have been translated already). /// /// No other characters are accepted, the message is repeated until a valid /// reply is entered or <C-c> is hit. diff --git a/src/nvim/testdir/test_cursorline.vim b/src/nvim/testdir/test_cursorline.vim index 47646125db..70f39a8601 100644 --- a/src/nvim/testdir/test_cursorline.vim +++ b/src/nvim/testdir/test_cursorline.vim @@ -319,7 +319,7 @@ func Test_cursorline_cursorbind_horizontal_scroll() let lines =<< trim END call setline(1, 'aa bb cc dd ee ff gg hh ii jj kk ll mm' .. - \ ' nn oo pp qq rr ss tt uu vv ww xx yy zz') + \ ' nn oo pp qq rr ss tt uu vv ww xx yy zz') set nowrap " The following makes the cursor apparent on the screen dump set sidescroll=1 cursorcolumn |